From: Katja <k.luther@bgbm.org>
Date: Thu, 18 Jan 2024 21:19:43 +0000 (+0100)
Subject: ref #10441: some more propertypath adaptions
X-Git-Tag: 5.42.0^2~76
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/d41da5c3e9a763c5f601ae844209a3e6d5be1b2f

ref #10441: some more propertypath adaptions
---

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionElementListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionElementListController.java
index 21fedeb7e3..b09ed652b5 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionElementListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionElementListController.java
@@ -81,8 +81,8 @@ public class DescriptionElementListController {
             "stateData.modifyingText",
             "stateData.categoricalData.$",
             "annotations.$",
-            "annotations.type.$",
-            "annotations.type.includes.$"
+            "annotations.annotationType.$",
+            "annotations.annotationType.includes.$"
     });
 
     protected List<String> getInitializationStrategy() {
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
index c6f757589e..2138edc93c 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
@@ -98,7 +98,8 @@ public class TaxonListController extends AbstractIdentifiableListController<Taxo
         setInitializationStrategy(Arrays.asList(new String[]{
                 "$",
                 "annotations.$",
-                "annotations.type.includes.$",
+                "annotations.annotationType.$",
+                "annotations.annotationType.includes.$",
                 "name.nomenclaturalSource.citation"
                 }));
     }
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 de772b6f59..c224aa53be 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
@@ -149,7 +149,8 @@ public class TaxonPortalController extends TaxonController{
             "secSource.citation.authorship.$",
             "secSource.citation.inReference.authorship.$",
             "annotations.$",
-            "annotations.type.includes.$"
+            "annotations.annotationType.$",
+            "annotations.annotationType.includes.$"
 //            "descriptions" // TODO remove
 
             }));
@@ -194,6 +195,10 @@ public class TaxonPortalController extends TaxonController{
             "name.homotypicalGroup.typifiedNames.$",
             "name.homotypicalGroup.typifiedNames.nomenclaturalSource.citation.authorship",
             "name.homotypicalGroup.typifiedNames.nomenclaturalSource.citation.inReference.authorship",
+            "synonyms.annotations.$",
+            "synonyms.annotations.annotationType.$",
+            "synonyms.annotations.annotationType.includes.$"
+
 //            "name.homotypicalGroup.typifiedNames.taxonBases.$"
     }));
 
diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalListController.java
index b51a33ef60..8396a7a95e 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalListController.java
@@ -30,9 +30,13 @@ public class TaxonPortalListController extends TaxonListController {
             null,
             Arrays.asList(
             "annotations.$",
-            "annotations.type.includes.$",
-            "synonym.name.nomenclaturalSource.citation.authorship",
-            "synonym.name.nomenclaturalSource.citation.inReference.authorship",
+            "annotations.annotationType.$",
+            "annotations.annotationType.includes.$",
+            "synonyms.annotations.$",
+            "synonyms.annotations.annotationType.$",
+            "synonyms.annotations.annotationType.includes.$",
+            "synonyms.name.nomenclaturalSource.citation.authorship",
+            "synonyms.name.nomenclaturalSource.citation.inReference.authorship",
             "relationsFromThisTaxon.toTaxon.taxonNodes" // needed for misapplications, see Taxon.isMisapplicationOnly()
             ),
             false