[Tutti-commits] 13/98: introduce csv package + clean code

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 679c8148204f5ff850059f4456eeb48277df2de8
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Feb 6 18:48:12 2015 +0100

    introduce csv package + clean code
---
 .../service/referential/ReferentialTemporaryGearService.java | 10 +++-------
 .../referential/ReferentialTemporaryPersonService.java       | 12 +++++-------
 .../referential/ReferentialTemporarySpeciesService.java      | 12 +++++-------
 .../referential/ReferentialTemporaryVesselService.java       | 12 +++++-------
 .../tutti/service/referential/{ => csv}/GearModel.java       |  2 +-
 .../ifremer/tutti/service/referential/{ => csv}/GearRow.java |  2 +-
 .../tutti/service/referential/{ => csv}/PersonModel.java     |  2 +-
 .../tutti/service/referential/{ => csv}/PersonRow.java       |  2 +-
 .../tutti/service/referential/{ => csv}/SpeciesModel.java    |  2 +-
 .../tutti/service/referential/{ => csv}/SpeciesRow.java      |  2 +-
 .../{ => csv}/TemporaryReferentialEntityIdParser.java        |  2 +-
 .../tutti/service/referential/{ => csv}/VesselModel.java     |  2 +-
 .../tutti/service/referential/{ => csv}/VesselRow.java       |  2 +-
 13 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java
index d01ac79..f61d3cd 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java
@@ -35,7 +35,8 @@ import fr.ifremer.tutti.service.AbstractTuttiService;
 import fr.ifremer.tutti.service.DecoratorService;
 import fr.ifremer.tutti.service.PersistenceService;
 import fr.ifremer.tutti.service.TuttiServiceContext;
-import org.apache.commons.io.IOUtils;
+import fr.ifremer.tutti.service.referential.csv.GearModel;
+import fr.ifremer.tutti.service.referential.csv.GearRow;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -177,8 +178,6 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService {
 
         GearModel csvModel = new GearModel(getCsvSeparator());
 
-        BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8);
-
         List<GearRow> toExportRows = Lists.transform(toExport, new Function<Gear, GearRow>() {
             @Override
             public GearRow apply(Gear gear) {
@@ -186,16 +185,13 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService {
             }
         });
 
-        try {
+        try (BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8)) {
             Export export = Export.newExport(csvModel, toExportRows);
             export.write(writer);
-            writer.close();
         } catch (IOException e) {
             throw e;
         } catch (Exception e) {
             throw new ApplicationTechnicalException(t("tutti.service.referential.export.gear.error", file), e);
-        } finally {
-            IOUtils.closeQuietly(writer);
         }
     }
 
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java
index ddea706..9f20a1d 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java
@@ -35,7 +35,8 @@ import fr.ifremer.tutti.service.AbstractTuttiService;
 import fr.ifremer.tutti.service.DecoratorService;
 import fr.ifremer.tutti.service.PersistenceService;
 import fr.ifremer.tutti.service.TuttiServiceContext;
-import org.apache.commons.io.IOUtils;
+import fr.ifremer.tutti.service.referential.csv.PersonModel;
+import fr.ifremer.tutti.service.referential.csv.PersonRow;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -170,8 +171,6 @@ public class ReferentialTemporaryPersonService extends AbstractTuttiService {
 
         PersonModel csvModel = new PersonModel(getCsvSeparator());
 
-        BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8);
-
         List<PersonRow> toExportRows = Lists.transform(toExport, new Function<Person, PersonRow>() {
             @Override
             public PersonRow apply(Person person) {
@@ -179,16 +178,15 @@ public class ReferentialTemporaryPersonService extends AbstractTuttiService {
             }
         });
 
-        try {
+        try (BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8)) {
+
             Export export = Export.newExport(csvModel, toExportRows);
             export.write(writer);
-            writer.close();
+
         } catch (IOException e) {
             throw e;
         } catch (Exception e) {
             throw new ApplicationTechnicalException(t("tutti.service.referential.export.person.error", file), e);
-        } finally {
-            IOUtils.closeQuietly(writer);
         }
     }
 
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java
index fdffb63..663b3f0 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java
@@ -35,7 +35,8 @@ import fr.ifremer.tutti.service.AbstractTuttiService;
 import fr.ifremer.tutti.service.DecoratorService;
 import fr.ifremer.tutti.service.PersistenceService;
 import fr.ifremer.tutti.service.TuttiServiceContext;
-import org.apache.commons.io.IOUtils;
+import fr.ifremer.tutti.service.referential.csv.SpeciesModel;
+import fr.ifremer.tutti.service.referential.csv.SpeciesRow;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -167,8 +168,6 @@ public class ReferentialTemporarySpeciesService extends AbstractTuttiService {
 
         SpeciesModel csvModel = new SpeciesModel(getCsvSeparator());
 
-        BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8);
-
         List<SpeciesRow> toExportRows = Lists.transform(toExport, new Function<Species, SpeciesRow>() {
             @Override
             public SpeciesRow apply(Species species) {
@@ -176,16 +175,15 @@ public class ReferentialTemporarySpeciesService extends AbstractTuttiService {
             }
         });
 
-        try {
+        try (BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8)) {
+
             Export export = Export.newExport(csvModel, toExportRows);
             export.write(writer);
-            writer.close();
+
         } catch (IOException e) {
             throw e;
         } catch (Exception e) {
             throw new ApplicationTechnicalException(t("tutti.service.referential.export.species.error", file), e);
-        } finally {
-            IOUtils.closeQuietly(writer);
         }
 
     }
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java
index ba17c75..c1ac62d 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java
@@ -35,7 +35,8 @@ import fr.ifremer.tutti.service.AbstractTuttiService;
 import fr.ifremer.tutti.service.DecoratorService;
 import fr.ifremer.tutti.service.PersistenceService;
 import fr.ifremer.tutti.service.TuttiServiceContext;
-import org.apache.commons.io.IOUtils;
+import fr.ifremer.tutti.service.referential.csv.VesselModel;
+import fr.ifremer.tutti.service.referential.csv.VesselRow;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -186,8 +187,6 @@ public class ReferentialTemporaryVesselService extends AbstractTuttiService {
 
         VesselModel csvModel = new VesselModel(getCsvSeparator());
 
-        BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8);
-
         List<VesselRow> toExportRows = Lists.transform(toExport, new Function<Vessel, VesselRow>() {
             @Override
             public VesselRow apply(Vessel vessel) {
@@ -195,16 +194,15 @@ public class ReferentialTemporaryVesselService extends AbstractTuttiService {
             }
         });
 
-        try {
+        try (BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8)) {
+
             Export export = Export.newExport(csvModel, toExportRows);
             export.write(writer);
-            writer.close();
+
         } catch (IOException e) {
             throw e;
         } catch (Exception e) {
             throw new ApplicationTechnicalException(t("tutti.service.referential.export.vessel.error", file), e);
-        } finally {
-            IOUtils.closeQuietly(writer);
         }
     }
 
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/GearModel.java
similarity index 97%
rename from tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java
rename to tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/GearModel.java
index 1025ca6..adcf8d9 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/GearModel.java
@@ -1,4 +1,4 @@
-package fr.ifremer.tutti.service.referential;
+package fr.ifremer.tutti.service.referential.csv;
 
 /*
  * #%L
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/GearRow.java
similarity index 98%
rename from tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearRow.java
rename to tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/GearRow.java
index 0a709bc..0d38b17 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearRow.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/GearRow.java
@@ -1,4 +1,4 @@
-package fr.ifremer.tutti.service.referential;
+package fr.ifremer.tutti.service.referential.csv;
 
 /*
  * #%L
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/PersonModel.java
similarity index 97%
rename from tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonModel.java
rename to tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/PersonModel.java
index 2e134f9..1f67b75 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonModel.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/PersonModel.java
@@ -1,4 +1,4 @@
-package fr.ifremer.tutti.service.referential;
+package fr.ifremer.tutti.service.referential.csv;
 
 /*
  * #%L
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/PersonRow.java
similarity index 98%
rename from tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonRow.java
rename to tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/PersonRow.java
index 8326aa7..d6fcfcd 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonRow.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/PersonRow.java
@@ -1,4 +1,4 @@
-package fr.ifremer.tutti.service.referential;
+package fr.ifremer.tutti.service.referential.csv;
 
 /*
  * #%L
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/SpeciesModel.java
similarity index 97%
rename from tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java
rename to tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/SpeciesModel.java
index 19c395e..767ada4 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/SpeciesModel.java
@@ -1,4 +1,4 @@
-package fr.ifremer.tutti.service.referential;
+package fr.ifremer.tutti.service.referential.csv;
 
 /*
  * #%L
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/SpeciesRow.java
similarity index 97%
rename from tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesRow.java
rename to tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/SpeciesRow.java
index ffd1511..88aef6a 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesRow.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/SpeciesRow.java
@@ -1,4 +1,4 @@
-package fr.ifremer.tutti.service.referential;
+package fr.ifremer.tutti.service.referential.csv;
 
 /*
  * #%L
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TemporaryReferentialEntityIdParser.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/TemporaryReferentialEntityIdParser.java
similarity index 97%
rename from tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TemporaryReferentialEntityIdParser.java
rename to tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/TemporaryReferentialEntityIdParser.java
index bd56488..2825792 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TemporaryReferentialEntityIdParser.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/TemporaryReferentialEntityIdParser.java
@@ -1,4 +1,4 @@
-package fr.ifremer.tutti.service.referential;
+package fr.ifremer.tutti.service.referential.csv;
 
 /*
  * #%L
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/VesselModel.java
similarity index 98%
rename from tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java
rename to tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/VesselModel.java
index 0faac49..d0630f6 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselModel.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/VesselModel.java
@@ -1,4 +1,4 @@
-package fr.ifremer.tutti.service.referential;
+package fr.ifremer.tutti.service.referential.csv;
 
 /*
  * #%L
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/VesselRow.java
similarity index 98%
rename from tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselRow.java
rename to tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/VesselRow.java
index e6d6908..1a7be92 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselRow.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/VesselRow.java
@@ -1,4 +1,4 @@
-package fr.ifremer.tutti.service.referential;
+package fr.ifremer.tutti.service.referential.csv;
 
 /*
  * #%L

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

    

[Tutti-commits] 13/98: introduce csv package + clean code

codelutin.com scm