free text search: better querying for 'isNotNull' and code harmonization

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / model / description / StateData.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java
index a08a77f685de2809f7d04e26d73e9b451342fa7c..e127170d057b75674d7773fc84422669aa9a9181 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/StateData.java
@@ -39,7 +39,7 @@ import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.FieldBridge;\r
 import org.hibernate.search.annotations.IndexedEmbedded;\r
 \r
-import eu.etaxonomy.cdm.hibernate.search.DefinedTermBaseFieldBridge;\r
+import eu.etaxonomy.cdm.hibernate.search.DefinedTermBaseClassBridge;\r
 import eu.etaxonomy.cdm.hibernate.search.MultilanguageTextFieldBridge;\r
 import eu.etaxonomy.cdm.jaxb.MultilanguageTextAdapter;\r
 import eu.etaxonomy.cdm.model.common.IMultiLanguageTextHolder;\r
@@ -79,18 +79,13 @@ public class StateData extends VersionableEntity implements IModifiable, IMultiL
     @XmlIDREF\r
     @XmlSchemaType(name = "IDREF")\r
     @ManyToOne(fetch = FetchType.LAZY)\r
-    //UNDER CONSTRUCION\r
-    @Field\r
-    @FieldBridge(impl=DefinedTermBaseFieldBridge.class)\r
+    @IndexedEmbedded\r
     private State state;\r
 \r
     @XmlElementWrapper(name = "Modifiers")\r
     @XmlElement(name = "Modifier")\r
     @ManyToMany(fetch = FetchType.LAZY)\r
     @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})\r
-  //UNDER CONSTRUCION\r
-//    @Field\r
-//    @FieldBridge(impl=DefinedTermBaseFieldBridge.class)\r
     @IndexedEmbedded\r
 //     @NotNull // avoids creating a UNIQUE key for this field -> not needed for ManyToMany\r
     private Set<Modifier> modifiers = new HashSet<Modifier>();\r