optimizing initialization strategies

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationController.java
index 7b8a23484171861e23670c4f5b13fdd9e5f0e5ea..173f3fc2cfb7de1d5903df57af4998b180dfa539 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationController.java
@@ -69,12 +69,7 @@ public class ClassificationController extends AnnotatableController<TaxonomicTre
        private List<String> NODE_INIT_STRATEGY(){\r
                return Arrays.asList(new String[]{\r
                        "taxon.sec", \r
-                       "taxon.name.taggedName",\r
-//                     "taxon.name.combinationAuthorTeam.*",\r
-//                     "taxon.name.exCombinationAuthorTeam.*",\r
-//                     "taxon.name.basionymAuthorTeam.*",\r
-//                     "taxon.name.exBasionymAuthorTeam.*",\r
-                       "taxon.name.titleCache",\r
+                       "taxon.name",\r
                        "taxonomicTree"\r
        });}\r
        \r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationListController.java
index 2ae19737cb2864a4befc82ec14121668d5dcbc62..c365d5a1fa8ce6fc1a8f3cbbfcbb47e0576ba902 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationListController.java
@@ -35,7 +35,7 @@ public class ClassificationListController extends BaseListController<TaxonomicTr
 
 
        protected static final List<String> DEFAULT_INIT_STRATEGY = Arrays.asList(new String []{
-                       "reference.authorTeam.titleCache"
+                       "reference.authorTeam"
        });
        
                

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
index d55390b136144d3f908f19b8296170a08863e0c2..09d60e78a4cdcb3f65ac0776f1132630ac34cf11 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
@@ -71,25 +71,14 @@ public class DescriptionPortalController extends AnnotatableController<Descripti
                                "root.children.feature.representations",\r
                        });\r
        private static final List<String> DESCRIPTIONS_DISTRIBUTION_INIT_STRATEGY = Arrays.asList(new String []{\r
-                       // taxon descriptions\r
-                       //"$",\r
-                       //"elements.$",\r
-                       "elements.sources.citation",\r
                        "elements.sources.citation.$",\r
-                       "elements.area",\r
                        "elements.area.$",\r
-                       //"elements.area.level",\r
                        });\r
        protected static final List<String> TAXONDESCRIPTION_INIT_STRATEGY = Arrays.asList(new String []{\r
                        "$",\r
                        "elements.$",\r
-                       "elements.sources.citation.",\r
-                       "elements.sources.citation.authorTeam.$",               \r
-//                     "elements.sources.citation.authorTeam.titleCache",\r
-//                     "elements.sources.citation.authorTeam.nomenclaturalTitleCache",\r
-                       "elements.sources.nameUsedInSource.titleCache",\r
+                       "elements.sources.citation.authorTeam.$",\r
                        "elements.sources.nameUsedInSource.originalNameString",\r
-//                     "elements.area",\r
                        "elements.area.level",\r
                        "elements.modifyingText",\r
        });\r
@@ -142,7 +131,7 @@ public class DescriptionPortalController extends AnnotatableController<Descripti
                Pager<Annotation> annotations = service.getDescriptionElementAnnotations(annotatableEntity, null, null, 0, null, ANNOTATION_INIT_STRATEGY);\r
                return annotations;\r
        }\r
-               \r
+       \r
        @RequestMapping(value = "/portal/description/{uuid_list}/DistributionTree", method = RequestMethod.GET)\r
        public DistributionTree doGetOrderedDistributionsB(\r
                        @PathVariable("uuid_list") UuidList descriptionUuidList,\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameController.java
index f0a2061a847b691f656d943fcd3e803574e9c9c4..710597ff7fcc2714623c941c9a3df449c19b5fa7 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameController.java
@@ -52,15 +52,15 @@ public class NameController extends AnnotatableController<TaxonNameBase, INameSe
        \r
        private static final List<String> TYPEDESIGNATION_INIT_STRATEGY = Arrays.asList(new String []{\r
                        "typeStatus.representations",\r
-                       "typifiedNames.titleCache",\r
-                       "typeSpecimen.titleCache",\r
-                       "typeName.titleCache",\r
+                       "typifiedNames",\r
+                       "typeSpecimen",\r
+                       "typeName",\r
                        "citation",\r
                        "citation.authorTeam.$",\r
        });\r
        \r
        private static final List<String> NAME_CACHE_INIT_STRATEGY = Arrays.asList(new String []{\r
-                       "titleCache"\r
+                       \r
        });\r
        \r
        public NameController(){\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NamePortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NamePortalController.java
index 632c493977e86b4351996fd5de63ea150076780d..383dc302c00d4f5d2939721236a5173487065e1b 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NamePortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NamePortalController.java
@@ -61,12 +61,9 @@ public class NamePortalController extends BaseController<TaxonNameBase, INameSer
        \r
        private static final List<String> TYPEDESIGNATION_INIT_STRATEGY = Arrays.asList(new String []{                  \r
                        "typeName.$",\r
-                       "typeName.titleCache",\r
-                       "typeSpecimen.titleCache",\r
+                       "typeSpecimen",\r
                        "typeStatus.representations",\r
-                       "typeStatus.representations",\r
-                       "typifiedNames.titleCache",\r
-                       "citation",\r
+                       "typifiedNames",\r
                        "citation.authorTeam.$",\r
                        "typeSpecimen.media.representations.parts"\r
        });\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferenceController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferenceController.java
index f568547d2e454beaed330cde47cfb4091b253be6..2a2fb67a9ed44b893cc6068c48b30edbf2b8a279 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferenceController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferenceController.java
@@ -46,15 +46,13 @@ public class ReferenceController extends AnnotatableController<ReferenceBase, IR
 {\r
        \r
        private static final List<String> NOMENCLATURAL_CITATION_INIT_STRATEGY = Arrays.asList(new String []{\r
-                       "$.authorTeam.titleCache",\r
-                       "inBook.authorTeam.titleCache",\r
-                       "inJournal.authorTeam.titleCache",\r
-                       "inProceedings.authorTeam.titleCache",\r
+                       "$",\r
+                       "authorTeam", // TODO obsolete??\r
+                       "inReference.authorTeam"\r
        });\r
        \r
        private static final List<String> CITATION_WITH_AUTHORTEAM_INIT_STRATEGY = Arrays.asList(new String []{\r
-                       "authorTeam.$",\r
-                       "authorTeam.titleCache",\r
+                       "authorTeam.$"  // TODO obsolete??\r
        });\r
        \r
        @InitBinder\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeController.java
index 2e6af312e689e548dafa9f06b37674b2fdd8757e..a4e1a541f29491ba423bb542f7931559c46b4521 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeController.java
@@ -34,8 +34,7 @@ public class TaxonNodeController extends AnnotatableController<TaxonNode, ITaxon
        
        private static final List<String> NODE_INIT_STRATEGY = Arrays.asList(new String[]{
                        "taxon.sec", 
-                       "taxon.name.taggedName",
-                       "taxon.name.titleCache"
+                       "taxon.name"
        });
        
        public TaxonNodeController(){

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeListController.java
index fa509f498ef9117663d9f8d11f539458409c1923..beaa138654b77de8e74ea11bcebb43d8532e1a3b 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeListController.java
@@ -43,8 +43,7 @@ public class TaxonNodeListController extends BaseListController<TaxonNode, ITaxo
 
        private static final List<String> NODE_INIT_STRATEGY = Arrays.asList(new String[]{
                        "taxon.sec", 
-                       "taxon.name.taggedName",
-                       "taxon.name.titleCache"
+                       "taxon.name"
        });
        
        

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
index 24fa690b14ea9678ace4cc393500b6774590bf81..18fc0773c8f4d28674a9c03e00af1a23fff44e9d 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
@@ -110,32 +110,17 @@ public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
        private static final List<String> TAXON_INIT_STRATEGY = Arrays.asList(new String []{\r
                        "*",\r
                        // taxon relations \r
-                       "relationsToThisName.fromTaxon.name.taggedName",\r
+                       "relationsToThisName.fromTaxon.name",\r
                        // the name\r
                        "name.$",\r
-                       "name.taggedName",\r
                        "name.rank.representations",\r
                        "name.status.type.representations",\r
                        \r
-//                     "name.combinationAuthorTeam.titleCache",\r
-//                     "name.basionymAuthorTeam.titleCache",\r
-//                     "name.exCombinationAuthorTeam.titleCache",\r
-//                     "name.exBasionymAuthorTeam.titleCache",\r
-                       \r
                        // taxon descriptions\r
-                       "descriptions.elements.$",\r
-                       "descriptions.elements.area",\r
                        "descriptions.elements.area.$",\r
                        "descriptions.elements.multilanguageText",\r
                        "descriptions.elements.media.representations.parts",\r
                        "descriptions.elements.media.title",\r
-                                               \r
-//                     // typeDesignations\r
-//                     "name.typeDesignations.$",\r
-//                     "name.typeDesignations.citation.authorTeam",\r
-//                     "name.typeDesignations.typeName.$",\r
-//                     "name.typeDesignations.typeStatus.representations",\r
-//                     "name.typeDesignations.typeSpecimen.media.representations.parts"\r
                        \r
                        });\r
        \r
@@ -153,53 +138,36 @@ public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
                        "name.$",\r
                        "name.rank.representations",\r
                        "name.status.type.representations",\r
-                       "name.nomenclaturalReference",\r
-                       \r
-//                     "name.combinationAuthorTeam.titleCache",\r
-//                     "name.basionymAuthorTeam.titleCache",\r
-//                     "name.exCombinationAuthorTeam.titleCache",\r
-//                     "name.exBasionymAuthorTeam.titleCache",\r
+                       "name.nomenclaturalReference"\r
                        });\r
        \r
        private static final List<String> SYNONYMY_INIT_STRATEGY = Arrays.asList(new String []{\r
                        // initialize homotypical and heterotypical groups; needs synonyms\r
                        "synonymRelations.$",\r
                        "synonymRelations.synonym.$",\r
-                       "synonymRelations.synonym.name.status.type",\r
                        "synonymRelations.synonym.name.status.type.representation",\r
-//                     "synonymRelations.synonym.name.taggedName",\r
-                       "synonymRelations.synonym.name.nomenclaturalReference.inBook",\r
-                       "synonymRelations.synonym.name.nomenclaturalReference.inJournal",\r
-                       "synonymRelations.synonym.name.nomenclaturalReference.inProceedings",\r
+                       "synonymRelations.synonym.name.nomenclaturalReference.inReference",\r
                        "synonymRelations.synonym.name.homotypicalGroup.typifiedNames.$",\r
-//                     "synonymRelations.synonym.name.homotypicalGroup.typifiedNames.name.taggedName",\r
                        "synonymRelations.synonym.name.homotypicalGroup.typifiedNames.taxonBases.$",\r
-//                     "synonymRelations.synonym.name.homotypicalGroup.typifiedNames.taxonBases.sec.titleCache", // needed to avoid lazyLoading Exceptions\r
-//                     "synonymRelations.synonym.name.homotypicalGroup.typifiedNames.taxonBases.name.taggedName",\r
                        "synonymRelations.synonym.name.combinationAuthorTeam.$",\r
                        \r
                        "name.homotypicalGroup.$",\r
                        "name.homotypicalGroup.typifiedNames.$",\r
-//                     "name.homotypicalGroup.typifiedNames.name.taggedName",\r
-                       \r
-                       "name.homotypicalGroup.typifiedNames.taxonBases.$",\r
-//                     "name.homotypicalGroup.typifiedNames.taxonBases.sec.titleCache", // needed to avoid lazyLoading Exceptions\r
-//                     "name.homotypicalGroup.typifiedNames.taxonBases.titleCache",\r
-                       //"name.homotypicalGroup.typifiedNames.taxonBases.name.taggedName"\r
                        \r
+                       "name.homotypicalGroup.typifiedNames.taxonBases.$"\r
        });\r
        \r
        private static final List<String> TAXONRELATIONSHIP_INIT_STRATEGY = Arrays.asList(new String []{\r
                        "$",\r
                        "type.inverseRepresentations",\r
                        "fromTaxon.sec",\r
-                       "fromTaxon.name.taggedName"\r
+                       "fromTaxon.name"\r
        });\r
        \r
        private static final List<String> NAMERELATIONSHIP_INIT_STRATEGY = Arrays.asList(new String []{\r
                        "$",\r
                        "type.inverseRepresentations",\r
-                       "fromName.taggedName",\r
+                       "fromName",\r
                        "toName.$",\r
        });\r
        \r
@@ -208,10 +176,6 @@ public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
                        "$",\r
                        "elements.$",\r
                        "elements.sources.citation.",\r
-//                     "elements.sources.citation.authorTeam.$",               \r
-//                     "elements.sources.citation.authorTeam.titleCache",\r
-//                     "elements.sources.citation.authorTeam.nomenclaturalTitleCache",\r
-                       "elements.sources.nameUsedInSource.titleCache",\r
                        "elements.sources.nameUsedInSource.originalNameString",\r
                        "elements.multilanguageText",\r
                        "elements.media.representations.parts",\r
@@ -237,9 +201,8 @@ public class TaxonPortalController extends BaseController<TaxonBase, ITaxonServi
        private static final List<String> TYPEDESIGNATION_INIT_STRATEGY = Arrays.asList(new String []{\r
                        //"$",\r
                        "typeSpecimen.$",\r
-                       "typeStatus.representations",\r
                        "citation",                     \r
-                       "typeName.taggedName",\r
+                       "typeName",\r
        });\r
        \r
        protected static final List<String> TAXONNODE_WITHTAXON_INIT_STRATEGY = Arrays.asList(new String []{\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalController.java
index 3568842982c7836db04e66c0189d9ff23ef8b9df..ad5b69fd94d51a6d710a25ed623bb133aa427406 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalController.java
@@ -44,7 +44,7 @@ public class TaxonomicTreePortalController extends AnnotatableController<Taxonom
        \r
        \r
        private static final List<String> TAXONTREE_INIT_STRATEGY = Arrays.asList(new String[]{\r
-                       "reference.authorTeam.titleCache"\r
+                       "reference.authorTeam"\r
        });\r
 \r
        public static final Logger logger = Logger.getLogger(TaxonomicTreePortalController.class);\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalListController.java
index 8b3f4d320ac935bd2bee70dab5aaa5c07d10aec6..bd4edbd565f287ca2ff630150879fc26d8f53ca9 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalListController.java
@@ -55,13 +55,12 @@ public class TaxonomicTreePortalListController extends BaseListController<Taxono
        \r
        \r
        private static final List<String> TAXONTREE_INIT_STRATEGY = Arrays.asList(new String[]{\r
-                       "reference.authorTeam.titleCache"\r
+                       "reference.authorTeam"\r
        });\r
        \r
        private static final List<String> NODE_INIT_STRATEGY = Arrays.asList(new String[]{\r
                        "taxon.sec", \r
-                       "taxon.name.taggedName",\r
-                       "taxon.name.titleCache"\r
+                       "taxon.name"\r
                        });\r
        \r
 \r