/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 06b2c5f6

Added by Andreas Kohlbecker over 3 years ago

ID 06b2c5f6f1d3b1839bbc847098f7519eb208c53f
Parent 80fc1bdb
Child aa52b6f0

ref #9252 ref #9257 exposing SpecimenOrObservationType filter to factory method and better flag handling

     import java.util.ArrayList;
     import java.util.Arrays;
     import java.util.Collection;
     import java.util.EnumSet;
     import java.util.HashMap;
     import java.util.HashSet;
     import java.util.Iterator;
-...
             if (!getSession().contains(fieldUnit)) {
                 fieldUnit = (FieldUnit) load(fieldUnit.getUuid());
+            }
             FieldUnitDTO fieldUnitDTO = FieldUnitDTO.fromEntity(fieldUnit);
             // FIXME the filter for SpecimenOrObservationType.PreservedSpecimen has been preserved from the former implementation (see commit 07e3f63c7d  and older)
             // it is questionable if this filter makes sense for all use cases or if it is only a sensible default for the
             // compressed specimen table in the cdm-dataportal (see #6816, #6870)
             FieldUnitDTO fieldUnitDTO = FieldUnitDTO.fromEntity(fieldUnit, EnumSet.of(SpecimenOrObservationType.PreservedSpecimen));
             return fieldUnitDTO;
+        }

     package eu.etaxonomy.cdm.api.service.dto;
     import java.util.ArrayList;
     import java.util.EnumSet;
     import java.util.HashMap;
     import java.util.List;
     import java.util.Map;
-...
     	private GatheringEventDTO gatheringEvent;
     	public static FieldUnitDTO fromEntity(FieldUnit entity){
             return FieldUnitDTO.fromEntity(entity, null);
+    	}
     	/**
          * Factory method for the construction of a FieldUnitDTO.
+         *
+         *
          * @param fieldUnit
          *     The FieldUnit entity to create a DTO for. Is null save.
          * @param specimenOrObservationTypeFilter
          *     Set of SpecimenOrObservationType to be included into the collection of {@link #getDerivates() derivative DTOs}
          */
     	public static FieldUnitDTO fromEntity(FieldUnit entity, EnumSet<SpecimenOrObservationType> specimenOrObservationTypeFilter){
             if(entity == null) {
                 return null;
+            }
             return new FieldUnitDTO(entity);
+    	}
             return new FieldUnitDTO(entity, specimenOrObservationTypeFilter);
+        }
         private FieldUnitDTO(FieldUnit fieldUnit) {
     	/**
     	 * @param fieldUnit
     	 *     The FieldUnit entity to create a DTO for
     	 * @param specimenOrObservationTypeFilter
     	 *     Set of SpecimenOrObservationType to be included into the collection of {@link #getDerivates() derivative DTOs}
     	 */
         private FieldUnitDTO(FieldUnit fieldUnit, EnumSet<SpecimenOrObservationType> specimenOrObservationTypeFilter ) {
             super(fieldUnit);
             if (fieldUnit.getGatheringEvent() != null){
                 gatheringEvent = GatheringEventDTO.newInstance(fieldUnit.getGatheringEvent());
-...
+                        }
                         collectionToCountMap.put(collection, herbariumCount + 1);
+                    }
                     if (derivedUnit.getRecordBasis().equals(SpecimenOrObservationType.PreservedSpecimen)) {
                         DerivedUnitDTO preservedSpecimenDTO = DerivedUnitDTO.fromEntity(derivedUnit, null);
                         addDerivate(preservedSpecimenDTO);
                         setHasCharacterData(isHasCharacterData() || preservedSpecimenDTO.isHasCharacterData());
                         setHasDetailImage(isHasDetailImage() || preservedSpecimenDTO.isHasDetailImage());
                         setHasDna(isHasDna() || preservedSpecimenDTO.isHasDna());
                         setHasSpecimenScan(isHasSpecimenScan() || preservedSpecimenDTO.isHasSpecimenScan());
                     if (specimenOrObservationTypeFilter.contains(derivedUnit.getRecordBasis())) {
                         DerivedUnitDTO derivedUnitDTO = DerivedUnitDTO.fromEntity(derivedUnit, null);
                         addDerivate(derivedUnitDTO);
                         setHasCharacterData(isHasCharacterData() || derivedUnitDTO.isHasCharacterData());
                         // NOTE! the flags setHasDetailImage, setHasDna, setHasSpecimenScan are also set in
                         // setDerivateDataDTO(), see below
                         setHasDetailImage(isHasDetailImage() || derivedUnitDTO.isHasDetailImage());
                         setHasDna(isHasDna() || derivedUnitDTO.isHasDna());
                         setHasSpecimenScan(isHasSpecimenScan() || derivedUnitDTO.isHasSpecimenScan());
+                    }
+                }
+            }
             // assemble derivate data DTO
             DerivateDataDTO derivateDataDTO = DerivateDataDTO.fromEntity(fieldUnit, null);
             setDerivateDataDTO(derivateDataDTO);

         public void setDerivateDataDTO(DerivateDataDTO derivateDataDTO) {
             this.derivateDataDTO = derivateDataDTO;
             if(derivateDataDTO != null) {
                 setHasSpecimenScan(!derivateDataDTO.getSpecimenScans().isEmpty());
                 setHasDetailImage(!derivateDataDTO.getDetailImages().isEmpty());
                 setHasDna(!derivateDataDTO.getMolecularDataList().isEmpty());
                 setHasSpecimenScan(isHasSpecimenScan() || !derivateDataDTO.getSpecimenScans().isEmpty());
                 setHasDetailImage(isHasDetailImage() || !derivateDataDTO.getDetailImages().isEmpty());
                 setHasDna(isHasDna() || !derivateDataDTO.getMolecularDataList().isEmpty());
+            }
+        }

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 06b2c5f6

Added by Andreas Kohlbecker over 3 years ago

Project

General

Profile

EDIT

Revision 06b2c5f6

Added by Andreas Kohlbecker over 3 years ago

Related issues