This is an automated email from the git hooks/post-receive script. New commit to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 5455012ac5bd04afaa49cdcc68efc8023aa175b3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 2 12:24:05 2016 +0200 Add toString on some entities --- .../echobase/entities/data/OperationImpl.java | 22 ++++++++++++++++------ .../echobase/entities/data/SampleDataImpl.java | 18 ++++++++++++++++++ .../ifremer/echobase/entities/data/SampleImpl.java | 18 ++++++++++++++++++ .../echobase/entities/references/GearImpl.java | 17 +++++++++++++++++ .../entities/references/SampleDataTypeImpl.java | 17 +++++++++++++++-- .../entities/references/SampleTypeImpl.java | 10 ++++++++++ 6 files changed, 94 insertions(+), 8 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/OperationImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/OperationImpl.java index 5d25a92..a725578 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/OperationImpl.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/OperationImpl.java @@ -20,6 +20,7 @@ */ package fr.ifremer.echobase.entities.data; +import com.google.common.base.MoreObjects; import fr.ifremer.echobase.entities.references.SampleType; import fr.ifremer.echobase.entities.references.SpeciesCategory; @@ -28,19 +29,28 @@ public class OperationImpl extends OperationAbstract { private static final long serialVersionUID = 1L; @Override - public Sample getSample(SpeciesCategory speciesCategory, - SampleType sampleType) { + public Sample getSample(SpeciesCategory speciesCategory, SampleType sampleType) { Sample result = null; - if (!isSampleEmpty()) { + if (isSampleNotEmpty()) { for (Sample s : sample) { - if (sampleType.equals(s.getSampleType()) && - speciesCategory.equals(s.getSpeciesCategory())) { + if (sampleType.equals(s.getSampleType()) && speciesCategory.equals(s.getSpeciesCategory())) { result = s; break; } } } return result; + } -} //OperationImpl + + @Override + public String toString() { + return MoreObjects.toStringHelper(Operation.class) + .add(PROPERTY_ID, id) + .add(PROPERTY_GEAR, gear) +// .add(PROPERTY_TOPIA_ID, topiaId) + .toString(); + } + +} diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleDataImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleDataImpl.java new file mode 100644 index 0000000..f6b03cc --- /dev/null +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleDataImpl.java @@ -0,0 +1,18 @@ +package fr.ifremer.echobase.entities.data; + +import com.google.common.base.MoreObjects; + +public class SampleDataImpl extends SampleDataAbstract { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return MoreObjects.toStringHelper(SampleData.class) + .add(PROPERTY_DATA_LABEL, dataLabel) + .add(PROPERTY_DATA_VALUE, dataValue) + .add(PROPERTY_SAMPLE_DATA_TYPE, sampleDataType) +// .add(PROPERTY_TOPIA_ID, topiaId) + .toString(); + } +} diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleImpl.java new file mode 100644 index 0000000..58a7eab --- /dev/null +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleImpl.java @@ -0,0 +1,18 @@ +package fr.ifremer.echobase.entities.data; + +import com.google.common.base.MoreObjects; + +public class SampleImpl extends SampleAbstract { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return MoreObjects.toStringHelper(Sample.class) + .add(PROPERTY_SAMPLE_TYPE, sampleType) + .add(PROPERTY_SAMPLE_WEIGHT, sampleWeight) + .add(PROPERTY_SPECIES_CATEGORY, speciesCategory) +// .add(PROPERTY_TOPIA_ID, topiaId) + .toString(); + } +} diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/GearImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/GearImpl.java new file mode 100644 index 0000000..25a2a9d --- /dev/null +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/GearImpl.java @@ -0,0 +1,17 @@ +package fr.ifremer.echobase.entities.references; + +import com.google.common.base.MoreObjects; + +public class GearImpl extends GearAbstract { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return MoreObjects.toStringHelper(Gear.class) + .add(PROPERTY_GEAR_CODE, gearCode) + .add(PROPERTY_CASINO_GEAR_NAME, casinoGearName) +// .add(PROPERTY_TOPIA_ID, topiaId) + .toString(); + } +} diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypeImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypeImpl.java index 7c6d28e..0a5e8ef 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypeImpl.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleDataTypeImpl.java @@ -21,6 +21,8 @@ package fr.ifremer.echobase.entities.references; * #L% */ +import com.google.common.base.MoreObjects; + public class SampleDataTypeImpl extends SampleDataTypeAbstract { public static final String MEAN_LENGTHCM = "MeanLengthcm"; @@ -37,5 +39,16 @@ public class SampleDataTypeImpl extends SampleDataTypeAbstract { public static final String NUMBER_AT_LENGTH = "NumberAtLength"; - private static final long serialVersionUID = 3486460324380685111L; -} //SampleDataTypeImpl + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return MoreObjects.toStringHelper(SampleDataType.class) + .add(PROPERTY_NAME, name) + .add(PROPERTY_PRECISION, precision) + .add(PROPERTY_UNITS, units) +// .add(PROPERTY_TOPIA_ID, topiaId) + .toString(); + } + +} diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleTypeImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleTypeImpl.java index ee2b8b8..1ee2ca7 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleTypeImpl.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SampleTypeImpl.java @@ -21,6 +21,8 @@ package fr.ifremer.echobase.entities.references; * #L% */ +import com.google.common.base.MoreObjects; + public class SampleTypeImpl extends SampleTypeAbstract { private static final long serialVersionUID = 1L; @@ -34,4 +36,12 @@ public class SampleTypeImpl extends SampleTypeAbstract { public static final String SUB_SAMPLE_TYPE = "Subsample"; public static final String INDIVIDUAL_SAMPLE_TYPE = "Individual"; + + @Override + public String toString() { + return MoreObjects.toStringHelper(SampleType.class) + .add(PROPERTY_NAME, name) +// .add(PROPERTY_TOPIA_ID, topiaId) + .toString(); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.