From fd7ee7b148ca81b661ed1c91e82c70deba2da5b7 Mon Sep 17 00:00:00 2001 From: "ben.clark" Date: Thu, 12 Mar 2009 16:57:27 +0000 Subject: [PATCH] Minor problems discovered whilst refactoring CATE: Corrections to User / Group / Authority impl Changes due to upgrade of hibernate-search change private constructors to protected (due to their handling by hibernate proxies) --- .../eu/etaxonomy/cdm/model/agent/Person.java | 2 +- .../cdm/model/common/Annotation.java | 2 +- .../cdm/model/common/DefinedTermBase.java | 1 - .../cdm/model/common/ExtensionType.java | 8 +-- .../cdm/model/common/LanguageString.java | 3 +- .../model/description/DescriptionBase.java | 1 - .../description/DescriptionElementBase.java | 55 +++++++++++-------- .../cdm/model/description/Feature.java | 6 +- .../description/SpecimenDescription.java | 2 + .../model/description/TaxonDescription.java | 2 +- .../description/TaxonNameDescription.java | 3 +- .../cdm/model/description/TextData.java | 2 +- .../cdm/model/name/BacterialName.java | 13 ++--- .../cdm/model/name/BotanicalName.java | 4 +- .../cdm/model/name/CultivarPlantName.java | 2 + .../cdm/model/name/NonViralName.java | 3 +- .../cdm/model/name/TaxonNameBase.java | 11 ++-- .../etaxonomy/cdm/model/name/ViralName.java | 5 ++ .../cdm/model/name/ZoologicalName.java | 15 +++-- .../cdm/model/occurrence/Collection.java | 5 ++ .../model/reference/StrictReferenceBase.java | 1 + .../eu/etaxonomy/cdm/model/taxon/Synonym.java | 2 + .../eu/etaxonomy/cdm/model/taxon/Taxon.java | 2 +- .../etaxonomy/cdm/model/taxon/TaxonBase.java | 1 - .../agent/InstitutionalMembershipTest.java | 2 - 25 files changed, 85 insertions(+), 68 deletions(-) diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java index 584c5241b3..ebcb007219 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Person.java @@ -129,7 +129,7 @@ public class Person extends TeamOrPersonBase { * * @see #Person(String, String, String) */ - private Person() { + protected Person() { super(); this.cacheStrategy = PersonDefaultCacheStrategy.NewInstance(); diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java index 090a5b2779..782a5b1be9 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java @@ -65,7 +65,7 @@ public class Annotation extends LanguageStringBase implements Cloneable { return new Annotation(text, Language.DEFAULT()); } - private Annotation(){ + protected Annotation(){ super(); } diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java index 81ae89223f..8e915c9cac 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java @@ -61,7 +61,6 @@ import eu.etaxonomy.cdm.model.media.Media; @Entity @Audited @Inheritance(strategy=InheritanceType.SINGLE_TABLE) -@Indexed public abstract class DefinedTermBase extends TermBase implements ILoadableTerm, IDefinedTerm { private static final long serialVersionUID = 2931811562248571531L; private static final Logger logger = Logger.getLogger(DefinedTermBase.class); diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.java index 20ea1b0644..0a9240ea33 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.java @@ -10,14 +10,14 @@ package eu.etaxonomy.cdm.model.common; -import org.apache.log4j.Logger; -import org.hibernate.envers.Audited; - -import javax.persistence.*; +import javax.persistence.Entity; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlType; +import org.apache.log4j.Logger; +import org.hibernate.envers.Audited; + /** * Extension types similar to dynamically defined attributes. These are not data * types, but rather content types like "DOI", "2nd nomenclatural reference", "3rd diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageString.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageString.java index 3c6699e1dd..1aef0118d6 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageString.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/LanguageString.java @@ -9,7 +9,6 @@ package eu.etaxonomy.cdm.model.common; -import javax.persistence.Embeddable; import javax.persistence.Entity; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -29,8 +28,8 @@ import org.hibernate.search.annotations.Indexed; @XmlType(name = "LanguageString") @XmlRootElement(name = "LanguageString") @Entity +@Indexed(index = "eu.etaxonomy.cdm.model.common.LanguageStringBase") @Audited -@Indexed public class LanguageString extends LanguageStringBase implements Cloneable { private static final long serialVersionUID = -1502298496073201104L; @SuppressWarnings("unused") diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java index a187f3b1e6..2f2545e492 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java @@ -67,7 +67,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; @Entity @Audited @Inheritance(strategy=InheritanceType.SINGLE_TABLE) -@Indexed public abstract class DescriptionBase extends IdentifiableEntity { private static final long serialVersionUID = 5504218413819040193L; private static final Logger logger = Logger.getLogger(DescriptionBase.class); diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java index 85bf308b72..7ce66f61f5 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java @@ -10,30 +10,19 @@ package eu.etaxonomy.cdm.model.description; -import eu.etaxonomy.cdm.jaxb.MultilanguageTextAdapter; -import eu.etaxonomy.cdm.model.media.IMediaEntity; -import eu.etaxonomy.cdm.model.media.Media; -import eu.etaxonomy.cdm.model.name.TaxonNameBase; -import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; -import eu.etaxonomy.cdm.model.taxon.Taxon; -import eu.etaxonomy.cdm.model.common.IMultiLanguageText; -import eu.etaxonomy.cdm.model.common.Language; -import eu.etaxonomy.cdm.model.common.LanguageString; -import eu.etaxonomy.cdm.model.common.TermVocabulary; - -import eu.etaxonomy.cdm.model.common.MultilanguageText; -import eu.etaxonomy.cdm.model.common.ReferencedEntityBase; - -import org.apache.log4j.Logger; -import org.hibernate.annotations.Cascade; -import org.hibernate.annotations.CascadeType; -import org.hibernate.envers.Audited; -import org.hibernate.search.annotations.Indexed; -import org.hibernate.search.annotations.IndexedEmbedded; - -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; -import javax.persistence.*; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; @@ -43,6 +32,25 @@ import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import org.apache.log4j.Logger; +import org.hibernate.annotations.Cascade; +import org.hibernate.annotations.CascadeType; +import org.hibernate.envers.Audited; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.IndexedEmbedded; + +import eu.etaxonomy.cdm.jaxb.MultilanguageTextAdapter; +import eu.etaxonomy.cdm.model.common.Language; +import eu.etaxonomy.cdm.model.common.LanguageString; +import eu.etaxonomy.cdm.model.common.MultilanguageText; +import eu.etaxonomy.cdm.model.common.ReferencedEntityBase; +import eu.etaxonomy.cdm.model.common.TermVocabulary; +import eu.etaxonomy.cdm.model.media.IMediaEntity; +import eu.etaxonomy.cdm.model.media.Media; +import eu.etaxonomy.cdm.model.name.TaxonNameBase; +import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; +import eu.etaxonomy.cdm.model.taxon.Taxon; + /** * The upmost (abstract) class for a piece of information) about * a {@link SpecimenOrObservationBase specimen}, a {@link Taxon taxon} or even a {@link TaxonNameBase taxon name}. @@ -72,7 +80,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; @Entity @Audited @Inheritance(strategy=InheritanceType.SINGLE_TABLE) -@Indexed public abstract class DescriptionElementBase extends ReferencedEntityBase implements IMediaEntity { private static final long serialVersionUID = 5000910777835755905L; @SuppressWarnings("unused") diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java index 8de7ed4430..39ae5d1f6b 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java @@ -32,6 +32,7 @@ import javax.xml.bind.annotation.XmlType; import org.apache.log4j.Logger; import org.hibernate.envers.Audited; +import org.hibernate.search.annotations.Indexed; import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.Language; @@ -86,6 +87,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; }) @XmlRootElement(name = "Feature") @Entity +@Indexed(index = "eu.etaxonomy.cdm.model.common.DefinedTermBase") @Audited public class Feature extends DefinedTermBase { private static final long serialVersionUID = 6754598791831848704L; @@ -336,12 +338,12 @@ public class Feature extends DefinedTermBase { * * @return the boolean value of the supportsCategoricalData flag */ - public boolean isSupportsCategoricalData() { + public boolean supportsCategoricalData() { return supportsCategoricalData; } /** - * @see #isSupportsCategoricalData() + * @see #supportsCategoricalData() */ public void setSupportsCategoricalData(boolean supportsCategoricalData) { this.supportsCategoricalData = supportsCategoricalData; diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/SpecimenDescription.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/SpecimenDescription.java index 977122dfda..54186e0738 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/SpecimenDescription.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/SpecimenDescription.java @@ -17,6 +17,7 @@ import javax.xml.bind.annotation.XmlType; import org.apache.log4j.Logger; import org.hibernate.envers.Audited; +import org.hibernate.search.annotations.Indexed; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; @@ -34,6 +35,7 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; @XmlType(name = "SpecimenDescription") @XmlRootElement(name = "SpecimenDescription") @Entity +@Indexed(index = "eu.etaxonomy.cdm.model.description.DescriptionBase") @Audited public class SpecimenDescription extends DescriptionBase { private static final long serialVersionUID = -8506790426682192703L; diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java index 4df0f10204..3f34b47d50 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java @@ -60,8 +60,8 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; }) @XmlRootElement(name = "TaxonDescription") @Entity +@Indexed(index = "eu.etaxonomy.cdm.model.description.DescriptionBase") @Audited -@Indexed public class TaxonDescription extends DescriptionBase { private static final long serialVersionUID = 8065879180505546803L; @SuppressWarnings("unused") diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonNameDescription.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonNameDescription.java index 04368e1ba9..c3e4beb948 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonNameDescription.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonNameDescription.java @@ -19,13 +19,13 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlIDREF; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; import org.apache.log4j.Logger; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; import org.hibernate.envers.Audited; +import org.hibernate.search.annotations.Indexed; import eu.etaxonomy.cdm.model.name.NomenclaturalCode; import eu.etaxonomy.cdm.model.name.TaxonNameBase; @@ -45,6 +45,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase; }) @XmlRootElement(name = "TaxonNameDescription") @Entity +@Indexed(index = "eu.etaxonomy.cdm.model.description.DescriptionBase") @Audited public class TaxonNameDescription extends DescriptionBase { private static final long serialVersionUID = -7349160369642038687L; diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java index 4816f2f569..c51219dcfe 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java @@ -57,7 +57,7 @@ import eu.etaxonomy.cdm.model.common.LanguageString; @XmlRootElement(name = "TextData") @Entity @Audited -@Indexed +@Indexed(index = "eu.etaxonomy.cdm.model.description.DescriptionElementBase") public class TextData extends DescriptionElementBase { private static final long serialVersionUID = -2165015581278282615L; @SuppressWarnings("unused") diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BacterialName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BacterialName.java index d0eb121f0f..20e6137161 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BacterialName.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BacterialName.java @@ -10,19 +10,17 @@ package eu.etaxonomy.cdm.model.name; -import org.apache.log4j.Logger; -import org.hibernate.envers.Audited; - -import eu.etaxonomy.cdm.strategy.cache.name.BotanicNameDefaultCacheStrategy; -import eu.etaxonomy.cdm.strategy.cache.name.NonViralNameDefaultCacheStrategy; - -import javax.persistence.*; +import javax.persistence.Entity; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.apache.log4j.Logger; +import org.hibernate.envers.Audited; +import org.hibernate.search.annotations.Indexed; + /** * The taxon name class for bacteria. *

@@ -39,6 +37,7 @@ import javax.xml.bind.annotation.XmlType; }) @XmlRootElement(name = "BacterialName") @Entity +@Indexed(index = "eu.etaxonomy.cdm.model.name.TaxonNameBase") @Audited public class BacterialName extends NonViralName { diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java index 1d0a9bfea7..cefb48182a 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BotanicalName.java @@ -16,7 +16,6 @@ import java.util.Set; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.OneToMany; -import javax.persistence.PrePersist; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; @@ -28,11 +27,11 @@ import org.apache.log4j.Logger; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; import org.hibernate.envers.Audited; +import org.hibernate.search.annotations.Indexed; import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; import eu.etaxonomy.cdm.model.common.RelationshipBase; import eu.etaxonomy.cdm.model.reference.INomenclaturalReference; -import eu.etaxonomy.cdm.model.reference.ReferenceBase; import eu.etaxonomy.cdm.strategy.cache.name.BotanicNameDefaultCacheStrategy; import eu.etaxonomy.cdm.strategy.parser.INonViralNameParser; import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl; @@ -57,6 +56,7 @@ import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl; }) @XmlRootElement(name = "BotanicalName") @Entity +@Indexed(index = "eu.etaxonomy.cdm.model.name.TaxonNameBase") @Audited public class BotanicalName extends NonViralName { diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/CultivarPlantName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/CultivarPlantName.java index 64b67c8a24..b7210c31b5 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/CultivarPlantName.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/CultivarPlantName.java @@ -11,6 +11,7 @@ package eu.etaxonomy.cdm.model.name; import org.apache.log4j.Logger; import org.hibernate.envers.Audited; +import org.hibernate.search.annotations.Indexed; import javax.persistence.*; import javax.xml.bind.annotation.XmlAccessType; @@ -37,6 +38,7 @@ import javax.xml.bind.annotation.XmlType; }) @XmlRootElement(name = "CultivarPlantName") @Entity +@Indexed(index = "eu.etaxonomy.cdm.model.name.TaxonNameBase") @Audited public class CultivarPlantName extends BotanicalName { static Logger logger = Logger.getLogger(CultivarPlantName.class); diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java index 47c36e5844..d2fef69255 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java @@ -71,12 +71,11 @@ import eu.etaxonomy.cdm.strategy.cache.name.NonViralNameDefaultCacheStrategy; "authorshipCache", "protectedAuthorshipCache", "protectedNameCache" -// "cacheStrategy" }) @XmlRootElement(name = "NonViralName") @Entity +@Indexed(index = "eu.etaxonomy.cdm.model.name.TaxonNameBase") @Audited -@Indexed public class NonViralName extends TaxonNameBase { private static final Logger logger = Logger.getLogger(NonViralName.class); diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java index cba2e8626f..27f38da73a 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java @@ -9,7 +9,6 @@ package eu.etaxonomy.cdm.model.name; -import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.HashSet; import java.util.Set; @@ -30,7 +29,6 @@ import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlIDREF; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; import org.apache.log4j.Logger; @@ -39,6 +37,7 @@ import org.hibernate.annotations.CascadeType; import org.hibernate.annotations.Index; import org.hibernate.annotations.Table; import org.hibernate.envers.Audited; +import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.Indexed; import org.springframework.util.ReflectionUtils; @@ -47,7 +46,6 @@ import eu.etaxonomy.cdm.model.common.IReferencedEntity; import eu.etaxonomy.cdm.model.common.IRelated; import eu.etaxonomy.cdm.model.common.IdentifiableEntity; import eu.etaxonomy.cdm.model.common.RelationshipBase; -import eu.etaxonomy.cdm.model.description.TaxonDescription; import eu.etaxonomy.cdm.model.description.TaxonNameDescription; import eu.etaxonomy.cdm.model.occurrence.Specimen; import eu.etaxonomy.cdm.model.reference.INomenclaturalReference; @@ -97,7 +95,6 @@ import eu.etaxonomy.cdm.strategy.cache.name.INameCacheStrategy; @Audited @Inheritance(strategy=InheritanceType.SINGLE_TABLE) @Table(appliesTo="TaxonNameBase", indexes = { @Index(name = "taxonNameBaseTitleCacheIndex", columnNames = { "titleCache" }) }) -@Indexed public abstract class TaxonNameBase, S extends INameCacheStrategy> extends IdentifiableEntity implements IReferencedEntity, IParsable, IRelated { /** @@ -122,9 +119,11 @@ public abstract class TaxonNameBase, S extends INam private Set descriptions = new HashSet(); @XmlElement(name = "AppendedPhrase") + @Field(index= org.hibernate.search.annotations.Index.TOKENIZED) private String appendedPhrase; @XmlElement(name = "NomenclaturalMicroReference") + @Field(index= org.hibernate.search.annotations.Index.TOKENIZED) private String nomenclaturalMicroReference; @XmlAttribute @@ -1083,7 +1082,7 @@ public abstract class TaxonNameBase, S extends INam * @see #removeDescription(TaxonNameDescription) */ public void addDescription(TaxonNameDescription description) { - Field field = ReflectionUtils.findField(TaxonNameDescription.class, "taxonName", TaxonNameBase.class); + java.lang.reflect.Field field = ReflectionUtils.findField(TaxonNameDescription.class, "taxonName", TaxonNameBase.class); ReflectionUtils.makeAccessible(field); ReflectionUtils.setField(field, description, this); descriptions.add(description); @@ -1099,7 +1098,7 @@ public abstract class TaxonNameBase, S extends INam * @see eu.etaxonomy.cdm.model.description.TaxonNameDescription#getTaxonName() */ public void removeDescription(TaxonNameDescription description) { - Field field = ReflectionUtils.findField(TaxonNameDescription.class, "taxonName", TaxonNameBase.class); + java.lang.reflect.Field field = ReflectionUtils.findField(TaxonNameDescription.class, "taxonName", TaxonNameBase.class); ReflectionUtils.makeAccessible(field); ReflectionUtils.setField(field, description, null); descriptions.remove(description); diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ViralName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ViralName.java index 74b5b284b6..5150bea14f 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ViralName.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ViralName.java @@ -21,6 +21,9 @@ import javax.xml.bind.annotation.XmlType; import org.apache.log4j.Logger; import org.hibernate.envers.Audited; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.Indexed; import eu.etaxonomy.cdm.strategy.cache.name.INameCacheStrategy; @@ -45,6 +48,7 @@ import eu.etaxonomy.cdm.strategy.cache.name.INameCacheStrategy; }) @XmlRootElement(name = "ViralName") @Entity +@Indexed(index = "eu.etaxonomy.cdm.model.name.TaxonNameBase") @Audited public class ViralName extends TaxonNameBase> { @@ -55,6 +59,7 @@ public class ViralName extends TaxonNameBase cacheStrategy; @XmlElement(name = "Acronym") + @Field(index=Index.TOKENIZED) private String acronym; // ************* CONSTRUCTORS *************/ diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ZoologicalName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ZoologicalName.java index ef690a04cd..47deed3704 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ZoologicalName.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ZoologicalName.java @@ -11,24 +11,22 @@ package eu.etaxonomy.cdm.model.name; import javax.persistence.Entity; -import javax.persistence.Transient; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; import org.apache.log4j.Logger; import org.hibernate.envers.Audited; +import org.hibernate.search.annotations.Indexed; import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; import eu.etaxonomy.cdm.model.reference.INomenclaturalReference; -import eu.etaxonomy.cdm.model.reference.ReferenceBase; import eu.etaxonomy.cdm.strategy.cache.name.ZooNameDefaultCacheStrategy; import eu.etaxonomy.cdm.strategy.parser.INonViralNameParser; import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - /** * The taxon name class for animals. *

@@ -47,6 +45,7 @@ import javax.xml.bind.annotation.XmlType; }) @XmlRootElement(name = "ZoologicalName") @Entity +@Indexed(index = "eu.etaxonomy.cdm.model.name.TaxonNameBase") @Audited public class ZoologicalName extends NonViralName { diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/Collection.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/Collection.java index 45c0bab441..3a69291ee0 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/Collection.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/occurrence/Collection.java @@ -50,6 +50,11 @@ import eu.etaxonomy.cdm.model.media.IdentifiableMediaEntity; @Audited @Table(appliesTo="Collection", indexes = { @Index(name = "collectionTitleCacheIndex", columnNames = { "titleCache" }) }) public class Collection extends IdentifiableMediaEntity implements Cloneable{ + /** + * + */ + private static final long serialVersionUID = -7833674897174732255L; + private static final Logger logger = Logger.getLogger(Collection.class); @XmlElement(name = "Code") diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/StrictReferenceBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/StrictReferenceBase.java index 5440a9bf38..c66f205947 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/StrictReferenceBase.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/StrictReferenceBase.java @@ -58,6 +58,7 @@ public abstract class StrictReferenceBase extends ReferenceBase { //The date range assigned to the reference. ISO Date range like. Flexible, year can be left out, etc @XmlElement(name ="DatePublished" ) + @Embedded private TimePeriod datePublished; protected StrictReferenceBase(){ diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java index 50fa7a74c2..1b7324fca9 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java @@ -13,6 +13,7 @@ import org.apache.log4j.Logger; import org.hibernate.annotations.Cascade; import org.hibernate.annotations.CascadeType; import org.hibernate.envers.Audited; +import org.hibernate.search.annotations.Indexed; import eu.etaxonomy.cdm.model.common.IRelated; import eu.etaxonomy.cdm.model.name.TaxonNameBase; @@ -52,6 +53,7 @@ import javax.xml.bind.annotation.XmlType; }) @XmlRootElement(name = "Synonym") @Entity +@Indexed(index = "eu.etaxonomy.cdm.model.taxon.TaxonBase") @Audited public class Synonym extends TaxonBase implements IRelated{ diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java index 8d3df6dbcb..5970dafa40 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java @@ -61,8 +61,8 @@ import javax.xml.bind.annotation.XmlType; }) @XmlRootElement(name = "Taxon") @Entity +@Indexed(index = "eu.etaxonomy.cdm.model.taxon.TaxonBase") @Audited -@Indexed public class Taxon extends TaxonBase implements Iterable, IRelated{ static Logger logger = Logger.getLogger(Taxon.class); diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java index f2dc8ebdd8..0ddda6412d 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java @@ -62,7 +62,6 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase; }) @Entity @Audited -@Indexed @Table(appliesTo="TaxonBase", indexes = { @Index(name = "taxonBaseTitleCacheIndex", columnNames = { "titleCache" }) }) public abstract class TaxonBase extends IdentifiableEntity { diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembershipTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembershipTest.java index 8eaae6d73d..13c9e5e7ef 100644 --- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembershipTest.java +++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembershipTest.java @@ -7,8 +7,6 @@ import java.util.GregorianCalendar; import junit.framework.Assert; -import org.joda.time.DateMidnight; -import org.joda.time.Partial; import org.junit.Before; import org.junit.Test; -- 2.34.1