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 2f6db5584931f8335b4e655c4594d595aeba5d92 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Feb 15 13:13:12 2015 +0100 add once for all a unique method to know if an id is temporary --- .../tutti/persistence/entities/referential/Gears.java | 19 +++++++++++++++++-- .../persistence/entities/referential/Persons.java | 16 +++++++++++++++- .../persistence/entities/referential/Speciess.java | 16 +++++++++++++++- .../persistence/entities/referential/Vessels.java | 16 +++++++++++++++- 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Gears.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Gears.java index 3cc4a4a..e05cc33 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Gears.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Gears.java @@ -80,7 +80,22 @@ public class Gears extends AbstractGears { Preconditions.checkNotNull(gear); Preconditions.checkNotNull(gear.getId()); - return TuttiReferentialEntities.isStatusTemporary(gear) && gear.getIdAsInt() < 0; + return TuttiReferentialEntities.isStatusTemporary(gear) && isTemporaryId(gear.getIdAsInt()); } -} //Gears + + /** + * Is the given {@code id} is a gear temporary id ? + * + * @param id id to test + * @return {@code true} if the id is a gear pecies temporary id + * @since 3.14 + */ + public static boolean isTemporaryId(Integer id) { + + Preconditions.checkNotNull(id); + return id < 0; + + } + +} diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java index 7761a6e..7846cd4 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java @@ -47,7 +47,21 @@ public class Persons extends AbstractPersons { Preconditions.checkNotNull(person); Preconditions.checkNotNull(person.getId()); - return TuttiReferentialEntities.isStatusTemporary(person) && person.getIdAsInt() < 0; + return TuttiReferentialEntities.isStatusTemporary(person) && isTemporaryId(person.getIdAsInt()); + + } + + /** + * Is the given {@code id} is a person temporary id ? + * + * @param id person to test + * @return {@code true} if the id is a person pecies temporary id + * @since 3.14 + */ + public static boolean isTemporaryId(Integer id) { + + Preconditions.checkNotNull(id); + return id < 0; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java index 1b52844..d689d30 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java @@ -60,7 +60,21 @@ public class Speciess extends AbstractSpeciess { Preconditions.checkNotNull(species); Preconditions.checkNotNull(species.getId()); - return TuttiReferentialEntities.isStatusTemporary(species) && species.getIdAsInt() < 0; + return TuttiReferentialEntities.isStatusTemporary(species) && isTemporaryId(species.getIdAsInt()); + + } + + /** + * Is the given {@code id} is a temporary species id ? + * + * @param id id to test + * @return {@code true} if the id is a species temporary id + * @since 3.14 + */ + public static boolean isTemporaryId(Integer id) { + + Preconditions.checkNotNull(id); + return id < 0; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Vessels.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Vessels.java index e4ba98f..8575d92 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Vessels.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Vessels.java @@ -88,7 +88,21 @@ public class Vessels extends AbstractVessels { Preconditions.checkNotNull(vessel); Preconditions.checkNotNull(vessel.getId()); - return TuttiReferentialEntities.isStatusTemporary(vessel) && vessel.getId().startsWith(TemporaryDataHelper.TEMPORARY_NAME_PREFIX); + return TuttiReferentialEntities.isStatusTemporary(vessel) && isTemporaryId(vessel.getId()); + + } + + /** + * Is the given {@code id} is a vessel temporary id ? + * + * @param id id to test + * @return {@code true} if the id is a temporary vessel id + * @since 3.14 + */ + public static boolean isTemporaryId(String id) { + + Preconditions.checkNotNull(id); + return id.startsWith(TemporaryDataHelper.TEMPORARY_NAME_PREFIX); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.