cleanup

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/ref/TypedEntityReference.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/ref/TypedEntityReference.java
index 6ebe55340acb99f39ff862fa0ab52a5174287d30..b447c6ce99c5c016b74f207865212173014f3000 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/ref/TypedEntityReference.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/ref/TypedEntityReference.java
@@ -30,19 +30,11 @@ public class TypedEntityReference<T extends CdmBase> extends EntityReference {
 
     private Class<T> type;
 
-    /**
-     * @deprecated use factory method instead, should only be used by in DTO sub-class constructors
-     */
-    @Deprecated
     protected TypedEntityReference(Class<T> type, UUID uuid, String label) {
         super(uuid, label);
         this.type = type;
     }
 
-    /**
-     * @deprecated use factory method instead, should only be used by in DTO sub-class constructors
-     */
-    @Deprecated
     protected TypedEntityReference(T entity) {
         this.type = (Class<T>) entity.getClass();
         this.uuid = entity.getUuid();

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
index b761223897f27d77ef1002c79ebc85a0f023ebde..d0345fbcf9051127b09bee4338ee26b55f646f2b 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
@@ -765,7 +765,6 @@ public class OccurrenceServiceImpl
     @Override
     public Collection<SpecimenOrObservationBaseDTO> findRootUnitDTOs(UUID unitUUID) {
 
-
         SpecimenOrObservationBase<?> entity = load(unitUUID);
         SpecimenOrObservationBaseDTO derivedUnitDTO = SpecimenOrObservationDTOFactory.fromEntity(entity);
         Collection<SpecimenOrObservationBaseDTO> rootUnitDTOs = new ArrayList<>();

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/CollectionDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/CollectionDTO.java
index 56de7d3c6287e3edf8f662d85ed391274da72e61..45cce107bb40044f21ba1c435d2569f297f0287a 100755 (executable)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/CollectionDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/CollectionDTO.java
@@ -35,11 +35,7 @@ public class CollectionDTO extends TypedEntityReference<Collection> {
         return new CollectionDTO(entity);
     }
 
-    /**
-     * @deprecated use factory instead
-     */
-    @Deprecated
-    public CollectionDTO(Collection collection) {
+    private CollectionDTO(Collection collection) {
         this(collection, new HashSet<>());
     }
 

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/SpecimenOrObservationBaseDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/SpecimenOrObservationBaseDTO.java
index b159954eba08117aeac0ef2441cc68e7a7af809f..feea056de70520dc6e3511d4b63eea0953c333ab 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/SpecimenOrObservationBaseDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/SpecimenOrObservationBaseDTO.java
@@ -289,8 +289,6 @@ public abstract class SpecimenOrObservationBaseDTO extends TypedEntityReference<
         this.derivatives.addAll(derivatives);
         updateTreeDependantData(derivatives);
     }
-    
-    
 
     /**
      * To be overwritten by implementing classes to