[Tutti-commits] 46/98: improve CsvProducer API

16 Feb 2015

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository tutti.

See http://git.codelutin.com/tutti.git

commit f08120feab492a69d25d0867ebdd2ede91976745
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Wed Feb 11 17:26:03 2015 +0100

    improve CsvProducer API
---
 .../src/main/java/fr/ifremer/tutti/service/csv/CsvProducer.java   | 6 +++---
 .../genericformat/producer/CsvProducerForAccidentalCatch.java     | 6 +++---
 .../tutti/service/genericformat/producer/CsvProducerForCatch.java | 6 +++---
 .../genericformat/producer/CsvProducerForGearCaracteristics.java  | 6 +++---
 .../producer/CsvProducerForIndividualObservation.java             | 6 +++---
 .../genericformat/producer/CsvProducerForMarineLitter.java        | 6 +++---
 .../service/genericformat/producer/CsvProducerForOperation.java   | 6 +++---
 .../service/genericformat/producer/CsvProducerForParameter.java   | 6 +++---
 .../genericformat/producer/CsvProducerForSampleCategory.java      | 6 +++---
 .../service/genericformat/producer/CsvProducerForSpecies.java     | 8 ++++----
 .../service/genericformat/producer/CsvProducerForSurvey.java      | 6 +++---
 11 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CsvProducer.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CsvProducer.java
index a1dbdc4..d7196c5 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CsvProducer.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CsvProducer.java
@@ -7,9 +7,9 @@ import org.nuiton.jaxx.application.ApplicationTechnicalException;
 
 import java.io.BufferedWriter;
 import java.io.Closeable;
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,10 +25,10 @@ public abstract class CsvProducer<O, M extends AbstractTuttiImportExportModel<O>
 
     private final TuttiRepeatableExport<O> export;
 
-    public CsvProducer(File file, M model) {
+    public CsvProducer(Path file, M model) {
 
         try {
-            this.writer = Files.newWriter(file, Charsets.UTF_8);
+            this.writer = Files.newWriter(file.toFile(), Charsets.UTF_8);
         } catch (FileNotFoundException e) {
             // should never happen
             throw new ApplicationTechnicalException("file not found " + file, e);
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAccidentalCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAccidentalCatch.java
index ae20d90..09fa013 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAccidentalCatch.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAccidentalCatch.java
@@ -10,8 +10,8 @@ import fr.ifremer.tutti.service.genericformat.csv.AccidentalCatchRow;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 
-import java.io.File;
 import java.io.Serializable;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -24,8 +24,8 @@ import java.util.Map;
  */
 public class CsvProducerForAccidentalCatch extends CsvProducer<AccidentalCatchRow, AccidentalCatchModel> {
 
-    public CsvProducerForAccidentalCatch(File basedir, AccidentalCatchModel model) {
-        super(new File(basedir, "accidentalCatch.csv"), model);
+    public CsvProducerForAccidentalCatch(Path file, AccidentalCatchModel model) {
+        super(file, model);
     }
 
     public List<AccidentalCatchRow> getDataToExport(OperationExportContext operationExportContext) {
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java
index 749220a..3252374 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java
@@ -18,8 +18,8 @@ import fr.ifremer.tutti.util.Weights;
 import org.apache.commons.collections4.CollectionUtils;
 import org.nuiton.jaxx.application.ApplicationTechnicalException;
 
-import java.io.File;
 import java.io.Serializable;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,8 +31,8 @@ import java.util.List;
  */
 public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> {
 
-    public CsvProducerForCatch(File basedir, CatchModel model) {
-        super(new File(basedir, "catch.csv"), model);
+    public CsvProducerForCatch(Path file, CatchModel model) {
+        super(file, model);
     }
 
     public List<CatchRow> getDataToExport(OperationExportContext operationExportContext,
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForGearCaracteristics.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForGearCaracteristics.java
index 6562d6f..3641ce9 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForGearCaracteristics.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForGearCaracteristics.java
@@ -8,8 +8,8 @@ import fr.ifremer.tutti.service.csv.CsvProducer;
 import fr.ifremer.tutti.service.genericformat.csv.GearCaracteristicModel;
 import fr.ifremer.tutti.service.genericformat.csv.GearCaracteristicRow;
 
-import java.io.File;
 import java.io.Serializable;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -22,8 +22,8 @@ import java.util.Map;
  */
 public class CsvProducerForGearCaracteristics extends CsvProducer<GearCaracteristicRow, GearCaracteristicModel> {
 
-    public CsvProducerForGearCaracteristics(File basedir, GearCaracteristicModel model) {
-        super(new File(basedir, "gearCaracteristics.csv"), model);
+    public CsvProducerForGearCaracteristics(Path file, GearCaracteristicModel model) {
+        super(file, model);
     }
 
     public List<GearCaracteristicRow> getDataToExport(Cruise cruise, Gear gear) {
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForIndividualObservation.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForIndividualObservation.java
index c076f07..eb7faac 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForIndividualObservation.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForIndividualObservation.java
@@ -10,8 +10,8 @@ import fr.ifremer.tutti.service.genericformat.csv.IndividualObservationRow;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 
-import java.io.File;
 import java.io.Serializable;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -24,8 +24,8 @@ import java.util.Map;
  */
 public class CsvProducerForIndividualObservation extends CsvProducer<IndividualObservationRow, IndividualObservationModel> {
 
-    public CsvProducerForIndividualObservation(File basedir, IndividualObservationModel model) {
-        super(new File(basedir, "individualObservation.csv"), model);
+    public CsvProducerForIndividualObservation(Path file, IndividualObservationModel model) {
+        super(file, model);
     }
 
     public List<IndividualObservationRow> getDataToExport(OperationExportContext operationExportContext) {
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForMarineLitter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForMarineLitter.java
index 6e6b5f6..98f9936 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForMarineLitter.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForMarineLitter.java
@@ -8,7 +8,7 @@ import fr.ifremer.tutti.service.genericformat.csv.MarineLitterModel;
 import fr.ifremer.tutti.service.genericformat.csv.MarineLitterRow;
 import org.apache.commons.collections4.CollectionUtils;
 
-import java.io.File;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -20,8 +20,8 @@ import java.util.List;
  */
 public class CsvProducerForMarineLitter extends CsvProducer<MarineLitterRow, MarineLitterModel> {
 
-    public CsvProducerForMarineLitter(File basedir, MarineLitterModel model) {
-        super(new File(basedir, "marineLitter.csv"), model);
+    public CsvProducerForMarineLitter(Path file, MarineLitterModel model) {
+        super(file, model);
     }
 
 
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForOperation.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForOperation.java
index 50e0101..3dc0f63 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForOperation.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForOperation.java
@@ -7,7 +7,7 @@ import fr.ifremer.tutti.service.csv.CsvProducer;
 import fr.ifremer.tutti.service.genericformat.csv.OperationModel;
 import fr.ifremer.tutti.service.genericformat.csv.OperationRow;
 
-import java.io.File;
+import java.nio.file.Path;
 
 /**
  * Created on 2/6/15.
@@ -17,8 +17,8 @@ import java.io.File;
  */
 public class CsvProducerForOperation extends CsvProducer<OperationRow, OperationModel> {
 
-    public CsvProducerForOperation(File basedir, OperationModel model) {
-        super(new File(basedir, "operation.csv"), model);
+    public CsvProducerForOperation(Path file, OperationModel model) {
+        super(file, model);
     }
 
     public OperationRow getDataToExport(Cruise cruise, FishingOperation operation, CatchBatch catchBatch) {
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForParameter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForParameter.java
index f113c6e..b3b1c49 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForParameter.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForParameter.java
@@ -8,8 +8,8 @@ import fr.ifremer.tutti.service.csv.CsvProducer;
 import fr.ifremer.tutti.service.genericformat.csv.ParameterModel;
 import fr.ifremer.tutti.service.genericformat.csv.ParameterRow;
 
-import java.io.File;
 import java.io.Serializable;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -22,8 +22,8 @@ import java.util.Map;
  */
 public class CsvProducerForParameter extends CsvProducer<ParameterRow, ParameterModel> {
 
-    public CsvProducerForParameter(File basedir, ParameterModel model) {
-        super(new File(basedir, "parameter.csv"), model);
+    public CsvProducerForParameter(Path file, ParameterModel model) {
+        super(file, model);
     }
 
     public List<ParameterRow> getDataToExport(Cruise cruise, FishingOperation operation) {
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSampleCategory.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSampleCategory.java
index d26f735..4595df3 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSampleCategory.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSampleCategory.java
@@ -5,7 +5,7 @@ import fr.ifremer.tutti.service.csv.CsvProducer;
 import fr.ifremer.tutti.service.genericformat.csv.SampleCategoryModel;
 import fr.ifremer.tutti.service.genericformat.csv.SampleCategoryRow;
 
-import java.io.File;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -17,8 +17,8 @@ import java.util.List;
  */
 public class CsvProducerForSampleCategory extends CsvProducer<SampleCategoryRow, SampleCategoryModel> {
 
-    public CsvProducerForSampleCategory(File basedir, SampleCategoryModel model) {
-        super(new File(basedir, "sampleCategory.csv"), model);
+    public CsvProducerForSampleCategory(Path file, SampleCategoryModel model) {
+        super(file, model);
     }
 
     public List<SampleCategoryRow> getDataToExport(fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel sampleCategoryModel) {
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSpecies.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSpecies.java
index ec99aa0..0aec192 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSpecies.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSpecies.java
@@ -12,7 +12,7 @@ import fr.ifremer.tutti.service.genericformat.csv.IndividualObservationRow;
 import fr.ifremer.tutti.service.genericformat.csv.SpeciesExportModel;
 import fr.ifremer.tutti.service.genericformat.csv.SpeciesExportRow;
 
-import java.io.File;
+import java.nio.file.Path;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -30,8 +30,8 @@ public class CsvProducerForSpecies extends CsvProducer<SpeciesExportRow, Species
 
     final Map<String, SpeciesExportRow> speciesToExport = Maps.newTreeMap();
 
-    public CsvProducerForSpecies(File basedir, SpeciesExportModel model, Map<String, Species> speciesByReferenceTaxonId) {
-        super(new File(basedir, "species.csv"), model);
+    public CsvProducerForSpecies(Path file, SpeciesExportModel model, Map<String, Species> speciesByReferenceTaxonId) {
+        super(file, model);
         this.speciesByReferenceTaxonId = speciesByReferenceTaxonId;
     }
 
@@ -81,7 +81,7 @@ public class CsvProducerForSpecies extends CsvProducer<SpeciesExportRow, Species
 
     }
 
-    protected void addSpecies(Species species) {
+    public void addSpecies(Species species) {
 
         String speciesId = String.valueOf(species.getReferenceTaxonId());
 
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSurvey.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSurvey.java
index 0f3b314..bfd4775 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSurvey.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSurvey.java
@@ -6,7 +6,7 @@ import fr.ifremer.tutti.service.csv.CsvProducer;
 import fr.ifremer.tutti.service.genericformat.csv.SurveyModel;
 import fr.ifremer.tutti.service.genericformat.csv.SurveyRow;
 
-import java.io.File;
+import java.nio.file.Path;
 
 /**
  * Created on 2/6/15.
@@ -16,8 +16,8 @@ import java.io.File;
  */
 public class CsvProducerForSurvey extends CsvProducer<SurveyRow, SurveyModel> {
 
-    public CsvProducerForSurvey(File basedir, SurveyModel model) {
-        super(new File(basedir, "survey.csv"), model);
+    public CsvProducerForSurvey(Path file, SurveyModel model) {
+        super(file, model);
     }
 
     public SurveyRow getDataToExport(Cruise cruise, TuttiLocation country) {

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Tutti-commits] 46/98: improve CsvProducer API

codelutin.com scm