cleanup

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaUtilsTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaUtilsTest.java
index 39caf04d5de67d6fbd17d5abcb011af70e093570..6022572f856a51747deec4935ca5f0140da376c1 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaUtilsTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaUtilsTest.java
@@ -3,6 +3,7 @@ package eu.etaxonomy.cdm.model.media;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -85,7 +86,7 @@ public class MediaUtilsTest {
     @Test
     public void testFindPreferredMedia(){
 
-        ArrayList<Media> imageList = new ArrayList<>();
+        List<Media> imageList = new ArrayList<>();
         imageList.add(mediaImage1);
         imageList.add(mediaImage2);
         imageList.add(mediaImage3);
@@ -97,7 +98,7 @@ public class MediaUtilsTest {
         Assert.assertNotNull(findMediaByUUID(filteredList.keySet(), mediaImage2.getUuid()));
         Assert.assertNotNull(findMediaByUUID(filteredList.keySet(), mediaImage3.getUuid()));
 
-        ArrayList<Media> mixedMediaList =  new ArrayList<>();
+        List<Media> mixedMediaList =  new ArrayList<>();
         mixedMediaList.add(mediaImage1);
         mixedMediaList.add(mediaImage2);
         mixedMediaList.add(mediaImage3);

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java
index c3a37a2c97378f05ee7b7a6c4ae5cef54ea0bd94..0f461dfde79b69564c0ab78bf96718c9079c80f8 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java
@@ -2063,7 +2063,7 @@ public class DerivedUnitFacade {
        @Transient
        public List<Media> getDerivedUnitMedia() {
                if (! checkDerivedUnit()){
-                       return new ArrayList<Media>();
+                       return new ArrayList<>();
                }
                try {
                        List<Media> result = getMediaList(derivedUnit, false);

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
index ecdc6e19fcde3da838794b259f17daca7731073d..d0e32b64b1afea3cebf40346587684f21fb6b297 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java
@@ -263,7 +263,7 @@ public class DescriptionServiceImpl
     public Pager<Media> getMedia(DescriptionElementBase descriptionElement,    Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
         Long numberOfResults = descriptionElementDao.countMedia(descriptionElement);
 
-        List<Media> results = new ArrayList<Media>();
+        List<Media> results = new ArrayList<>();
         if(numberOfResults > 0) { // no point checking again //TODO use AbstractPagerImpl.hasResultsInRange(numberOfResults, pageNumber, pageSize)
             results = descriptionElementDao.getMedia(descriptionElement, pageSize, pageNumber, propertyPaths);
         }

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
index eb857911cc1487b3c7c6e9f44f2cae0a0af0bb7c..f683e3ab7a4f5f4327546285bc7011ccf52c522e 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java
@@ -417,11 +417,6 @@ public interface IDescriptionService extends IIdentifiableEntityService<Descript
       * Generate a string representation of the structured <code>description</code> supplied in natural language
       * The <code>featureTree</code> will be used to structure the NaturalLanguageDescription.
       * This method does not require a initialization strategy so there is no <code>propertyPaths</code> parameter.
-      * @param featureTree
-      * @param description
-      * @param preferredLanguages
-      * @param separator
-      * @return
       */
     public String generateNaturalLanguageDescription(TermTree featureTree,TaxonDescription description, List<Language> preferredLanguages, String separator);
 
@@ -430,7 +425,6 @@ public interface IDescriptionService extends IIdentifiableEntityService<Descript
      * @deprecated The means of determining this fact may change soon, so this method is
                     annotated as being deprecated.
      * @param description
-     * @return
      */
     @Deprecated
     public boolean hasStructuredData(DescriptionBase<?> description);
@@ -500,13 +494,9 @@ public interface IDescriptionService extends IIdentifiableEntityService<Descript
 
     public List<DescriptionBaseDto> loadDtosForTaxon(UUID taxonUuid);
 
-
     /**
-     * find the taxon node for the taxon associated to the specimen in classification with classificationUuid
-     * @param specimenUuid
-     * @param classificationUuid
-     * @return
+     * Find the taxon node for the taxon associated to the specimen in classification with classificationUuid
      */
-    TaxonNodeDto findTaxonNodeDtoForIndividualAssociation(UUID specimenUuid, UUID classificationUuid);
+    public TaxonNodeDto findTaxonNodeDtoForIndividualAssociation(UUID specimenUuid, UUID classificationUuid);
 
 }
\ No newline at end of file