further refactor FindByIdentifierDTO and FindByMarkerDTO

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/EntityDTOBase.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/EntityDTOBase.java
index 8771c57bd3e7e86bd0bcf12e90c25e09c3b85da6..0d44ce669fb820652690ced0baf1a391486e7015 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/EntityDTOBase.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/EntityDTOBase.java
@@ -12,6 +12,7 @@ package eu.etaxonomy.cdm.api.service.dto;
 import java.util.UUID;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 
 
 /**
@@ -38,6 +39,14 @@ public abstract class EntityDTOBase<T extends CdmBase> {
 
     protected CdmEntity cdmEntity;
 
+    public EntityDTOBase(IdentifiableEntity entity){
+        this.cdmEntity = new CdmEntity(entity.getUuid(), entity.getTitleCache(), (T)entity);
+    }
+
+    public EntityDTOBase(UUID entityUuid, String label){
+        this.cdmEntity = new CdmEntity(entityUuid, label, null);
+    }
+
     public CdmEntity getCdmEntity() {
         return cdmEntity;
     }

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/IdentifiedEntityDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/IdentifiedEntityDTO.java
index 43b5c99ba39ad3a4a40265701fba5b08fdca72d6..7e3aee6b21db249b31c614d49450a6771a549674 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/IdentifiedEntityDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/IdentifiedEntityDTO.java
@@ -39,13 +39,13 @@ public class IdentifiedEntityDTO<T extends IdentifiableEntity> extends EntityDTO
 
 
        public IdentifiedEntityDTO(DefinedTerm identifierType, String identifier, T entity){
-               this.identifier = new AlternativeIdentifier(identifierType, identifier);
-               this.cdmEntity = new CdmEntity(entity.getUuid(), entity.getTitleCache(), entity);
+           super(entity);
+           this.identifier = new AlternativeIdentifier(identifierType, identifier);
        }
 
        public IdentifiedEntityDTO(DefinedTerm identifierType, String identifier, UUID entityUuid, String titleCache){
-               this.identifier = new AlternativeIdentifier(identifierType, identifier);
-               this.cdmEntity = new CdmEntity(entityUuid, null, null);
+           super(entityUuid, titleCache);
+           this.identifier = new AlternativeIdentifier(identifierType, identifier);
        }
 
        public AlternativeIdentifier getIdentifier() {

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/MarkedEntityDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/MarkedEntityDTO.java
index 2d405859edd04986453cdfdd4c2fa1766a7c6fb7..c5329e38ae98bebf561a318d005bec4583ed902c 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/MarkedEntityDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/MarkedEntityDTO.java
@@ -41,13 +41,13 @@ public class MarkedEntityDTO<T extends IdentifiableEntity> extends EntityDTOBase
        private Marker marker;
 
        public MarkedEntityDTO(MarkerType markerType, Boolean flag, T entity){
+           super(entity);
                this.marker = new Marker(markerType, flag);
-               this.cdmEntity = new CdmEntity(entity.getUuid(), entity.getTitleCache(), entity);
        }
 
        public MarkedEntityDTO(MarkerType markerType, Boolean flag, UUID entityUuid, String titleCache){
-               this.marker = new Marker(markerType, flag);
-               this.cdmEntity = new CdmEntity(entityUuid, titleCache, null);
+           super(entityUuid, titleCache);
+           this.marker = new Marker(markerType, flag);
        }
 
        public Marker getMarker() {