From bafda5d1f8edea71f130bbd0bb317fa59d0907c5 Mon Sep 17 00:00:00 2001 From: Andreas Kohlbecker Date: Mon, 2 Aug 2010 15:50:40 +0000 Subject: [PATCH] optimizing initialization strategies --- .../controller/ClassificationController.java | 7 +-- .../ClassificationListController.java | 2 +- .../DescriptionPortalController.java | 15 +----- .../cdm/remote/controller/NameController.java | 8 +-- .../controller/NamePortalController.java | 7 +-- .../controller/ReferenceController.java | 10 ++-- .../controller/TaxonNodeController.java | 3 +- .../controller/TaxonNodeListController.java | 3 +- .../controller/TaxonPortalController.java | 51 +++---------------- .../TaxonomicTreePortalController.java | 2 +- .../TaxonomicTreePortalListController.java | 5 +- 11 files changed, 26 insertions(+), 87 deletions(-) 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 7b8a234841..173f3fc2cf 100644 --- 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 NODE_INIT_STRATEGY(){ return Arrays.asList(new String[]{ "taxon.sec", - "taxon.name.taggedName", -// "taxon.name.combinationAuthorTeam.*", -// "taxon.name.exCombinationAuthorTeam.*", -// "taxon.name.basionymAuthorTeam.*", -// "taxon.name.exBasionymAuthorTeam.*", - "taxon.name.titleCache", + "taxon.name", "taxonomicTree" });} 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 2ae19737cb..c365d5a1fa 100644 --- 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 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 d55390b136..09d60e78a4 100644 --- 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 DESCRIPTIONS_DISTRIBUTION_INIT_STRATEGY = Arrays.asList(new String []{ - // taxon descriptions - //"$", - //"elements.$", - "elements.sources.citation", "elements.sources.citation.$", - "elements.area", "elements.area.$", - //"elements.area.level", }); protected static final List TAXONDESCRIPTION_INIT_STRATEGY = Arrays.asList(new String []{ "$", "elements.$", - "elements.sources.citation.", - "elements.sources.citation.authorTeam.$", -// "elements.sources.citation.authorTeam.titleCache", -// "elements.sources.citation.authorTeam.nomenclaturalTitleCache", - "elements.sources.nameUsedInSource.titleCache", + "elements.sources.citation.authorTeam.$", "elements.sources.nameUsedInSource.originalNameString", -// "elements.area", "elements.area.level", "elements.modifyingText", }); @@ -142,7 +131,7 @@ public class DescriptionPortalController extends AnnotatableController annotations = service.getDescriptionElementAnnotations(annotatableEntity, null, null, 0, null, ANNOTATION_INIT_STRATEGY); return annotations; } - + @RequestMapping(value = "/portal/description/{uuid_list}/DistributionTree", method = RequestMethod.GET) public DistributionTree doGetOrderedDistributionsB( @PathVariable("uuid_list") UuidList descriptionUuidList, 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 f0a2061a84..710597ff7f 100644 --- 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 TYPEDESIGNATION_INIT_STRATEGY = Arrays.asList(new String []{ "typeStatus.representations", - "typifiedNames.titleCache", - "typeSpecimen.titleCache", - "typeName.titleCache", + "typifiedNames", + "typeSpecimen", + "typeName", "citation", "citation.authorTeam.$", }); private static final List NAME_CACHE_INIT_STRATEGY = Arrays.asList(new String []{ - "titleCache" + }); public NameController(){ 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 632c493977..383dc302c0 100644 --- 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 TYPEDESIGNATION_INIT_STRATEGY = Arrays.asList(new String []{ "typeName.$", - "typeName.titleCache", - "typeSpecimen.titleCache", + "typeSpecimen", "typeStatus.representations", - "typeStatus.representations", - "typifiedNames.titleCache", - "citation", + "typifiedNames", "citation.authorTeam.$", "typeSpecimen.media.representations.parts" }); 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 f568547d2e..2a2fb67a9e 100644 --- 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 NOMENCLATURAL_CITATION_INIT_STRATEGY = Arrays.asList(new String []{ - "$.authorTeam.titleCache", - "inBook.authorTeam.titleCache", - "inJournal.authorTeam.titleCache", - "inProceedings.authorTeam.titleCache", + "$", + "authorTeam", // TODO obsolete?? + "inReference.authorTeam" }); private static final List CITATION_WITH_AUTHORTEAM_INIT_STRATEGY = Arrays.asList(new String []{ - "authorTeam.$", - "authorTeam.titleCache", + "authorTeam.$" // TODO obsolete?? }); @InitBinder 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 2e6af312e6..a4e1a541f2 100644 --- 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 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 fa509f498e..beaa138654 100644 --- 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 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 24fa690b14..18fc0773c8 100644 --- 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 TAXON_INIT_STRATEGY = Arrays.asList(new String []{ "*", // taxon relations - "relationsToThisName.fromTaxon.name.taggedName", + "relationsToThisName.fromTaxon.name", // the name "name.$", - "name.taggedName", "name.rank.representations", "name.status.type.representations", -// "name.combinationAuthorTeam.titleCache", -// "name.basionymAuthorTeam.titleCache", -// "name.exCombinationAuthorTeam.titleCache", -// "name.exBasionymAuthorTeam.titleCache", - // taxon descriptions - "descriptions.elements.$", - "descriptions.elements.area", "descriptions.elements.area.$", "descriptions.elements.multilanguageText", "descriptions.elements.media.representations.parts", "descriptions.elements.media.title", - -// // typeDesignations -// "name.typeDesignations.$", -// "name.typeDesignations.citation.authorTeam", -// "name.typeDesignations.typeName.$", -// "name.typeDesignations.typeStatus.representations", -// "name.typeDesignations.typeSpecimen.media.representations.parts" }); @@ -153,53 +138,36 @@ public class TaxonPortalController extends BaseController SYNONYMY_INIT_STRATEGY = Arrays.asList(new String []{ // initialize homotypical and heterotypical groups; needs synonyms "synonymRelations.$", "synonymRelations.synonym.$", - "synonymRelations.synonym.name.status.type", "synonymRelations.synonym.name.status.type.representation", -// "synonymRelations.synonym.name.taggedName", - "synonymRelations.synonym.name.nomenclaturalReference.inBook", - "synonymRelations.synonym.name.nomenclaturalReference.inJournal", - "synonymRelations.synonym.name.nomenclaturalReference.inProceedings", + "synonymRelations.synonym.name.nomenclaturalReference.inReference", "synonymRelations.synonym.name.homotypicalGroup.typifiedNames.$", -// "synonymRelations.synonym.name.homotypicalGroup.typifiedNames.name.taggedName", "synonymRelations.synonym.name.homotypicalGroup.typifiedNames.taxonBases.$", -// "synonymRelations.synonym.name.homotypicalGroup.typifiedNames.taxonBases.sec.titleCache", // needed to avoid lazyLoading Exceptions -// "synonymRelations.synonym.name.homotypicalGroup.typifiedNames.taxonBases.name.taggedName", "synonymRelations.synonym.name.combinationAuthorTeam.$", "name.homotypicalGroup.$", "name.homotypicalGroup.typifiedNames.$", -// "name.homotypicalGroup.typifiedNames.name.taggedName", - - "name.homotypicalGroup.typifiedNames.taxonBases.$", -// "name.homotypicalGroup.typifiedNames.taxonBases.sec.titleCache", // needed to avoid lazyLoading Exceptions -// "name.homotypicalGroup.typifiedNames.taxonBases.titleCache", - //"name.homotypicalGroup.typifiedNames.taxonBases.name.taggedName" + "name.homotypicalGroup.typifiedNames.taxonBases.$" }); private static final List TAXONRELATIONSHIP_INIT_STRATEGY = Arrays.asList(new String []{ "$", "type.inverseRepresentations", "fromTaxon.sec", - "fromTaxon.name.taggedName" + "fromTaxon.name" }); private static final List NAMERELATIONSHIP_INIT_STRATEGY = Arrays.asList(new String []{ "$", "type.inverseRepresentations", - "fromName.taggedName", + "fromName", "toName.$", }); @@ -208,10 +176,6 @@ public class TaxonPortalController extends BaseController TYPEDESIGNATION_INIT_STRATEGY = Arrays.asList(new String []{ //"$", "typeSpecimen.$", - "typeStatus.representations", "citation", - "typeName.taggedName", + "typeName", }); protected static final List TAXONNODE_WITHTAXON_INIT_STRATEGY = Arrays.asList(new String []{ 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 3568842982..ad5b69fd94 100644 --- 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 TAXONTREE_INIT_STRATEGY = Arrays.asList(new String[]{ - "reference.authorTeam.titleCache" + "reference.authorTeam" }); public static final Logger logger = Logger.getLogger(TaxonomicTreePortalController.class); 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 8b3f4d320a..bd4edbd565 100644 --- 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 TAXONTREE_INIT_STRATEGY = Arrays.asList(new String[]{ - "reference.authorTeam.titleCache" + "reference.authorTeam" }); private static final List NODE_INIT_STRATEGY = Arrays.asList(new String[]{ "taxon.sec", - "taxon.name.taggedName", - "taxon.name.titleCache" + "taxon.name" }); -- 2.34.1