cleanup

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
index 24344449ab347be52f3927bd010205d14b5bb65e..621fed356c0ecbc877c9c310bb2daff750eaf000 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
@@ -1341,12 +1341,6 @@ public class Language extends DefinedTermBase<Language> {
        return null;
     }
 
-    /**
-     *
-     *
-     * @param uuid
-     * @return
-     */
     public static Language getLanguageFromUuid(UUID uuid) {
         if(termMap == null || termMap.isEmpty()) {
             return getTermByClassAndUUID(Language.class, uuid);
@@ -1369,7 +1363,6 @@ public class Language extends DefinedTermBase<Language> {
         }
     }
 
-
  // ******************************** toString *********************/
      @Override
      public String toString() {
@@ -1379,5 +1372,4 @@ public class Language extends DefinedTermBase<Language> {
              return super.toString();
          }
      }
-
-}
+}
\ No newline at end of file

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java
index bc736a2e1cf0476f64ef81c09fb9f6789f7185e8..15c50476f0ddc79e55d846323871b87bb3d72fdd 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/CategoricalData.java
@@ -267,7 +267,6 @@ public class CategoricalData extends DescriptionElementBase {
                 + "]";
     }
 
-
 //*********************************** CLONE *****************************************/
 
     /**

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefinedTermBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefinedTermBase.java
index 3fe447f3ac5e61545d854ae10fc33a396169e476..bc622e4bee87e3c1fcfeedb0192f6b663814e5d3 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefinedTermBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/DefinedTermBase.java
@@ -695,7 +695,6 @@ public abstract class DefinedTermBase<T extends DefinedTermBase>
     // Currently the CDM Caching mechanism is only used for caching terms
     private static ICdmUuidCacher cacher;
 
-
     /**
      * Gets the CDM cacher object
      *
@@ -716,10 +715,10 @@ public abstract class DefinedTermBase<T extends DefinedTermBase>
 
        public static <T extends DefinedTermBase> T getTermByClassAndUUID(Class<T> clazz, UUID uuid) {
            if(cacher != null) {
-               Object obj = HibernateProxyHelper.deproxy(getCacher().load(uuid));
+               CdmBase cdmBase = HibernateProxyHelper.deproxy(getCacher().load(uuid));
 
-               if(obj != null && obj.getClass().equals(clazz)) {
-                   return (T)obj;
+               if(cdmBase != null && cdmBase.getClass().equals(clazz)) {
+                   return (T)cdmBase;
                }
            }
            return null;

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/CategoricalDataTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/CategoricalDataTest.java
index 76b953a583093e30c722550daa7647e1e4f10d13..670ef34f58bca4aa424a1f54dcbdcab4a0f29b87 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/CategoricalDataTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/CategoricalDataTest.java
@@ -97,7 +97,7 @@ public class CategoricalDataTest {
         useCategoryVocabulary.addTerm(useCategory2);
         State useCategory3 = State.NewInstance("My 3rd use category", "use category 3", null);
         useCategoryVocabulary.addTerm(useCategory3);
-        List<State> newStates = new ArrayList<State>();
+        List<State> newStates = new ArrayList<>();
         newStates.addAll(Arrays.asList(useCategory2, useCategory3));
 
         // setting new states and thus removing useCategory1

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmCacherBase.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmCacherBase.java
index 73c56b68ddedde4b3f05f87c1130ba87130c01ef..de3acbc0653b9847c9ccfbedf483b4f92f49ca59 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmCacherBase.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmCacherBase.java
@@ -31,7 +31,7 @@ import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
  */
 public abstract class CdmCacherBase implements ICdmUuidCacher {
 
-    public static final Logger logger = LogManager.getLogger(CdmCacherBase.class);
+    public static final Logger logger = LogManager.getLogger();
 
     @Autowired
     public CacheManager cacheManager;

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java
index 8ccda7ad3e4992ef38b8c44fc4a62a1a45982bbf..be3146a74124675d6c0a3ef36dd4dc92ba14822c 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/cache/CdmTermCacher.java
@@ -56,4 +56,4 @@ public class CdmTermCacher extends CdmCacherBase {
         }
         return cachedCdmEntity;
     }
-}
+}
\ No newline at end of file

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 53724ebf8a1cee36befc1dc2c84007c58f4040f8..30d8a16b917db4548a90f62970a913ba433ac70d 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
@@ -520,12 +520,13 @@ public class DescriptionServiceImpl
                             data.getStatisticalValues().clear();
                             for (StatisticalMeasurementValueDto dataDto: valueDtos){
                                 //create new statedata
-                                StatisticalMeasurementValue newStatisticalMeasurement = StatisticalMeasurementValue.NewInstance(DefinedTermBase.getTermByClassAndUUID(StatisticalMeasure.class, dataDto.getType().getUuid()), dataDto.getValue());
+                                StatisticalMeasure sm = DefinedTermBase.getTermByClassAndUUID(StatisticalMeasure.class, dataDto.getType().getUuid());
+                                StatisticalMeasurementValue newStatisticalMeasurement = StatisticalMeasurementValue.NewInstance(sm, dataDto.getValue());
                                 statisticalValues.add(newStatisticalMeasurement);
                                 data.addStatisticalValue(newStatisticalMeasurement);
                             }
 
-//                            data.getStatisticalValues().addAll(statisticalValues);
+//                          data.getStatisticalValues().addAll(statisticalValues);
                             data = StructuredDescriptionAggregation.handleMissingMinOrMax(data,
                                     MissingMinimumMode.MinToZero, MissingMaximumMode.MaxToMin);
                             desc.addElement(data);
@@ -544,13 +545,12 @@ public class DescriptionServiceImpl
                                 desc.removeElement(data);
                             }else{
                                 for (StateDataDto dataDto: stateDtos){
-                                    //FIXME 10196
-                                    State newState = DefinedTermBase.getTermByClassAndUUID(State.class, dataDto.getState().getUuid());
+                                    //FIXME 10196 fixed
+                                    DefinedTermBase<?> newState = DefinedTermBase.getTermByUUID(dataDto.getState().getUuid(), DefinedTermBase.class);
                                     StateData newStateData = StateData.NewInstance(newState);
                                     data.addStateData(newStateData);
                                 }
                             }
-
                         }else if (elementBase.isInstanceOf(QuantitativeData.class)){
                             QuantitativeData data = HibernateProxyHelper.deproxy(elementBase, QuantitativeData.class);
 

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptiveDataSetService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptiveDataSetService.java
index f3c1adb41bccb9b1010d3d31a00fa1845e879727..e1951016b77f9d59d72329f99c8899689810c6d5 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptiveDataSetService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptiveDataSetService.java
@@ -290,8 +290,6 @@ public class DescriptiveDataSetService
                 result.addUpdatedObject(taxon);
             }
 
-
-
             UUID specimenDescriptionUuid = wrapper.getDescription().getDescriptionUuid();
             DescriptionBaseDto descriptionDto = wrapper.getDescription();
             DescriptionBase<?> specimenDescription =  descriptionService.load(specimenDescriptionUuid);
@@ -328,7 +326,6 @@ public class DescriptiveDataSetService
                         }
                     }
                 }
-
             }else {
                 List<DescriptionElementDto> elementDtos = descriptionDto.getElements();
                 for (DescriptionElementDto elementDto: elementDtos){

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RowWrapperDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RowWrapperDTO.java
index e94e8fff3a758381ca87276eb2381ac50803c652..0b65a48883d4feecf61654c59decbf24ca944227 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RowWrapperDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RowWrapperDTO.java
@@ -238,7 +238,6 @@ public abstract class RowWrapperDTO <T extends DescriptionBase> implements Seria
                     categoricalData.setStateDataOnly(states);
                 }
             }
-
         }else{
             Feature feature = DefinedTermBase.getTermByClassAndUUID(Feature.class, featureUuid);
             if (feature == null){
@@ -320,8 +319,6 @@ public abstract class RowWrapperDTO <T extends DescriptionBase> implements Seria
                     quantitativeData = (QuantitativeDataDto)dto;
                 }
             }
-
-
         }
         if (quantitativeData == null){
             //TODO: check whether this is possible

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/SpecimenRowWrapperDTO.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/SpecimenRowWrapperDTO.java
index 4c5e49583a4a57184bd19c2407a68323708bf1b9..ad88dff8b9d7dda05f45bfe11bd69dde36227bc9 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/SpecimenRowWrapperDTO.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/SpecimenRowWrapperDTO.java
@@ -58,16 +58,16 @@ public class SpecimenRowWrapperDTO extends RowWrapperDTO<SpecimenDescription> {
 
     public SpecimenRowWrapperDTO(SpecimenOrObservationBase specimen, TaxonNodeDto taxonNode, UuidAndTitleCache<FieldUnit> fieldUnit, String identifier,
             NamedArea country) {
-    super(new DescriptionBaseDto(new UuidAndTitleCache<SpecimenOrObservationBase>(specimen.getUuid(), specimen.getId(), specimen.getTitleCache())), taxonNode);
-    if (fieldUnit != null){
-        this.fieldUnit = fieldUnit;
-    }
-    this.identifier = identifier;
-    this.country = country;
-    this.specimenDto = SpecimenOrObservationDTOFactory.fromEntity(specimen);
-    this.type = specimen.getRecordBasis();
+        super(new DescriptionBaseDto(new UuidAndTitleCache<SpecimenOrObservationBase>(specimen.getUuid(), specimen.getId(), specimen.getTitleCache())), taxonNode);
+        if (fieldUnit != null){
+            this.fieldUnit = fieldUnit;
+        }
+        this.identifier = identifier;
+        this.country = country;
+        this.specimenDto = SpecimenOrObservationDTOFactory.fromEntity(specimen);
+        this.type = specimen.getRecordBasis();
 
-}
+    }
     public SpecimenOrObservationBaseDTO getSpecimenDto() {
         return specimenDto;
     }