r227 - trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model - Cantharella-commits

24 May 2013

Author: echatellier
Date: 2013-05-24 17:38:34 +0200 (Fri, 24 May 2013)
New Revision: 227

Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/227

Log:
Fix lazy problems during hibernate search indexing
Add some missing field indexing

Modified:
   trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Extraction.java
   trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Lot.java
   trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodeExtraction.java
   trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodePurification.java
   trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java
   trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Partie.java
   trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Purification.java
   trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java
   trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java

Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Extraction.java
===================================================================

--- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Extraction.java	2013-05-24 15:37:24 UTC (rev 226)
+++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Extraction.java	2013-05-24 15:38:34 UTC (rev 227)
@@ -91,6 +91,7 @@
     /** Méthode pour l'extraction **/
     @NotNull
     @ManyToOne(fetch = FetchType.EAGER, optional = false)
+    @IndexedEmbedded
     private MethodeExtraction methode;
 
     /** Date de la manip */
@@ -119,7 +120,6 @@
     /** Créateur */
     @NotNull
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
-    @IndexedEmbedded
     private Personne createur;
 
     /** Extraits produits par l'extraction */

Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Lot.java
===================================================================
--- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Lot.java	2013-05-24 15:37:24 UTC (rev 226)
+++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Lot.java	2013-05-24 15:38:34 UTC (rev 227)
@@ -101,7 +101,6 @@
     /** createur */
     @NotNull
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
-    @IndexedEmbedded
     private Personne createur;
 
     /** Date */
@@ -141,6 +140,7 @@
 
     /** Partie */
     @ManyToOne(fetch = FetchType.EAGER, optional = true)
+    @IndexedEmbedded
     private Partie partie;
 
     /** Droits attribués aux personnes */

Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodeExtraction.java
===================================================================
--- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodeExtraction.java	2013-05-24 15:37:24 UTC (rev 226)
+++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodeExtraction.java	2013-05-24 15:38:34 UTC (rev 227)
@@ -27,6 +27,7 @@
 import java.util.List;
 
 import javax.persistence.Column;
+import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -40,6 +41,7 @@
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 import org.hibernate.annotations.Type;
+import org.hibernate.search.annotations.Field;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.NotEmpty;
 
@@ -49,6 +51,7 @@
  * @author Adrien Cheype
  */
 @Entity
+@Embeddable
 public class MethodeExtraction extends AbstractModel implements Comparable<MethodeExtraction> {
 
     /** Id de la méthode */
@@ -60,6 +63,7 @@
     @Length(max = LENGTH_MEDIUM_TEXT)
     @Column(unique = true)
     @NotEmpty
+    @Field
     private String nom;
 
     /** Description de la méthode */

Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodePurification.java
===================================================================
--- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodePurification.java	2013-05-24 15:37:24 UTC (rev 226)
+++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/MethodePurification.java	2013-05-24 15:38:34 UTC (rev 227)
@@ -27,6 +27,7 @@
 import java.util.List;
 
 import javax.persistence.Column;
+import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -41,6 +42,7 @@
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 import org.hibernate.annotations.Type;
+import org.hibernate.search.annotations.Field;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.NotEmpty;
 
@@ -49,6 +51,7 @@
  * @author Adrien Cheype
  */
 @Entity
+@Embeddable
 public class MethodePurification extends AbstractModel implements Comparable<MethodePurification> {
 
     /** Id de la méthode */
@@ -60,6 +63,7 @@
     @Length(max = LENGTH_MEDIUM_TEXT)
     @Column(unique = true)
     @NotEmpty
+    @Field
     private String nom;
 
     /** Description de la méthode */

Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java
===================================================================
--- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java	2013-05-24 15:37:24 UTC (rev 226)
+++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Molecule.java	2013-05-24 15:38:34 UTC (rev 227)
@@ -130,7 +130,6 @@
     /** Créateur */
     @NotNull
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
-    @IndexedEmbedded
     private Personne createur;
 
     /** Produit utilisé obtenir le résultat */

Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Partie.java
===================================================================
--- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Partie.java	2013-05-24 15:37:24 UTC (rev 226)
+++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Partie.java	2013-05-24 15:38:34 UTC (rev 227)
@@ -23,6 +23,7 @@
 package nc.ird.cantharella.data.model;
 
 import javax.persistence.Column;
+import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
@@ -31,6 +32,7 @@
 import nc.ird.cantharella.data.model.utils.AbstractModel;
 
 import org.apache.commons.beanutils.BeanComparator;
+import org.hibernate.search.annotations.Field;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.NotEmpty;
 
@@ -41,6 +43,7 @@
  */
 @Entity
 @Table
+@Embeddable
 public class Partie extends AbstractModel implements Comparable<Partie> {
 
     /** Id de la partie */
@@ -52,6 +55,7 @@
     @Length(max = LENGTH_MEDIUM_TEXT)
     @NotEmpty
     @Column(unique = true)
+    @Field
     private String nom;
 
     /** {@inheritDoc} */

Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Purification.java
===================================================================
--- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Purification.java	2013-05-24 15:37:24 UTC (rev 226)
+++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Purification.java	2013-05-24 15:38:34 UTC (rev 227)
@@ -98,6 +98,7 @@
     /** Méthode pour la purification **/
     @NotNull
     @ManyToOne(fetch = FetchType.EAGER, optional = false)
+    @IndexedEmbedded
     private MethodePurification methode;
 
     /** Paramètres qui caractérisent la méthode pour cette purification */
@@ -135,7 +136,6 @@
     /** Créateur */
     @NotNull
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
-    @IndexedEmbedded
     private Personne createur;
 
     /** Fractions produites par la purification */

Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java
===================================================================
--- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java	2013-05-24 15:37:24 UTC (rev 226)
+++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Specimen.java	2013-05-24 15:38:34 UTC (rev 227)
@@ -166,7 +166,6 @@
     /** Créateur */
     @NotNull
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
-    @IndexedEmbedded
     private Personne createur;
 
     /** Attached documents. */

Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java
===================================================================
--- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java	2013-05-24 15:37:24 UTC (rev 226)
+++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Station.java	2013-05-24 15:38:34 UTC (rev 227)
@@ -100,7 +100,6 @@
     /** Créateur */
     @NotNull
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
-    @IndexedEmbedded
     private Personne createur;
 
     /** Localité */
@@ -128,7 +127,10 @@
 
     /** Stations */
     @NotNull
-    @ManyToMany(mappedBy = "stations", fetch = FetchType.LAZY)
+    @ManyToMany(mappedBy = "stations", fetch = FetchType.EAGER)
+    // FIXME echatellier 20130524 EAGER for hibernate search (no other simple solution)
+    @Fetch(value = FetchMode.SUBSELECT)
+    // see HHH-1718
     @IndexedEmbedded
     private List<Campagne> campagnes;

    

r227 - trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model

echatellier＠users.forge.codelutin.com

tags

participants (1)