Project

General

Profile

« Previous | Next » 

Revision 84d9a25e

Added by Andreas Kohlbecker over 3 years ago

ref #6581 ref #9222 adding PolytomousKeyNodePortalController and missing name.nomenclaturalSource init strategys in TaxonPortalController

View differences:

cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
40 40
import eu.etaxonomy.cdm.api.service.util.TaxonRelationshipEdge;
41 41
import eu.etaxonomy.cdm.database.UpdatableRoutingDataSource;
42 42
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
43
import eu.etaxonomy.cdm.model.common.CdmBase;
43 44
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
44 45
import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;
45 46
import eu.etaxonomy.cdm.model.location.NamedArea;
......
118 119
            // the name
119 120
            "name.$",
120 121
            "name.nomenclaturalSource.citation.authorship",
121
            "name.nomenclaturalSource.citation.inReference",
122
            "name.nomenclaturalSource.citation.inReference.authorship",
122 123
            "name.rank.representations",
123 124
            "name.status.type.representations",
124 125
            "name.status.source.citation",
......
152 153
            "synonyms.name.status.type.representations",
153 154
            "synonyms.name.status.source.citation",
154 155
            "synonyms.name.nomenclaturalSource.citation.authorship",
155
            "synonyms.name.nomenclaturalSource.citation.inReference",
156
            "synonyms.name.nomenclaturalSource.citation.inReference.authorship",
156 157
//            "synonyms.name.homotypicalGroup.typifiedNames.$",
157 158
//            "synonyms.name.homotypicalGroup.typifiedNames.taxonBases.$",
158 159
            "synonyms.name.combinationAuthorship.$",
......
162 163
            "name.homotypicalGroup.$",
163 164
            "name.homotypicalGroup.typifiedNames.$",
164 165
            "name.homotypicalGroup.typifiedNames.nomenclaturalSource.citation.authorship",
165
            "name.homotypicalGroup.typifiedNames.nomenclaturalSource.citation.inReference",
166
            "name.homotypicalGroup.typifiedNames.nomenclaturalSource.citation.inReference.authorship",
166 167
//            "name.homotypicalGroup.typifiedNames.taxonBases.$"
167 168
    }));
168 169

  
......
182 183
            "source.citation",
183 184
            "toName.$",
184 185
            "toName.nomenclaturalSource.citation.authorship",
185
            "toName.nomenclaturalSource.citation.inReference",
186
            "toName.nomenclaturalSource.citation.inReference.authorship",
186 187
            "fromName.$",
187 188
            "fromName.nomenclaturalSource.citation.authorship",
188
            "fromName.nomenclaturalSource.citation.inReference",
189
            "fromName.nomenclaturalSource.citation.inReference.authorship",
189 190

  
190 191
    }));
191 192

  
......
194 195
    protected static final EntityInitStrategy DESCRIPTION_ELEMENT_INIT_STRATEGY = new EntityInitStrategy(Arrays.asList(new String []{
195 196
            "$",
196 197
            "sources.citation.authorship",
198
            "sources.citation.inReference.authorship",
197 199
            "sources.nameUsedInSource",
198 200
            "multilanguageText",
199 201
            "media",
......
228 230
            "taxonNodes.classification",
229 231
            "taxonNodes.parent",
230 232
            "taxonNodes.statusNote.*",
231
            "taxonNodes.source.citation",
233
            "taxonNodes.source.citation.authorship",
234
            "taxonNodes.source.inReference.authorship",
232 235
            "acceptedTaxon.taxonNodes.classification",
233 236
    }));
234 237

  
235 238
    private static final String termTreeUuidPattern = "^/taxon(?:(?:/)([^/?#&\\.]+))+.*";
236 239

  
240
    @Override
241
    protected <CDM_BASE extends CdmBase> List<String> complementInitStrategy(Class<CDM_BASE> clazz,
242
            List<String> pathProperties) {
243

  
244
        List<String> complemented = new ArrayList<>(pathProperties);
245
        if(pathProperties.contains("name")) {
246
            // pathProperties for web service request for portal/taxon/{uuid}/name
247
            complemented.add("name.nomenclaturalSource.citation.authorship");
248
            complemented.add("name.nomenclaturalSource.citation.inReference.authorship");
249
        }
250
        return complemented;
251
    }
237 252

  
238 253
    public TaxonPortalController(){
239 254
        super();

Also available in: Unified diff