branch develop updated (22e7b05 -> d8be62d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 22e7b05 Du nettoyage + migration en api java 8 new d8be62d Remove guava Optional usage The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d8be62d4ffe28cdac711a8d835a576ed4210be20 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 23:10:34 2016 +0200 Remove guava Optional usage Summary of changes: .../ui/util/tripMap/TripMapContentBuilder.java | 5 ++-- .../observe/ObserveTopiaPersistenceContext.java | 4 ++-- .../actions/validate/ValidateResultForDtoType.java | 9 ++++--- .../referentiel/LengthWeightParemetersTest.java | 28 +++++++++++----------- .../persistence/metadata/TopiaMetadataModel.java | 4 ++-- .../templates/TopiaMetadataModelGenerator.java | 23 +++++++++--------- 6 files changed, 35 insertions(+), 38 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d8be62d4ffe28cdac711a8d835a576ed4210be20 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 23:10:34 2016 +0200 Remove guava Optional usage --- .../ui/util/tripMap/TripMapContentBuilder.java | 5 ++-- .../observe/ObserveTopiaPersistenceContext.java | 4 ++-- .../actions/validate/ValidateResultForDtoType.java | 9 ++++--- .../referentiel/LengthWeightParemetersTest.java | 28 +++++++++++----------- .../persistence/metadata/TopiaMetadataModel.java | 4 ++-- .../templates/TopiaMetadataModelGenerator.java | 23 +++++++++--------- 6 files changed, 35 insertions(+), 38 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java index 14917ef..d2cbb80 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java @@ -22,9 +22,7 @@ package fr.ird.observe.ui.util.tripMap; * #L% */ -import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.vividsolutions.jts.geom.Coordinate; @@ -68,6 +66,7 @@ import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.List; +import java.util.Optional; import java.util.Set; import static org.nuiton.i18n.I18n.t; @@ -423,7 +422,7 @@ public class TripMapContentBuilder { protected Style findStyle(StyledLayerDescriptor styledLayerDescriptor, final String layerName, String styleName, Style defaultStyle) { - Optional<StyledLayer> styledLayerOptional = Iterables.tryFind(styledLayerDescriptor.layers(), input -> input.getName().equals(layerName)); + Optional<StyledLayer> styledLayerOptional = styledLayerDescriptor.layers().stream().filter( input -> input.getName().equals(layerName)).findFirst(); Style style = defaultStyle; diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java index abd3f83..e1cc150 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java @@ -22,7 +22,6 @@ package fr.ird.observe; * #L% */ -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import fr.ird.observe.entities.LastUpdateDate; import fr.ird.observe.entities.LastUpdateDateTopiaDao; @@ -39,6 +38,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Date; +import java.util.Optional; public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersistenceContext { @@ -78,7 +78,7 @@ public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersiste LastUpdateDateTopiaDao dao = getDao(LastUpdateDate.class, LastUpdateDateTopiaDao.class); String entityTypeName = entityType.getName(); - Optional<LastUpdateDate> optionalLastUpdateDate = dao.forTypeEquals(entityTypeName).tryFindUnique(); + Optional<LastUpdateDate> optionalLastUpdateDate = Optional.ofNullable(dao.forTypeEquals(entityTypeName).tryFindUnique().orNull()); LastUpdateDate lastUpdateDate; if (!optionalLastUpdateDate.isPresent()) { diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java index 1518ea5..8f3c731 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java @@ -22,9 +22,7 @@ package fr.ird.observe.services.service.actions.validate; * #L% */ -import com.google.common.base.Optional; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ObserveDto; @@ -52,9 +50,10 @@ public class ValidateResultForDtoType<D extends IdDto> implements ObserveDto { } public ValidateResultForDto<D> getValidateResult(final AbstractReference<D> referenceDto) { - Optional<ValidateResultForDto<D>> resultForDtoOptional = Iterables.tryFind(validateResultForDto, input -> referenceDto.equals(input.getDto())); - - return resultForDtoOptional.orNull(); + return validateResultForDto.stream() + .filter(input -> referenceDto.equals(input.getDto())) + .findFirst() + .orElse(null); } } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java b/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java index 4c963b8..3d75eaa 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/entities/referentiel/LengthWeightParemetersTest.java @@ -21,7 +21,6 @@ */ package fr.ird.observe.entities.referentiel; -import com.google.common.base.Optional; import com.opensymphony.xwork2.interceptor.annotations.After; import fr.ird.observe.ObserveTopiaDaoSupplier; import fr.ird.observe.ObserveTopiaPersistenceContext; @@ -36,6 +35,7 @@ import org.junit.Test; import org.nuiton.util.DateUtil; import java.util.Date; +import java.util.Optional; /** * Test de la classe {@link LengthWeightParameters}. @@ -59,26 +59,26 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { OceanTopiaDao oceanDAO = persistenceContext.getOceanDao(); SexTopiaDao sexDao = persistenceContext.getSexDao(); - Optional<Species> optionalSpecies = speciesDAO.forFaoCodeEquals("DOL").tryFindUnique(); + Optional<Species> optionalSpecies = Optional.ofNullable(speciesDAO.forFaoCodeEquals("DOL").tryFindUnique().orNull()); Assert.assertTrue("Could not find species with faoCode: DOL", optionalSpecies.isPresent()); - Optional<Sex> optionalUndeterminedSex = sexDao.forCodeEquals("0").tryFindUnique(); + Optional<Sex> optionalUndeterminedSex = Optional.ofNullable(sexDao.forCodeEquals("0").tryFindUnique().orNull()); Assert.assertTrue("Could not find sex with code 0 (Undetermined)", optionalUndeterminedSex.isPresent()); - Optional<Sex> optionalMaleSex = sexDao.forCodeEquals("1").tryFindUnique(); + Optional<Sex> optionalMaleSex = Optional.ofNullable(sexDao.forCodeEquals("1").tryFindUnique().orNull()); Assert.assertTrue("Could not find sex with code 1 (male)", optionalMaleSex.isPresent()); - Optional<Sex> optionalFemaleSex = sexDao.forCodeEquals("2").tryFindUnique(); + Optional<Sex> optionalFemaleSex = Optional.ofNullable(sexDao.forCodeEquals("2").tryFindUnique().orNull()); Assert.assertTrue("Could not find sex with code 2 (female)", optionalFemaleSex.isPresent()); Date firstStartDate = DateUtil.createDate(1, 1, 2010); Date firstEndDate = DateUtil.createDate(31, 12, 2010); Date secondStartDate = DateUtil.createDate(1, 1, 2011); - Optional<Ocean> optionalAtlanticOcean = oceanDAO.forCodeEquals("1").tryFindUnique(); + Optional<Ocean> optionalAtlanticOcean = Optional.ofNullable(oceanDAO.forCodeEquals("1").tryFindUnique().orNull()); Assert.assertNotNull("Could not find ocean with code 1 (Atlantic)", optionalAtlanticOcean.isPresent()); - Optional<Ocean> optionalIndianOcean = oceanDAO.forCodeEquals("2").tryFindUnique(); + Optional<Ocean> optionalIndianOcean = Optional.ofNullable(oceanDAO.forCodeEquals("2").tryFindUnique().orNull()); Assert.assertNotNull("Could not find ocean with code 2 (Indian)", optionalIndianOcean.isPresent()); LengthWeightParameterTopiaDao lengthWeightParameterDao = persistenceContext.getLengthWeightParameterDao(); @@ -140,16 +140,16 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { OceanTopiaDao oceanDAO = persistenceContext.getOceanDao(); SexTopiaDao sexDao = persistenceContext.getSexDao(); - Optional<Species> optionalSpecies = speciesDAO.forFaoCodeEquals("DOL").tryFindUnique(); + Optional<Species> optionalSpecies = Optional.ofNullable(speciesDAO.forFaoCodeEquals("DOL").tryFindUnique().orNull()); Assert.assertTrue("Could not find species with faoCode: DOL", optionalSpecies.isPresent()); - Optional<Sex> optionalUndeterminedSex = sexDao.forCodeEquals("0").tryFindUnique(); + Optional<Sex> optionalUndeterminedSex = Optional.ofNullable(sexDao.forCodeEquals("0").tryFindUnique().orNull()); Assert.assertTrue("Could not find sex with code 0 (Undetermined)", optionalUndeterminedSex.isPresent()); - Optional<Sex> optionalMaleSex = sexDao.forCodeEquals("1").tryFindUnique(); + Optional<Sex> optionalMaleSex = Optional.ofNullable(sexDao.forCodeEquals("1").tryFindUnique().orNull()); Assert.assertTrue("Could not find sex with code 1 (male)", optionalMaleSex.isPresent()); - Optional<Sex> optionalFemaleSex = sexDao.forCodeEquals("2").tryFindUnique(); + Optional<Sex> optionalFemaleSex = Optional.ofNullable(sexDao.forCodeEquals("2").tryFindUnique().orNull()); Assert.assertTrue("Could not find sex with code 2 (female)", optionalFemaleSex.isPresent()); Date date1970 = DateUtil.createDate(1, 1, 1970); @@ -157,13 +157,13 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { Date date2010 = DateUtil.createDate(1, 1, 2010); Date date2011 = DateUtil.createDate(1, 1, 2011); - Optional<Ocean> optionalAtlanticOcean = oceanDAO.forCodeEquals("1").tryFindUnique(); + Optional<Ocean> optionalAtlanticOcean = Optional.ofNullable(oceanDAO.forCodeEquals("1").tryFindUnique().orNull()); Assert.assertNotNull("Could not find ocean with code 1 (Atlantic)", optionalAtlanticOcean.isPresent()); - Optional<Ocean> optionalIndianOcean = oceanDAO.forCodeEquals("2").tryFindUnique(); + Optional<Ocean> optionalIndianOcean = Optional.ofNullable(oceanDAO.forCodeEquals("2").tryFindUnique().orNull()); Assert.assertNotNull("Could not find ocean with code 2 (Indian)", optionalIndianOcean.isPresent()); - Optional<Ocean> optionalPacificOcean = oceanDAO.forCodeEquals("3").tryFindUnique(); + Optional<Ocean> optionalPacificOcean = Optional.ofNullable(oceanDAO.forCodeEquals("3").tryFindUnique().orNull()); Assert.assertNotNull("Could not find ocean with code 3 (Pacific)", optionalPacificOcean.isPresent()); Species species = optionalSpecies.get(); diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java b/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java index 731ae8c..e13a633 100644 --- a/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java +++ b/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java @@ -22,7 +22,6 @@ package org.nuiton.topia.persistence.metadata; * #L% */ -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -36,6 +35,7 @@ import java.net.URL; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; +import java.util.Optional; /** * Méta-modèle topia simplifié qui contient des informations utile pour des algorithmes générique sur les entités. @@ -58,7 +58,7 @@ public class TopiaMetadataModel implements Iterable<TopiaMetadataEntity> { } public Optional<TopiaMetadataEntity> getOptionalEntity(String type) { - return Optional.fromNullable(getEntity(type)); + return Optional.ofNullable(getEntity(type)); } public void accept(TopiaMetadataModelVisitor visitor) { diff --git a/observe-topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java b/observe-topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java index 1bb9bf4..5dc1215 100644 --- a/observe-topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java +++ b/observe-topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java @@ -22,7 +22,6 @@ package org.nuiton.topia.templates; * #L% */ -import com.google.common.base.Optional; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import org.apache.commons.logging.Log; @@ -42,6 +41,7 @@ import java.io.IOException; import java.io.Writer; import java.util.Collection; import java.util.List; +import java.util.Optional; /*{generator option: parentheses = true}*/ /*{generator option: writeString = output.write}*/ @@ -204,8 +204,6 @@ public class TopiaMetadataModelGenerator extends ObjectModelGenerator { // } - - protected void applyInheritance(TopiaMetadataEntity metadataEntity, ObjectModelClass entityClass, TopiaMetadataModel metadataModel) { boolean haveSuper = entityClass.getSuperclasses().size() > 0; @@ -230,6 +228,7 @@ public class TopiaMetadataModelGenerator extends ObjectModelGenerator { } } + protected TopiaMetadataEntity buildMetadataEntity(ObjectModelClass entityClass, TopiaMetadataModel metadataModel) { TopiaMetadataEntity metadataEntity; @@ -276,31 +275,31 @@ public class TopiaMetadataModelGenerator extends ObjectModelGenerator { String attrType = attr.getType(); switch (attrType) { case "String": - attrType="java.lang.String"; + attrType = "java.lang.String"; break; case "Boolean": - attrType="java.lang.Boolean"; + attrType = "java.lang.Boolean"; break; case "Byte": - attrType="java.lang.Byte"; + attrType = "java.lang.Byte"; break; case "Character": - attrType="java.lang.Character"; + attrType = "java.lang.Character"; break; case "Short": - attrType="java.lang.Short"; + attrType = "java.lang.Short"; break; case "Integer": - attrType="java.lang.Integer"; + attrType = "java.lang.Integer"; break; case "Long": - attrType="java.lang.Long"; + attrType = "java.lang.Long"; break; case "Float": - attrType="java.lang.Float"; + attrType = "java.lang.Float"; break; case "Double": - attrType="java.lang.Double"; + attrType = "java.lang.Double"; break; } metadataEntity.addProperty(name, attrType, attrColumn); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm