Revision ec3ca64c
Added by Andreas Kohlbecker over 3 years ago
| cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/RegistrationDtoBeanProcessor.java | ||
|---|---|---|
| 26 | 26 |
return Arrays.asList( |
| 27 | 27 |
"blockedBy", |
| 28 | 28 |
"blocked", |
| 29 |
"orderdTypeDesignationWorkingSets", |
|
| 30 |
"submitterUserName", |
|
| 31 |
"specificIdentifier", |
|
| 32 |
"typifiedName" |
|
| 29 |
"submitterUserName" |
|
| 33 | 30 |
); |
| 34 | 31 |
} |
| 35 | 32 |
|
| cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml | ||
|---|---|---|
| 520 | 520 |
<entry key="java.util.Map"> |
| 521 | 521 |
<bean class="eu.etaxonomy.cdm.remote.json.processor.value.MapJSONValueProcessor" /> |
| 522 | 522 |
</entry> |
| 523 |
<entry key="java.util.LinkedHashMap"> |
|
| 524 |
<bean class="eu.etaxonomy.cdm.remote.json.processor.value.MapJSONValueProcessor" /> |
|
| 525 |
</entry> |
|
| 526 |
<entry key="eu.etaxonomy.cdm.api.service.name.TypeDesignationSetManager.TypeDesignationWorkingSet"> |
|
| 527 |
<bean class="eu.etaxonomy.cdm.remote.json.processor.value.MapJSONValueProcessor" /> |
|
| 528 |
</entry> |
|
| 523 | 529 |
<entry key="java.net.URI"> |
| 524 | 530 |
<bean class="eu.etaxonomy.cdm.remote.json.processor.value.URIJSONValueProcessor"/> |
| 525 | 531 |
</entry> |
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java | ||
|---|---|---|
| 395 | 395 |
@Override |
| 396 | 396 |
public FieldUnitDTO assembleFieldUnitDTO(FieldUnit fieldUnit) {
|
| 397 | 397 |
|
| 398 |
load(fieldUnit.getUuid()); // reload since this is also called from a web service controller |
|
| 399 |
|
|
| 400 | 398 |
if (!getSession().contains(fieldUnit)) {
|
| 401 | 399 |
fieldUnit = (FieldUnit) load(fieldUnit.getUuid()); |
| 402 | 400 |
} |
| ... | ... | |
| 538 | 536 |
if (!getSession().contains(derivedUnit)) {
|
| 539 | 537 |
derivedUnit = (DerivedUnit) load(derivedUnit.getUuid()); |
| 540 | 538 |
} |
| 541 |
derivedUnit = (DerivedUnit) load(derivedUnit.getUuid(), Arrays.asList( |
|
| 542 |
"$", |
|
| 543 |
"specimenTypeDesignations.source", |
|
| 544 |
"specimenTypeDesignations.typeSpecimen.media.title", |
|
| 545 |
"specimenTypeDesignations.typeSpecimen.derivedFrom.originals.derivationEvents.derivatives.derivationEvents.derivatives.mediaSpecimen" |
|
| 546 |
) |
|
| 547 |
); |
|
| 548 | 539 |
PreservedSpecimenDTO preservedSpecimenDTO = new PreservedSpecimenDTO(derivedUnit); |
| 549 | 540 |
|
| 550 | 541 |
//specimen identifier |
Also available in: Unified diff
ref #9238 removing quick fix allied in 4d6b5667 and adapting config for json serialization