optimizing initialization strategies

[cdmlib.git] / cdmlib-remote / src / main / java / eu / etaxonomy / cdm / remote / controller / TaxonPortalController.java

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