This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository tutti. See http://git.codelutin.com/tutti.git commit c96c2ec4811d01e85c1560751cc9bcc3586bb8d0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Nov 18 10:47:23 2015 +0100 Avoid NPe + improve code --- .../dto/reference/ObserveReferenceSetResult.java | 8 ++++++++ .../services/service/ReferenceSetServiceTopia.java | 19 +++---------------- .../service/ReferenceSetServiceTopiaTest.java | 7 +++++-- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetResult.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetResult.java index 1c1614f..2812e03 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetResult.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetResult.java @@ -1,6 +1,8 @@ package fr.ird.observe.services.dto.reference; import com.google.common.collect.ImmutableMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.util.Date; import java.util.Map; @@ -12,6 +14,9 @@ import java.util.Map; */ public class ObserveReferenceSetResult<R extends ObserveReference> { + /** Logger. */ + private static final Log log = LogFactory.getLog(ObserveReferenceSetResult.class); + private final String requestName; private final ImmutableMap<String, ObserveReferenceSet<?, R>> referenceSets; @@ -52,6 +57,9 @@ public class ObserveReferenceSetResult<R extends ObserveReference> { } public Builder addKey(String name, ObserveReferenceSet<?, R> referenceSet) { + if (log.isInfoEnabled()) { + log.info("Add reference set " + name + " : " + referenceSet); + } referenceSetsMapBuilder.put(name, referenceSet); return this; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferenceSetServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferenceSetServiceTopia.java index 0189f1a..aae7d5b 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferenceSetServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferenceSetServiceTopia.java @@ -16,8 +16,6 @@ import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetReque import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestKeyDefinition; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.entity.EntitiesExtractor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; import java.util.Collections; @@ -31,9 +29,6 @@ import java.util.Map; */ public class ReferenceSetServiceTopia extends ObserveServiceTopia implements ReferenceSetService { - /** Logger. */ - private static final Log log = LogFactory.getLog(ReferenceSetServiceTopia.class); - @Override public ObserveReferenceSetResult<ObserveReference> loadDataReferenceSets(ObserveReferenceSetRequest request) { String requestName = request.getRequestName(); @@ -49,7 +44,7 @@ public class ReferenceSetServiceTopia extends ObserveServiceTopia implements Ref ObserveReferenceSet<IdDto, ObserveReference> referenceSet = loadDataReferenceSet(definition); String name = definition.getName(); - addKey(resultBuilder, name, referenceSet); + resultBuilder.addKey(name, referenceSet); } @@ -66,6 +61,7 @@ public class ReferenceSetServiceTopia extends ObserveServiceTopia implements Ref ObserveReferenceSetResult.Builder<ObserveReferentialReference> resultBuilder = ObserveReferenceSetResult.builder(requestName); ImmutableMap<String, Date> lastUpdateDates = request.getLastUpdateDates(); + Preconditions.checkNotNull(lastUpdateDates); for (ObserveReferenceSetRequestKeyDefinition definition : requestDefinition.getKeys()) { @@ -76,7 +72,7 @@ public class ReferenceSetServiceTopia extends ObserveServiceTopia implements Ref Date lastUpdateDate = lastUpdateDates.get(name); ObserveReferenceSet<ReferentialDto, ObserveReferentialReference> referenceSet = loadReferentialReferenceSet(definition, lastUpdateDate); - addKey(resultBuilder, name, referenceSet); + resultBuilder.addKey(name, referenceSet); } @@ -84,15 +80,6 @@ public class ReferenceSetServiceTopia extends ObserveServiceTopia implements Ref } - protected <D extends IdDto, R extends ObserveReference> void addKey(ObserveReferenceSetResult.Builder<R> resultBuilder, String name, ObserveReferenceSet<D, R> referenceSet) { - if (referenceSet != null) { - if (log.isInfoEnabled()) { - log.info("Add reference set " + name + " : " + referenceSet); - } - resultBuilder.addKey(name, referenceSet); - } - } - protected <D extends IdDto> ObserveReferenceSet<D, ObserveReference> loadDataReferenceSet(ObserveReferenceSetRequestKeyDefinition<D> requestKeyDefinition) { Class<TopiaEntity> entityType = getEntityType(requestKeyDefinition.getType()); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferenceSetServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferenceSetServiceTopiaTest.java index 9af6322..58b1820 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferenceSetServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferenceSetServiceTopiaTest.java @@ -1,13 +1,15 @@ package fr.ird.observe.services.service; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.reference.ObserveReferenceSetRequest; -import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; -import fr.ird.observe.services.dto.reference.ObserveReferentialReference; import fr.ird.observe.services.dto.reference.ObserveReferenceSetResult; +import fr.ird.observe.services.dto.reference.ObserveReferentialReference; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import org.junit.Assert; import org.junit.Test; +import java.util.Date; import java.util.Set; /** @@ -43,6 +45,7 @@ public class ReferenceSetServiceTopiaTest extends AbstractServiceTopiaTest { String requestName = ObserveReferenceSetRequestDefinitions.TRIP_SEINE_FORM.name(); ObserveReferenceSetRequest request = new ObserveReferenceSetRequest(); request.setRequestName(requestName); + request.setLastUpdateDates(ImmutableMap.<String, Date>of()); ObserveReferenceSetResult<ObserveReferentialReference> referentialLabelSet = service.loadReferentialReferenceSets(request); Assert.assertNotNull(referentialLabelSet); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.