some refactoring due to schema changes from quadrige3-core 3.6.0

Signed-off-by: lp1ee9d <ludovic.pecquot@e-is.pro>

pom.xml

@@ -171,7 +171,7 @@
     <maven.compiler.debug>true</maven.compiler.debug>
 
     <!-- Quadrige3 Core version -->
-    <quadrige3-core.version>3.5.6</quadrige3-core.version>
+    <quadrige3-core.version>3.6.0-SNAPSHOT</quadrige3-core.version>
 
     <!-- Last ReefDb launcher version -->
     <launcherVersion>3.0.3</launcherVersion>

reefdb-core/src/main/java/fr/ifremer/reefdb/dao/administration/strategy/ReefDbStrategyDaoImpl.java

@@ -359,7 +359,7 @@ public class ReefDbStrategyDaoImpl extends StrategyDaoImpl implements ReefDbStra
                             pmfmStrategy = PmfmStrategy.Factory.newInstance();
                             Integer newId = TemporaryDataHelper.<Integer>getNewNegativeIdForTemporaryData(getSession(), pmfmStrategy.getClass());
                             pmfmStrategy.setPmfmStratId(newId);
-                            pmfmStrategy.setPmfmStratParAcquisNumber(1d);
+                            pmfmStrategy.setPmfmStratParAcquisNumber(1);
                         }
 
                         savePmfmStrategy(psfmProgStrat, pmfmStrategy, rank++);

reefdb-core/src/main/java/fr/ifremer/reefdb/dao/data/measurement/ReefDbMeasurementDaoImpl.java

@@ -475,7 +475,7 @@ public class ReefDbMeasurementDaoImpl extends MeasurementDaoImpl implements Reef
             // save as numeric value
             target.setMeasNumerValue(measurement.getNumericalValue() == null ? null : measurement.getNumericalValue().floatValue());
             target.setMeasPrecisionValue(measurement.getPrecision() == null ? null : measurement.getPrecision().floatValue());
-            target.setMeasDigitNumber(measurement.getDigitNb() == null ? null : measurement.getDigitNb().doubleValue());
+            target.setMeasDigitNumber(measurement.getDigitNb());
             target.setQualitativeValue(null);
         }
 
@@ -593,7 +593,7 @@ public class ReefDbMeasurementDaoImpl extends MeasurementDaoImpl implements Reef
             // save as numeric value
             target.setTaxonMeasNumerValue(measurement.getNumericalValue() == null ? null : measurement.getNumericalValue().floatValue());
             target.setTaxonMeasPrecisionValue(measurement.getPrecision() == null ? null : measurement.getPrecision().floatValue());
-            target.setTaxonMeasDigitNumber(measurement.getDigitNb() == null ? null : measurement.getDigitNb().doubleValue());
+            target.setTaxonMeasDigitNumber(measurement.getDigitNb());
             target.setQualitativeValue(null);
         }
 

reefdb-core/src/main/java/fr/ifremer/reefdb/dao/data/samplingoperation/ReefDbSamplingOperationDaoImpl.java

@@ -351,7 +351,7 @@ public class ReefDbSamplingOperationDaoImpl extends SamplingOperationDaoImpl imp
     private void beanToEntity(SamplingOperationDTO bean, SamplingOperation entity, Survey survey) {
 
         entity.setSamplingOperLb(bean.getName());
-        entity.setSamplingOperTime(bean.getTime() != null ? Double.valueOf(bean.getTime()) : null);
+        entity.setSamplingOperTime(bean.getTime());
         entity.setSamplingOperUtFormat(survey.getSurveyUtFormat());
         entity.setSamplingOperCm(bean.getComment());
         entity.setSamplingOperControlDt(bean.getControlDate());
@@ -395,7 +395,7 @@ public class ReefDbSamplingOperationDaoImpl extends SamplingOperationDaoImpl imp
             entity.setDepthUnit(null);
         }
 
-        entity.setSamplingOperNumberIndiv(bean.getIndividualCount() == null ? null : Double.valueOf(bean.getIndividualCount()));
+        entity.setSamplingOperNumberIndiv(bean.getIndividualCount());
 
         if (bean.getPositioning() == null) {
             entity.setPositionningSystem(null);

reefdb-core/src/main/java/fr/ifremer/reefdb/dao/data/survey/ReefDbSurveyDaoImpl.java

@@ -738,7 +738,7 @@ public class ReefDbSurveyDaoImpl extends SurveyDaoImpl implements ReefDbSurveyDa
         }
 
         // optional attributes
-        entity.setSurveyTime(bean.getTime() != null ? Double.valueOf(bean.getTime()) : null);
+        entity.setSurveyTime(bean.getTime());
         entity.setSurveyLb(bean.getName());
         entity.setSurveyCm(bean.getComment());