further fixes for collectorTitle #4311

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
index 42417757d26edd08b87d318919f2fc426c0e8c28..6fb912d2a600edbad0b59f3c60589366fe3a8985 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
@@ -61,6 +61,7 @@ import eu.etaxonomy.cdm.strategy.match.MatchMode;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "Team", propOrder = {
        "protectedNomenclaturalTitleCache",
+       "protectedCollectorTitleCache",
     "teamMembers"
 })
 @XmlRootElement(name = "Team")

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java
index 4da130109ffacec42bca5aaee560cb64849033a5..70c9069880253a39b5612c50f8724fb28f33dde7 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/TeamOrPersonBase.java
@@ -37,7 +37,8 @@ import eu.etaxonomy.cdm.strategy.cache.agent.INomenclaturalAuthorCacheStrategy;
  */\r
 @XmlAccessorType(XmlAccessType.FIELD)\r
 @XmlType(name = "TeamOrPersonBase", propOrder = {\r
-    "nomenclaturalTitle"\r
+    "nomenclaturalTitle",\r
+    "collectorTitle"\r
 })\r
 @Entity\r
 @Audited\r

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/HandlingCdmEntitiesTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/HandlingCdmEntitiesTest.java
index cf54d4416b27a8917ef46dd101c79e19d65bca5e..a624e9731a35f7067c433370605ae6fc4d9441a5 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/HandlingCdmEntitiesTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/HandlingCdmEntitiesTest.java
@@ -41,7 +41,8 @@ import eu.etaxonomy.cdm.test.integration.CdmIntegrationTest;
 
 public class HandlingCdmEntitiesTest extends CdmIntegrationTest {
 
-    private static final Logger logger = Logger.getLogger(CommonServiceImplTest.class);
+    @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(CommonServiceImplTest.class);
 
     private static final String LIE_TEAMMEMBERS_NOSESSION = "failed to lazily initialize a collection of role: eu.etaxonomy.cdm.model.agent.Team.teamMembers, could not initialize proxy - no Session";
     private static final String LIE_NOSESSION = "could not initialize proxy - no Session";

diff --git a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/HandlingCdmEntitiesTest.xml b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/HandlingCdmEntitiesTest.xml
index 603c7ed07cb144cdae71dce28f30fe9da825b63c..efbe1586bac9af6849af43eaba980a6fa93788b4 100644 (file)
--- a/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/HandlingCdmEntitiesTest.xml
+++ b/cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/HandlingCdmEntitiesTest.xml
@@ -2,8 +2,8 @@
 <dataset>
   <TAXONBASE DTYPE="Taxon" ID="1" CREATED="2014-09-17 10:58:57.0" UUID="23c35977-01b5-452c-9225-ecce440034e0" UPDATED="[null]" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Abies alba Avengers sec. ???" APPENDEDPHRASE="[null]" DOUBTFUL="false" PUBLISH="true" USENAMECACHE="false" EXCLUDED="false" TAXONSTATUSUNKNOWN="false" TAXONOMICCHILDRENCOUNT="0" UNPLACED="false" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" NAME_ID="1" SEC_ID="[null]" TAXONOMICPARENTCACHE_ID="[null]"/>
   <TAXONNAMEBASE DTYPE="BotanicalName" ID="1" CREATED="2014-09-17 10:58:57.0" UUID="37e209e5-0752-4bd6-8328-94732102b88d" UPDATED="2014-09-17 10:58:57.495" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Abies alba Avengers" APPENDEDPHRASE="[null]" FULLTITLECACHE="Abies alba Avengers" NOMENCLATURALMICROREFERENCE="[null]" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="Avengers" BINOMHYBRID="false" GENUSORUNINOMIAL="Abies alba" HYBRIDFORMULA="false" INFRAGENERICEPITHET="[null]" INFRASPECIFICEPITHET="[null]" MONOMHYBRID="false" NAMECACHE="Abies alba" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="[null]" TRINOMHYBRID="false" NAMEAPPROBATION="[null]" SUBGENUSAUTHORSHIP="[null]" ANAMORPHIC="false" CULTIVARNAME="[null]" ACRONYM="[null]" BREED="[null]" ORIGINALPUBLICATIONYEAR="[null]" PUBLICATIONYEAR="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" HOMOTYPICALGROUP_ID="1" NOMENCLATURALREFERENCE_ID="[null]" RANK_ID="[null]" BASIONYMAUTHORTEAM_ID="[null]" COMBINATIONAUTHORTEAM_ID="1" EXBASIONYMAUTHORTEAM_ID="[null]" EXCOMBINATIONAUTHORTEAM_ID="[null]"/>
-  <AGENTBASE DTYPE="Team" ID="1" CREATED="2014-09-17 10:58:57.0" UUID="300bce50-37d8-4409-9c7a-a1b29abc365e" UPDATED="2014-09-17 10:58:57.496" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Avengers" CODE="[null]" NAME="[null]" NOMENCLATURALTITLE="Avengers" FIRSTNAME="[null]" LASTNAME="[null]" LIFESPAN_END="[null]" LIFESPAN_FREETEXT="[null]" LIFESPAN_START="[null]" PREFIX="[null]" SUFFIX="[null]" PROTECTEDNOMENCLATURALTITLECACHE="true" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" ISPARTOF_ID="[null]"/>
-  <AGENTBASE DTYPE="Person" ID="2" CREATED="2014-09-17 10:58:57.0" UUID="8b99c770-0a4f-43eb-9c6f-612131eb4e56" UPDATED="2014-09-17 10:58:57.497" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Iron Man" CODE="[null]" NAME="[null]" NOMENCLATURALTITLE="Iron Man" FIRSTNAME="[null]" LASTNAME="[null]" LIFESPAN_END="[null]" LIFESPAN_FREETEXT="[null]" LIFESPAN_START="[null]" PREFIX="[null]" SUFFIX="[null]" PROTECTEDNOMENCLATURALTITLECACHE="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" ISPARTOF_ID="[null]"/>
+  <AGENTBASE DTYPE="Team" ID="1" CREATED="2014-09-17 10:58:57.0" UUID="300bce50-37d8-4409-9c7a-a1b29abc365e" UPDATED="2014-09-17 10:58:57.496" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Avengers" CODE="[null]" NAME="[null]" NOMENCLATURALTITLE="Avengers" FIRSTNAME="[null]" LASTNAME="[null]" LIFESPAN_END="[null]" LIFESPAN_FREETEXT="[null]" LIFESPAN_START="[null]" PREFIX="[null]" SUFFIX="[null]" PROTECTEDNOMENCLATURALTITLECACHE="true" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" ISPARTOF_ID="[null]" COLLECTORTITLE="[NULL]" PROTECTEDCOLLECTORTITLECACHE="FALSE"/>
+  <AGENTBASE DTYPE="Person" ID="2" CREATED="2014-09-17 10:58:57.0" UUID="8b99c770-0a4f-43eb-9c6f-612131eb4e56" UPDATED="2014-09-17 10:58:57.497" LSID_AUTHORITY="[null]" LSID_LSID="[null]" LSID_NAMESPACE="[null]" LSID_OBJECT="[null]" LSID_REVISION="[null]" PROTECTEDTITLECACHE="false" TITLECACHE="Iron Man" CODE="[null]" NAME="[null]" NOMENCLATURALTITLE="Iron Man" FIRSTNAME="[null]" LASTNAME="[null]" LIFESPAN_END="[null]" LIFESPAN_FREETEXT="[null]" LIFESPAN_START="[null]" PREFIX="[null]" SUFFIX="[null]" PROTECTEDNOMENCLATURALTITLECACHE="[null]" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]" ISPARTOF_ID="[null]" COLLECTORTITLE="[NULL]" PROTECTEDCOLLECTORTITLECACHE="FALSE"/>
   <AGENTBASE_AGENTBASE AGENTBASE_ID="1" TEAMMEMBERS_ID="2" SORTINDEX="0"/>
   <HOMOTYPICALGROUP ID="1" CREATED="2014-09-17 10:58:57.0" UUID="d5d9547f-a086-48c4-9e88-a9f0d7705a82" UPDATED="2014-09-17 10:58:57.495" CREATEDBY_ID="[null]" UPDATEDBY_ID="[null]"/>
 </dataset>
\ No newline at end of file