This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit a1b9ead8ba749834576b3e75172e23d2f99f31be Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 24 08:42:46 2015 +0100 make Serializable some objects (to include them in a ui model) + add a valid result state --- .../tutti/service/genericformat/GenericFormatArchive.java | 5 ++++- .../genericformat/GenericFormatImportCruiseResult.java | 5 ++++- .../genericformat/GenericFormatImportOperationResult.java | 5 ++++- .../service/genericformat/GenericFormatImportResult.java | 15 ++++++++++++++- .../GenericFormatReferentialImportResult.java | 5 ++++- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchive.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchive.java index 30c465a..0e60317 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchive.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchive.java @@ -15,6 +15,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.LineNumberReader; +import java.io.Serializable; import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.Path; @@ -32,7 +33,9 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.14 */ -public class GenericFormatArchive { +public class GenericFormatArchive implements Serializable { + + private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(GenericFormatArchive.class); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportCruiseResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportCruiseResult.java index 197256e..1e46aee 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportCruiseResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportCruiseResult.java @@ -6,6 +6,7 @@ import com.google.common.collect.Iterables; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import java.io.Serializable; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -17,7 +18,9 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.14 */ -public class GenericFormatImportCruiseResult { +public class GenericFormatImportCruiseResult implements Serializable { + + private static final long serialVersionUID = 1L; public static final Function<GenericFormatImportCruiseResult, Cruise> TO_CRUISE_FUNCTION = new Function<GenericFormatImportCruiseResult, Cruise>() { @Override diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationResult.java index 159e75b..ac36d0e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationResult.java @@ -5,6 +5,7 @@ import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import javax.annotation.Nullable; +import java.io.Serializable; import java.util.LinkedHashSet; import java.util.Set; @@ -14,7 +15,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.14 */ -public class GenericFormatImportOperationResult { +public class GenericFormatImportOperationResult implements Serializable { public static final Function<GenericFormatImportOperationResult, FishingOperation> TO_FISHING_OPERATION_FUNCTION = new Function<GenericFormatImportOperationResult, FishingOperation>() { @Nullable @@ -24,6 +25,8 @@ public class GenericFormatImportOperationResult { } }; + private static final long serialVersionUID = 1L; + private final Set<String> checkErrors; private final FishingOperation fishingOperation; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportResult.java index 2a87b5e..f4b939d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportResult.java @@ -11,6 +11,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; +import java.io.Serializable; import java.util.Collection; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -23,7 +24,9 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.14 */ -public class GenericFormatImportResult { +public class GenericFormatImportResult implements Serializable{ + + private static final long serialVersionUID = 1L; private final Map<String, GenericFormatImportCruiseResult> cruiseResults; @@ -41,6 +44,8 @@ public class GenericFormatImportResult { private final GenericFormatArchive archive; + private boolean valid; + public GenericFormatImportResult(GenericFormatImportContext importContext) { this.archive = importContext.getImportRequest().getArchive(); @@ -136,4 +141,12 @@ public class GenericFormatImportResult { cruiseResults.put(cruise.getId(), cruiseResult); } + + public boolean isValid() { + return valid; + } + + public void setValid(boolean valid) { + this.valid = valid; + } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialImportResult.java index 16dcec7..bf4bb86 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialImportResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialImportResult.java @@ -6,6 +6,7 @@ import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; import fr.ifremer.tutti.service.referential.ReferentialImportRequest; import fr.ifremer.tutti.service.referential.ReferentialImportResult; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -18,7 +19,9 @@ import java.util.TreeMap; * @author Tony Chemit - chemit@codelutin.com * @since 3.14 */ -public class GenericFormatReferentialImportResult<E extends TuttiReferentialEntity, K extends Comparable<K>> { +public class GenericFormatReferentialImportResult<E extends TuttiReferentialEntity, K extends Comparable<K>> implements Serializable { + + private static final long serialVersionUID = 1L; private final Map<String, E> entitiesAdded; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.