[Observe-commits] 03/08: clean code

31 Aug 2016

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 0ba3ed836f518ff0f9507beb53aa695feb3a421f
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Tue Aug 30 13:00:34 2016 +0200

    clean code
---
 .../swing/decoration/DecoratorService.java         |  15 +-
 .../decoration/decorators/ObserveDecorator.java    |   3 +-
 application-swing-validation/pom.xml               |   4 -
 .../validators/ActivitySpeedDtoValidator.java      |   3 +-
 .../CollectionUniqueKeyDtoValidator.java           |   3 +-
 .../ObserveCollectionUniqueKeyDtoValidator.java    |   7 +-
 .../observe/application/swing/ObserveCLAction.java |   3 +-
 .../application/swing/ObserveOpenDataManager.java  |  49 +++---
 .../application/swing/ObserveResourceManager.java  |  10 +-
 .../swing/ObserveSwingApplicationContext.java      |   8 +-
 .../ObserveSwingApplicationConfig.java             | 186 +++++++--------------
 .../swing/db/ObserveSwingDataSource.java           |  29 +---
 .../application/swing/ui/ObserveMainUIHandler.java |   3 +-
 .../application/swing/ui/ObserveUICallback.java    |   4 +-
 .../ird/observe/application/swing/ui/UIHelper.java |   6 +-
 .../swing/ui/actions/ShowConfigAction.java         |   3 +-
 .../swing/ui/actions/shared/AbstractUIAction.java  |   3 +-
 .../application/swing/ui/admin/AdminUIHandler.java |   6 +-
 .../application/swing/ui/admin/AdminUIModel.java   |   3 +-
 .../swing/ui/admin/report/ReportModel.java         |   3 +-
 .../swing/ui/admin/report/ResultTableModel.java    |   3 +-
 .../data/task/DataSynchronizeTaskSupport.java      |   6 +-
 .../swing/ui/content/ContentUIHandler.java         |  31 ++--
 .../swing/ui/content/ContentUIInitializer.java     |   6 +-
 .../swing/ui/content/ContentUIManager.java         |  12 +-
 .../swing/ui/content/ContentUIModel.java           |  12 +-
 .../LonglineDetailCompositionUIHandler.java        |   9 +-
 ...onglineDetailCompositionUIValidationHelper.java |   3 +-
 .../impl/longline/ActivityLonglineUIHandler.java   |   6 +-
 .../open/impl/longline/TripLonglineUIHandler.java  |   4 +-
 .../open/impl/seine/ActivitySeineUIHandler.java    |  12 +-
 .../ui/content/open/impl/seine/RouteUIHandler.java |   6 +-
 .../open/impl/seine/TripSeineUIHandler.java        |   4 +-
 .../swing/ui/content/table/ContentTableModel.java  |   3 +-
 .../ui/content/table/ContentTableUIHandler.java    |   4 +-
 .../ui/content/table/ContentTableUIModel.java      |  10 +-
 .../longline/GearUseFeaturesLonglineUIHandler.java |   4 +-
 .../impl/longline/LonglinePositionHelper.java      |  52 +++---
 .../seine/GearUseFeatureMeasurementCellEditor.java |   3 +-
 .../GearUseFeatureMeasurementCellRenderer.java     |   3 +-
 .../impl/seine/GearUseFeaturesSeineUIHandler.java  |   4 +-
 .../table/impl/seine/NonTargetSampleUIHandler.java |   3 +-
 .../impl/seine/TargetDiscardCatchUIHandler.java    |   3 +-
 .../table/impl/seine/TargetSampleUIHandler.java    |   3 +-
 .../swing/ui/storage/StorageUIHandler.java         |   7 +-
 .../swing/ui/storage/StorageUILauncher.java        |   4 +-
 .../swing/ui/storage/StorageUIModel.java           |  11 +-
 .../swing/ui/storage/tabs/DataSelectionModel.java  |   8 +-
 .../swing/ui/storage/tabs/RolesTableModel.java     |   3 +-
 .../swing/ui/storage/tabs/SecurityModel.java       |   3 +-
 .../swing/ui/storage/tabs/StorageTabUIHandler.java |  12 +-
 .../ui/tree/AbstractObserveTreeCellRenderer.java   |  49 +++---
 .../swing/ui/tree/ActivityLonglineNode.java        |   3 +-
 .../swing/ui/tree/ActivitySeineNode.java           |   3 +-
 .../swing/ui/tree/FloatingObjectSeineNode.java     |   3 +-
 .../swing/ui/tree/ObserveTreeHelper.java           |  55 +++---
 .../swing/ui/tree/ProgramLonglineNode.java         |   3 +-
 .../swing/ui/tree/ProgramSeineNode.java            |   3 +-
 .../application/swing/ui/tree/RouteSeineNode.java  |   3 +-
 .../application/swing/ui/tree/SetLonglineNode.java |   3 +-
 .../application/swing/ui/tree/SetSeineNode.java    |   3 +-
 .../swing/ui/tree/TripLonglineNode.java            |   3 +-
 .../application/swing/ui/tree/TripSeineNode.java   |   3 +-
 .../actions/ChangeActivityRouteActionListener.java |   3 +-
 .../actions/ChangeActivityTripActionListener.java  |   3 +-
 .../actions/ChangeRouteTripActionListener.java     |   3 +-
 .../ui/tree/loadors/AbstractNodeChildLoador.java   |   6 +-
 .../loadors/ActivityLonglineNodeChildLoador.java   |   6 +-
 .../loadors/ActivityLonglinesNodeChildLoador.java  |   3 +-
 .../tree/loadors/ActivitySeineNodeChildLoador.java |   6 +-
 .../loadors/ActivitySeinesNodeChildLoador.java     |   3 +-
 .../loadors/FloatingObjectNodeChildLoador.java     |   3 +-
 .../loadors/ReferenceCommonNodeChildLoador.java    |   3 +-
 .../loadors/ReferenceLonglineNodeChildLoador.java  |   3 +-
 .../loadors/ReferenceSeineNodeChildLoador.java     |   3 +-
 .../tree/loadors/SetLonglineNodeChildLoador.java   |   3 +-
 .../ui/tree/loadors/SetSeineNodeChildLoador.java   |   3 +-
 .../swing/ui/util/DecoratedNodeEntity.java         |   9 +-
 .../ObserveValidationMessageTableRenderer.java     |   6 +-
 .../ui/util/table/AbstractSelectTableAction.java   |   9 +-
 .../EditableTableWithCacheTableModelSupport.java   |   3 +-
 .../swing/ui/util/tripMap/ObserveMapPane.java      |   7 +-
 .../ui/util/tripMap/ObserveMapPaneLegendItem.java  |   3 +-
 .../swing/validation/ValidationContext.java        |  30 ++--
 .../swing/validation/ValidationService.java        |   6 +-
 .../swing/validation/ValidatorsMap.java            |   3 +-
 .../web/ObserveWebApplicationContext.java          |   2 +-
 .../ObserveWebApplicationConfiguration.java        |   3 +-
 .../db/ObserveWebDatabasesHelper.java              |   3 +-
 .../configuration/user/ObserveWebUsersHelper.java  |   3 +-
 .../controller/v1/DataSourceServiceController.java |  20 +--
 .../v1/ObserveServiceControllerSupport.java        |   7 +-
 .../controller/v1/ObserveWebErrorController.java   |  10 +-
 .../web/controller/v1/PingServiceController.java   |   4 +-
 .../web/injector/ImmutableSetInjector.java         |   6 +-
 .../web/injector/ObserveClassInjector.java         |   4 +-
 .../ObserveDataSourceConfigurationInjector.java    |   4 +-
 .../ObserveReferenceSetRequestInjector.java        |   4 +-
 .../injector/SqlScriptProducerRequestInjector.java |   4 +-
 .../web/request/ObserveWebRequestContext.java      |   9 +-
 .../ObserveWebSecurityApplicationContext.java      |  10 +-
 ...ObserveWebSecurityAuthenticationTokenCache.java |   4 +-
 .../entities/migration/H2DataSourceMigration.java  |   6 +-
 .../entities/migration/PGDataSourceMigration.java  |   6 +-
 .../DataSourceMigrationForVersion_3_1.java         |   7 +-
 entities/pom.xml                                   |   7 -
 .../fr/ird/observe/AbstractObserveTopiaDao.java    |   3 +-
 .../observe/ObserveTopiaPersistenceContext.java    |  10 +-
 .../longline/ActivityLonglineTopiaDao.java         |   6 +-
 .../observe/entities/longline/SectionTemplate.java |  11 +-
 .../fr/ird/observe/entities/longline/Sections.java |   6 +-
 .../ird/observe/entities/longline/TdrTopiaDao.java |   3 +-
 .../entities/longline/TripLonglineTopiaDao.java    |   9 +-
 .../observe/entities/referentiel/HarbourImpl.java  |   5 +-
 .../referentiel/LengthWeightParameters.java        |  28 ++--
 .../referentiel/LengthWeightParemeterHelper.java   |  14 +-
 .../observe/entities/referentiel/ProgramImpl.java  |   3 +-
 .../entities/referentiel/ProgramTopiaDao.java      |   3 +-
 .../observe/entities/seine/ActivitySeineImpl.java  |   3 +-
 .../entities/seine/ActivitySeineTopiaDao.java      |   6 +-
 .../entities/seine/FloatingObjectTopiaDao.java     |   6 +-
 .../ird/observe/entities/seine/RouteTopiaDao.java  |  11 +-
 .../ird/observe/entities/seine/TargetCatchs.java   |   7 +-
 .../observe/entities/seine/TripSeineTopiaDao.java  |   9 +-
 .../observe/services/dto/AbstractReferenceSet.java |   6 +-
 .../ird/observe/services/dto/DataReferenceSet.java |   3 +-
 .../dto/DataSourceCreateConfigurationDto.java      |  11 +-
 .../java/fr/ird/observe/services/dto/Form.java     |   3 +-
 .../services/dto/actions/report/DataMatrix.java    |   3 +-
 .../services/dto/constants/ReferentialLocale.java  |   3 +-
 .../ird/observe/services/dto/gson/BlobAdapter.java |   3 +-
 .../observe/services/dto/gson/ClassAdapter.java    |   3 +-
 .../dto/gson/ImmutableMultimapAdapter.java         |   3 +-
 .../services/dto/gson/ObserveDtoGsonSupplier.java  |   4 +-
 .../observe/services/dto/gson/VersionAdapter.java  |   8 +-
 .../gson/reference/AbstractReferenceAdapter.java   |   4 +-
 .../reference/AbstractReferenceSetAdapter.java     |   3 +-
 .../gson/reference/DataReferenceSetAdapter.java    |   3 +-
 .../reference/ReferentialReferenceSetAdapter.java  |   7 +-
 .../services/dto/longline/SectionTemplate.java     |  11 +-
 .../dto/reference/DataReferenceSetDefinitions.java |   8 +-
 .../reference/ReferenceBinderEngineSupplier.java   |   3 +-
 .../ReferentialReferenceSetDefinitions.java        |   6 +-
 .../services/dto/referential/ProgramDto.java       |   3 +-
 .../dto/referential/ReferentialMultimap.java       |   4 +-
 .../dto/referential/ReferentialReferenceSet.java   |   3 +-
 .../dto/referential/ReferentialReferences.java     |   9 +-
 .../services/dto/seine/TargetCatchDtos.java        |   7 +-
 .../main/java/fr/ird/observe/util/GPSPoint.java    |   6 +-
 services-topia-validation/pom.xml                  |   4 -
 .../validators/ActivitySpeedValidator.java         |   3 +-
 .../validators/CollectionUniqueKeyValidator2.java  |   3 +-
 .../ObserveCollectionUniqueKeyValidator.java       |   7 +-
 .../SetLonglineUniqueHomeIdValidator.java          |   4 +-
 .../SetLonglineUniqueNumberValidator.java          |   4 +-
 .../persistence/metadata/TopiaMetadataModel.java   |   3 +-
 156 files changed, 467 insertions(+), 820 deletions(-)

diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java
index d62b68a..fa95e5f 100644
--- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java
+++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java
@@ -200,13 +200,11 @@ public class DecoratorService extends DecoratorProvider {
 
 
     public static String getPropertyLabel(String propertyName) {
-        String type = getPropertyLabel(OBSERVE_COMMON_PREFIX, propertyName);
-        return type;
+        return getPropertyLabel(OBSERVE_COMMON_PREFIX, propertyName);
     }
 
     public static String getPropertyLabel(String prefix, String propertyName) {
-        String type = prefix + Introspector.decapitalize(propertyName);
-        return type;
+        return prefix + Introspector.decapitalize(propertyName);
     }
 
     public List<Class<? extends IdDto>> sortTypes(Collection<Class<? extends IdDto>> types) {
@@ -595,18 +593,15 @@ public class DecoratorService extends DecoratorProvider {
     }
 
     public <T extends ReferentialDto> ReferentialReferenceDecorator<T> getReferentialReferenceDecorator(Class<T> referenceType) {
-        ReferentialReferenceDecorator<T> decorator = (ReferentialReferenceDecorator) getDecoratorByType(ReferentialReference.class, referenceType.getSimpleName());
-        return decorator;
+        return (ReferentialReferenceDecorator<T>) (ReferentialReferenceDecorator) getDecoratorByType(ReferentialReference.class, referenceType.getSimpleName());
     }
 
     public <T extends DataDto> DataReferenceDecorator<T> getDataReferenceDecorator(Class<T> referenceType) {
-        DataReferenceDecorator<T> decorator = (DataReferenceDecorator) getDecoratorByType(DataReference.class, referenceType.getSimpleName());
-        return decorator;
+        return (DataReferenceDecorator<T>) (DataReferenceDecorator) getDecoratorByType(DataReference.class, referenceType.getSimpleName());
     }
 
     public <T extends DataDto> DataReferenceDecorator<T> getDataReferenceDecorator(Class<T> referenceType, String context) {
-        DataReferenceDecorator<T> decorator = (DataReferenceDecorator) getDecoratorByType(DataReference.class, referenceType.getSimpleName()+ context);
-        return decorator;
+        return (DataReferenceDecorator<T>) (DataReferenceDecorator) getDecoratorByType(DataReference.class, referenceType.getSimpleName()+ context);
     }
 
     public Decorator getReferenceDecorator(Class referenceType) {
diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java
index b814840..3d39159 100644
--- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java
+++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java
@@ -60,8 +60,7 @@ public class ObserveDecorator<E> extends MultiJXPathDecorator<E> implements Clon
 
     @Override
     public final Object clone() throws CloneNotSupportedException {
-        Object clone = super.clone();
-        return clone;
+        return super.clone();
     }
 
     protected Comparable<Comparable<?>> getTokenValue(JXPathContext jxcontext,
diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml
index ea05fd2..126eb4d 100644
--- a/application-swing-validation/pom.xml
+++ b/application-swing-validation/pom.xml
@@ -63,10 +63,6 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
 
     <!-- Nuiton -->
     <dependency>
diff --git a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySpeedDtoValidator.java b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySpeedDtoValidator.java
index 244639f..7297d82 100644
--- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySpeedDtoValidator.java
+++ b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ActivitySpeedDtoValidator.java
@@ -172,8 +172,7 @@ public class ActivitySpeedDtoValidator extends FieldValidatorSupport {
                         pop = true;
                     }
                     try {
-                        String message = super.getMessage(object);
-                        return message;
+                        return super.getMessage(object);
                     } finally {
                         if (pop) {
                             stack.pop();
diff --git a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/CollectionUniqueKeyDtoValidator.java b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/CollectionUniqueKeyDtoValidator.java
index b21857e..663daf4 100644
--- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/CollectionUniqueKeyDtoValidator.java
+++ b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/CollectionUniqueKeyDtoValidator.java
@@ -39,8 +39,7 @@ public class CollectionUniqueKeyDtoValidator extends CollectionUniqueKeyValidato
         if (o instanceof IdDto) {
             o = ((IdDto) o).getId();
         }
-        Integer uniqueKeyHashCode = super.getUniqueKeyHashCode(o);
-        return uniqueKeyHashCode;
+        return super.getUniqueKeyHashCode(o);
     }
 
     @Override
diff --git a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java
index cd7ed5a..79821b8 100644
--- a/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java
+++ b/application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java
@@ -22,7 +22,6 @@ package fr.ird.observe.application.swing.validation.validators;
  * #L%
  */
 
-import com.google.common.base.Objects;
 import com.opensymphony.xwork2.validator.ValidationException;
 import fr.ird.observe.services.dto.IdDto;
 import org.nuiton.validator.xwork2.field.NuitonFieldValidatorSupport;
@@ -31,6 +30,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -120,7 +120,7 @@ public class ObserveCollectionUniqueKeyDtoValidator extends NuitonFieldValidator
             index++;
 
             String id = ((IdDto) o).getId();
-            if (Objects.equal(idToExclude, id)) {
+            if (Objects.equals(idToExclude, id)) {
 
                 // Do not treate against object
                 continue;
@@ -200,8 +200,7 @@ public class ObserveCollectionUniqueKeyDtoValidator extends NuitonFieldValidator
                 o2 = ((Date)o2).getTime();
             }
 
-            boolean equals = Objects.equal(o1, o2);
-            return equals;
+            return Objects.equals(o1, o2);
 
         }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java
index f346a07..1840948 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java
@@ -361,8 +361,7 @@ public class ObserveCLAction {
     protected Runnable createRunnable(Object invoker, String method, Object... args) {
         ObserveActionExecutor executor = ObserveRunner.getActionExecutor();
 
-        Runnable runnable = executor.createRunnable(invoker, method, args);
-        return runnable;
+        return executor.createRunnable(invoker, method, args);
     }
 
     protected void launchAction(String title, Runnable target) throws InterruptedException {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveOpenDataManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveOpenDataManager.java
index 4264d4f..b027c7f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveOpenDataManager.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveOpenDataManager.java
@@ -29,6 +29,7 @@ import fr.ird.observe.services.dto.IdDtos;
 import fr.ird.observe.services.dto.referential.ProgramDto;
 
 import java.io.Closeable;
+import java.util.Objects;
 
 /**
  * Pour gérer les données ouvertes sur une source de données dans l'application.
@@ -51,18 +52,18 @@ public class ObserveOpenDataManager implements Closeable {
     }
 
     public void openProgram(String programId) {
-        Preconditions.checkNotNull(programId, "id cant be null");
+        Objects.requireNonNull(programId, "id cant be null");
         Preconditions.checkState(canOpenProgram(), "a program is already opened");
         dataContext.setOpenProgramId(programId);
     }
 
     public boolean isOpenProgram(String programId) {
-        Preconditions.checkNotNull(programId, "id cant be null");
+        Objects.requireNonNull(programId, "id cant be null");
         return programId.equals(dataContext.getOpenProgramId());
     }
 
     public void closeProgram(String programId) {
-        Preconditions.checkNotNull(programId, "id cant be null");
+        Objects.requireNonNull(programId, "id cant be null");
         Preconditions.checkState(isOpenProgram(programId), "this program is not opened");
         dataContext.setOpenProgramId(null);
     }
@@ -75,18 +76,18 @@ public class ObserveOpenDataManager implements Closeable {
 
     public void openTripSeine(String programId, String tripSeineId) {
         openProgram(programId);
-        Preconditions.checkNotNull(tripSeineId, "id cant be null");
+        Objects.requireNonNull(tripSeineId, "id cant be null");
         Preconditions.checkState(canOpenTripSeine(), "a trip is already opened");
         dataContext.setOpenTripSeineId(tripSeineId);
     }
 
     public boolean isOpenTripSeine(String tripSeineId) {
-        Preconditions.checkNotNull(tripSeineId, "id cant be null");
+        Objects.requireNonNull(tripSeineId, "id cant be null");
         return tripSeineId.equals(dataContext.getOpenTripSeineId());
     }
 
     public void closeTripSeine(String tripSeineId) {
-        Preconditions.checkNotNull(tripSeineId, "id cant be null");
+        Objects.requireNonNull(tripSeineId, "id cant be null");
         Preconditions.checkState(isOpenTripSeine(tripSeineId), "this trip is not opened");
 
         if (dataContext.isOpenRoute()) {
@@ -100,24 +101,24 @@ public class ObserveOpenDataManager implements Closeable {
 
     // Route
     public boolean canOpenRoute(String parentTripSeineId) {
-        Preconditions.checkNotNull(parentTripSeineId, "id cant be null");
+        Objects.requireNonNull(parentTripSeineId, "id cant be null");
         return isOpenTripSeine(parentTripSeineId) && !dataContext.isOpenRoute();
     }
 
     public void openRoute(String parentTripSeineId, String routeId) {
-        Preconditions.checkNotNull(parentTripSeineId, "id cant be null");
-        Preconditions.checkNotNull(routeId, "id cant be null");
+        Objects.requireNonNull(parentTripSeineId, "id cant be null");
+        Objects.requireNonNull(routeId, "id cant be null");
         Preconditions.checkState(canOpenRoute(parentTripSeineId), "the trip is not opened or another route already opened");
         dataContext.setOpenRouteId(routeId);
     }
 
     public boolean isOpenRoute(String routeId) {
-        Preconditions.checkNotNull(routeId, "id cant be null");
+        Objects.requireNonNull(routeId, "id cant be null");
         return routeId.equals(dataContext.getOpenRouteId());
     }
 
     public void closeRoute(String routeId) {
-        Preconditions.checkNotNull(routeId, "id cant be null");
+        Objects.requireNonNull(routeId, "id cant be null");
         Preconditions.checkState(isOpenRoute(routeId), "this route is not opened");
 
         if (dataContext.isOpenActivitySeine()) {
@@ -130,24 +131,24 @@ public class ObserveOpenDataManager implements Closeable {
 
     // Activity Seine
     public boolean canOpenActivitySeine(String parentRouteId) {
-        Preconditions.checkNotNull(parentRouteId, "id cant be null");
+        Objects.requireNonNull(parentRouteId, "id cant be null");
         return isOpenRoute(parentRouteId) && !dataContext.isOpenActivitySeine();
     }
 
     public void openActivitySeine(String parentRouteId, String activitySeineId) {
-        Preconditions.checkNotNull(parentRouteId, "id cant be null");
-        Preconditions.checkNotNull(activitySeineId, "id cant be null");
+        Objects.requireNonNull(parentRouteId, "id cant be null");
+        Objects.requireNonNull(activitySeineId, "id cant be null");
         Preconditions.checkState(canOpenActivitySeine(parentRouteId), "the route is not opened or another activity is already opened");
         dataContext.setOpenActivitySeineId(activitySeineId);
     }
 
     public boolean isOpenActivitySeine(String activitySeineId) {
-        Preconditions.checkNotNull(activitySeineId, "id cant be null");
+        Objects.requireNonNull(activitySeineId, "id cant be null");
         return activitySeineId.equals(dataContext.getOpenActivitySeineId());
     }
 
     public void closeActivitySeine(String activitySeineId) {
-        Preconditions.checkNotNull(activitySeineId, "id cant be null");
+        Objects.requireNonNull(activitySeineId, "id cant be null");
         Preconditions.checkState(isOpenActivitySeine(activitySeineId), "this activity is not opened");
         dataContext.setOpenActivitySeineId(null);
     }
@@ -159,18 +160,18 @@ public class ObserveOpenDataManager implements Closeable {
 
     public void openTripLongline(String programId, String tripLongLineId) {
         openProgram(programId);
-        Preconditions.checkNotNull(tripLongLineId, "id cant be null");
+        Objects.requireNonNull(tripLongLineId, "id cant be null");
         Preconditions.checkState(canOpenTripLongline(), "a trip is already opened");
         dataContext.setOpenTripLonglineId(tripLongLineId);
     }
 
     public boolean isOpenTripLongline(String tripLongLineId) {
-        Preconditions.checkNotNull(tripLongLineId, "id cant be null");
+        Objects.requireNonNull(tripLongLineId, "id cant be null");
         return tripLongLineId.equals(dataContext.getOpenTripLonglineId());
     }
 
     public void closeTripLongline(String tripLongLineId) {
-        Preconditions.checkNotNull(tripLongLineId, "id cant be null");
+        Objects.requireNonNull(tripLongLineId, "id cant be null");
         Preconditions.checkState(isOpenTripLongline(tripLongLineId), "this trip is not opened");
 
         if (dataContext.isOpenActivityLongline()) {
@@ -184,24 +185,24 @@ public class ObserveOpenDataManager implements Closeable {
 
     // Activity Longline
     public boolean canOpenActivityLongline(String parentTripLonglineId) {
-        Preconditions.checkNotNull(parentTripLonglineId, "id cant be null");
+        Objects.requireNonNull(parentTripLonglineId, "id cant be null");
         return isOpenTripLongline(parentTripLonglineId) && !dataContext.isOpenActivityLongline();
     }
 
     public void openActivityLongline(String parentTripLonglineId, String activityLonglineId) {
-        Preconditions.checkNotNull(parentTripLonglineId, "id cant be null");
-        Preconditions.checkNotNull(activityLonglineId, "id cant be null");
+        Objects.requireNonNull(parentTripLonglineId, "id cant be null");
+        Objects.requireNonNull(activityLonglineId, "id cant be null");
         Preconditions.checkState(canOpenActivityLongline(parentTripLonglineId), "the trip is not opened or another activity is already opened");
         dataContext.setOpenActivityLonglineId(activityLonglineId);
     }
 
     public boolean isOpenActivityLongline(String activityLonglineId) {
-        Preconditions.checkNotNull(activityLonglineId, "id cant be null");
+        Objects.requireNonNull(activityLonglineId, "id cant be null");
         return activityLonglineId.equals(dataContext.getOpenActivityLonglineId());
     }
 
     public void closeActivityLongline(String activityLonglineId) {
-        Preconditions.checkNotNull(activityLonglineId, "id cant be null");
+        Objects.requireNonNull(activityLonglineId, "id cant be null");
         Preconditions.checkState(isOpenActivityLongline(activityLonglineId), "this activity is not opened");
         dataContext.setOpenActivityLonglineId(null);
     }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java
index cffa086..ea9c299 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java
@@ -94,8 +94,7 @@ public class ObserveResourceManager {
         }
 
         public File getFile(File directory) {
-            File file = new File(directory, location.substring(1));
-            return file;
+            return new File(directory, location.substring(1));
         }
 
     }
@@ -113,17 +112,14 @@ public class ObserveResourceManager {
     public Properties getResource(Resource resource) throws IOException {
 
         URL url = resource.getUrl();
-        Properties result = getResource(url);
-        return result;
+        return getResource(url);
     }
 
     public Properties getResource(File file) throws IOException {
 
         URL url = file.toURI().toURL();
 
-        Properties result = load(url);
-
-        return result;
+        return load(url);
     }
 
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java
index b7f62a7..2235c8e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java
@@ -31,8 +31,8 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
 import fr.ird.observe.application.swing.db.constants.DbMode;
 import fr.ird.observe.application.swing.db.event.ObserveSwingDataSourceEvent;
 import fr.ird.observe.application.swing.db.event.ObserveSwingDataSourceListenerAdapter;
-import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory;
-import fr.ird.observe.services.ObserveServiceMainFactory;
+import fr.ird.observe.services.runner.ObserveDataSourceConfigurationMainFactory;
+import fr.ird.observe.services.runner.ObserveServiceMainFactory;
 import fr.ird.observe.services.ObserveServicesProvider;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2;
 import fr.ird.observe.services.configuration.ObserveDataSourceInformation;
@@ -425,9 +425,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im
                 getConfig().getModelVersion()
         );
 
-        ObserveSwingDataSource result = getDataSourcesManager().newDataSource(config);
-
-        return result;
+        return getDataSourcesManager().newDataSource(config);
     }
 
     public void initStorage(ObserveSwingApplicationConfig config, ObserveMainUI mainUI, boolean askToCreate) {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java b/application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java
index 3152f83..86cf8a5 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java
@@ -30,7 +30,7 @@ import fr.ird.observe.application.swing.ObserveResourceManager;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.db.constants.CreationMode;
 import fr.ird.observe.application.swing.db.constants.DbMode;
-import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory;
+import fr.ird.observe.services.runner.ObserveDataSourceConfigurationMainFactory;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG;
@@ -388,8 +388,7 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
     }
 
     public boolean isDevMode() {
-        boolean result = getOptionAsBoolean(ObserveSwingApplicationConfigOption.DEV_MODE.key);
-        return result;
+        return getOptionAsBoolean(ObserveSwingApplicationConfigOption.DEV_MODE.key);
     }
 
     public Version getVersion() {
@@ -397,53 +396,43 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
     }
 
     public Version getModelVersion() {
-        Version result = getOption(Version.class, ObserveSwingApplicationConfigOption.MODEL_VERSION.key);
-        return result;
+        return getOption(Version.class, ObserveSwingApplicationConfigOption.MODEL_VERSION.key);
     }
 
     public boolean isAutoPopupNumberEditor() {
-        boolean result = getOptionAsBoolean(ObserveSwingApplicationConfigOption.AUTO_POPUP_NUMBER_EDITOR.key);
-        return result;
+        return getOptionAsBoolean(ObserveSwingApplicationConfigOption.AUTO_POPUP_NUMBER_EDITOR.key);
     }
 
     public boolean isShowNumberEditorButton() {
-        boolean result = getOptionAsBoolean(ObserveSwingApplicationConfigOption.SHOW_NUMBER_EDITOR_BUTTON.key);
-        return result;
+        return getOptionAsBoolean(ObserveSwingApplicationConfigOption.SHOW_NUMBER_EDITOR_BUTTON.key);
     }
 
     public boolean isShowTimeEditorSlider() {
-        boolean result = getOptionAsBoolean(ObserveSwingApplicationConfigOption.SHOW_DATE_TIME_EDITOR_SLIDER.key);
-        return result;
+        return getOptionAsBoolean(ObserveSwingApplicationConfigOption.SHOW_DATE_TIME_EDITOR_SLIDER.key);
     }
 
     public boolean isFullScreen() {
-        boolean result = getOptionAsBoolean(ObserveSwingApplicationConfigOption.FULL_SCREEN.key);
-        return result;
+        return getOptionAsBoolean(ObserveSwingApplicationConfigOption.FULL_SCREEN.key);
     }
 
     public File getDataDirectory() {
-        File file = getOptionAsFile(ObserveSwingApplicationConfigOption.DATA_DIRECTORY.key);
-        return file;
+        return getOptionAsFile(ObserveSwingApplicationConfigOption.DATA_DIRECTORY.key);
     }
 
     public File getValidationReportDirectory() {
-        File file = getOptionAsFile(ObserveSwingApplicationConfigOption.VALIDATION_REPORT_DIRECTORY.key);
-        return file;
+        return getOptionAsFile(ObserveSwingApplicationConfigOption.VALIDATION_REPORT_DIRECTORY.key);
     }
 
     public File getLocalDBDirectory() {
-        File result = getOptionAsFile(ObserveSwingApplicationConfigOption.DB_DIRECTORY.key);
-        return result;
+        return getOptionAsFile(ObserveSwingApplicationConfigOption.DB_DIRECTORY.key);
     }
 
     public File getResourcesDirectory() {
-        File result = getOptionAsFile(ObserveSwingApplicationConfigOption.RESOURCES_DIRECTORY.key);
-        return result;
+        return getOptionAsFile(ObserveSwingApplicationConfigOption.RESOURCES_DIRECTORY.key);
     }
 
     public File getI18nDirectory() {
-        File result = getOptionAsFile(ObserveSwingApplicationConfigOption.I18N_DIRECTORY.key);
-        return result;
+        return getOptionAsFile(ObserveSwingApplicationConfigOption.I18N_DIRECTORY.key);
     }
 
     public void setResourcesDirectory(File newValue) {
@@ -451,49 +440,40 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
     }
 
     public File getInitialDbDump() {
-        File result = getOptionAsFile(ObserveSwingApplicationConfigOption.INITIAL_DB_DUMP.key);
-        return result;
+        return getOptionAsFile(ObserveSwingApplicationConfigOption.INITIAL_DB_DUMP.key);
     }
 
     public File getBackupDirectory() {
-        File result = getOptionAsFile(ObserveSwingApplicationConfigOption.BACKUP_DIRECTORY.key);
-        return result;
+        return getOptionAsFile(ObserveSwingApplicationConfigOption.BACKUP_DIRECTORY.key);
     }
 
     public File getReportDirectory() {
-        File result = getOptionAsFile(ObserveSwingApplicationConfigOption.REPORT_DIRECTORY.key);
-        return result;
+        return getOptionAsFile(ObserveSwingApplicationConfigOption.REPORT_DIRECTORY.key);
     }
 
     public File getTmpDirectory() {
-        File result = getOptionAsFile(ObserveSwingApplicationConfigOption.TMP_DIRECTORY.key);
-        return result;
+        return getOptionAsFile(ObserveSwingApplicationConfigOption.TMP_DIRECTORY.key);
     }
 
     public File getLogConfigurationFile() {
-        File result = getOptionAsFile(ObserveSwingApplicationConfigOption.LOG_CONFIGURATION_FILE.key);
-        return result;
+        return getOptionAsFile(ObserveSwingApplicationConfigOption.LOG_CONFIGURATION_FILE.key);
     }
 
     public String getH2Login() {
-        String result = getOption(ObserveSwingApplicationConfigOption.H2_LOGIN.key);
-        return result;
+        return getOption(ObserveSwingApplicationConfigOption.H2_LOGIN.key);
     }
 
     public char[] getH2Password() {
         String result = getOption(ObserveSwingApplicationConfigOption.H2_PASSWORD.key);
-        char[] r = result.toCharArray();
-        return r;
+        return result.toCharArray();
     }
 
     public int getH2ServerPort() {
-        Integer port = getOptionAsInt(ObserveSwingApplicationConfigOption.H2_SERVER_PORT.key);
-        return port;
+        return getOptionAsInt(ObserveSwingApplicationConfigOption.H2_SERVER_PORT.key);
     }
 
     public String getObstunaUrl() {
-        String result = getOption(ObserveSwingApplicationConfigOption.OBSTUNA_URL.key);
-        return result;
+        return getOption(ObserveSwingApplicationConfigOption.OBSTUNA_URL.key);
     }
 
     public void setObstunaUrl(String jdbcUrl) {
@@ -501,8 +481,7 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
     }
 
     public String getObstunaLogin() {
-        String result = getOption(ObserveSwingApplicationConfigOption.OBSTUNA_LOGIN.key);
-        return result;
+        return getOption(ObserveSwingApplicationConfigOption.OBSTUNA_LOGIN.key);
     }
 
     public void setObstunaLogin(String login) {
@@ -511,8 +490,7 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
 
     public char[] getObstunaPassword() {
         String result = getOption(ObserveSwingApplicationConfigOption.OBSTUNA_PASSWORD.key);
-        char[] r = result.toCharArray();
-        return r;
+        return result.toCharArray();
     }
 
     public void setObstunaPassword(char[] password) {
@@ -520,8 +498,7 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
     }
 
     public boolean isObstunaUseSsl() {
-        boolean result = getOptionAsBoolean(ObserveSwingApplicationConfigOption.OBSTUNA_USE_SSL_CERT.key);
-        return result;
+        return getOptionAsBoolean(ObserveSwingApplicationConfigOption.OBSTUNA_USE_SSL_CERT.key);
     }
 
     public void setObstunaUseSsl(boolean useSsl) {
@@ -529,8 +506,7 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
     }
 
     public URL getServerUrl() {
-        URL result = (URL) getOption(ObserveSwingApplicationConfigOption.SERVER_URL);
-        return result;
+        return (URL) getOption(ObserveSwingApplicationConfigOption.SERVER_URL);
     }
 
     public void setServerUrl(URL serverUrl) {
@@ -538,8 +514,7 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
     }
 
     public String getServerLogin() {
-        String result = getOption(ObserveSwingApplicationConfigOption.SERVER_LOGIN.key);
-        return result;
+        return getOption(ObserveSwingApplicationConfigOption.SERVER_LOGIN.key);
     }
 
     public void setServerLogin(String serverLoginl) {
@@ -548,8 +523,7 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
 
     public char[] getServerPassword() {
         String result = getOption(ObserveSwingApplicationConfigOption.SERVER_PASSWORD.key);
-        char[] r = result.toCharArray();
-        return r;
+        return result.toCharArray();
     }
 
     public void setServerPassword(char[] password) {
@@ -557,8 +531,7 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
     }
 
     public String getServerDataBaseName() {
-        String result = getOption(ObserveSwingApplicationConfigOption.SERVER_DATABASE_NAME.key);
-        return result;
+        return getOption(ObserveSwingApplicationConfigOption.SERVER_DATABASE_NAME.key);
     }
 
     public void setServerDataBaseName(String dataBaseName) {
@@ -566,34 +539,27 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
     }
 
     public DbMode getDefaultDbMode() {
-        DbMode result = getOption(DbMode.class, ObserveSwingApplicationConfigOption.DEFAULT_DB_MODE.key);
-        return result;
+        return getOption(DbMode.class, ObserveSwingApplicationConfigOption.DEFAULT_DB_MODE.key);
     }
 
     public CreationMode getDefaultCreationMode() {
-        CreationMode result =
-                getOption(CreationMode.class, ObserveSwingApplicationConfigOption.DEFAULT_CREATION_MODE.key);
-        return result;
+        return getOption(CreationMode.class, ObserveSwingApplicationConfigOption.DEFAULT_CREATION_MODE.key);
     }
 
     public boolean isShowMigrationSql() {
-        boolean result = getOptionAsBoolean(ObserveSwingApplicationConfigOption.SHOW_MIGRATION_SQL.key);
-        return result;
+        return getOptionAsBoolean(ObserveSwingApplicationConfigOption.SHOW_MIGRATION_SQL.key);
     }
 
     public boolean isShowMigrationProgression() {
-        boolean result = getOptionAsBoolean(ObserveSwingApplicationConfigOption.SHOW_MIGRATION_PROGRESSION.key);
-        return result;
+        return getOptionAsBoolean(ObserveSwingApplicationConfigOption.SHOW_MIGRATION_PROGRESSION.key);
     }
 
     public boolean isShowSql() {
-        boolean result = getOptionAsBoolean(ObserveSwingApplicationConfigOption.SHOW_SQL.key);
-        return result;
+        return getOptionAsBoolean(ObserveSwingApplicationConfigOption.SHOW_SQL.key);
     }
 
     public int getDefaultGpsMaxDelay() {
-        Integer i = getOptionAsInt(ObserveSwingApplicationConfigOption.DEFAULT_GPS_MAX_DELAY.key);
-        return i;
+        return getOptionAsInt(ObserveSwingApplicationConfigOption.DEFAULT_GPS_MAX_DELAY.key);
     }
 
     public float getDefaultGpsMaxSpeed() {
@@ -602,78 +568,63 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
     }
 
     public boolean isChangeSynchroSrc() {
-        boolean result = getOptionAsBoolean(ObserveSwingApplicationConfigOption.CHANGE_SYNCHRO_SRC.key);
-        return result;
+        return getOptionAsBoolean(ObserveSwingApplicationConfigOption.CHANGE_SYNCHRO_SRC.key);
     }
 
     public boolean isStoreRemoteStorage() {
-        boolean result = getOptionAsBoolean(ObserveSwingApplicationConfigOption.STORE_REMOTE_STORAGE.key);
-        return result;
+        return getOptionAsBoolean(ObserveSwingApplicationConfigOption.STORE_REMOTE_STORAGE.key);
     }
 
     public boolean isCanMigrateObstuna() {
-        boolean result = getOptionAsBoolean(ObserveSwingApplicationConfigOption.OBSTUNA_CAN_MIGRATE.key);
-        return result;
+        return getOptionAsBoolean(ObserveSwingApplicationConfigOption.OBSTUNA_CAN_MIGRATE.key);
     }
 
     public boolean isCanMigrateH2() {
-        boolean result = getOptionAsBoolean(ObserveSwingApplicationConfigOption.H2_CAN_MIGRATE.key);
-        return result;
+        return getOptionAsBoolean(ObserveSwingApplicationConfigOption.H2_CAN_MIGRATE.key);
     }
 
     public boolean isLoadLocalStorage() {
-        boolean result = getOptionAsBoolean(ObserveSwingApplicationConfigOption.LOAD_LOCAL_STORAGE.key);
-        return result;
+        return getOptionAsBoolean(ObserveSwingApplicationConfigOption.LOAD_LOCAL_STORAGE.key);
     }
 
     public Locale getLocale() {
-        Locale result = getOption(Locale.class, ObserveSwingApplicationConfigOption.LOCALE.key);
-        return result;
+        return getOption(Locale.class, ObserveSwingApplicationConfigOption.LOCALE.key);
     }
 
     public Locale getDbLocale() {
-        Locale result = getOption(Locale.class, ObserveSwingApplicationConfigOption.DB_LOCALE.key);
-        return result;
+        return getOption(Locale.class, ObserveSwingApplicationConfigOption.DB_LOCALE.key);
     }
 
     public int getNonTargetObservation() {
-        int value = getOptionAsInt(ObserveSwingApplicationConfigOption.NON_TARGET_OBSERVATION.key);
-        return value;
+        return getOptionAsInt(ObserveSwingApplicationConfigOption.NON_TARGET_OBSERVATION.key);
     }
 
     public int getTargetDiscardsObservation() {
-        int value = getOptionAsInt(ObserveSwingApplicationConfigOption.TARGET_DISCARDS_OBSERVATION.key);
-        return value;
+        return getOptionAsInt(ObserveSwingApplicationConfigOption.TARGET_DISCARDS_OBSERVATION.key);
     }
 
     public int getSamplesObservation() {
-        int value = getOptionAsInt(ObserveSwingApplicationConfigOption.SAMPLES_OBSERVATION.key);
-        return value;
+        return getOptionAsInt(ObserveSwingApplicationConfigOption.SAMPLES_OBSERVATION.key);
     }
 
     public int getObjectsObservation() {
-        int value = getOptionAsInt(ObserveSwingApplicationConfigOption.OBJECTS_OBSERVATION.key);
-        return value;
+        return getOptionAsInt(ObserveSwingApplicationConfigOption.OBJECTS_OBSERVATION.key);
     }
 
     public int getDetailledActivitiesObservation() {
-        int value = getOptionAsInt(ObserveSwingApplicationConfigOption.DETAILLED_ACTIVITIES_OBSERVATION.key);
-        return value;
+        return getOptionAsInt(ObserveSwingApplicationConfigOption.DETAILLED_ACTIVITIES_OBSERVATION.key);
     }
 
     public int getMammalsObservation() {
-        int value = getOptionAsInt(ObserveSwingApplicationConfigOption.MAMMALS_OBSERVATION.key);
-        return value;
+        return getOptionAsInt(ObserveSwingApplicationConfigOption.MAMMALS_OBSERVATION.key);
     }
 
     public int getBirdsObservation() {
-        int value = getOptionAsInt(ObserveSwingApplicationConfigOption.BIRDS_OBSERVATION.key);
-        return value;
+        return getOptionAsInt(ObserveSwingApplicationConfigOption.BIRDS_OBSERVATION.key);
     }
 
     public int getBaitObservation() {
-        int value = getOptionAsInt(ObserveSwingApplicationConfigOption.BAIT_OBSERVATION.key);
-        return value;
+        return getOptionAsInt(ObserveSwingApplicationConfigOption.BAIT_OBSERVATION.key);
     }
 
     public boolean isDisplayMainUI() {
@@ -845,43 +796,35 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
     }
 
     public String getSpeciesListSeineNonTargetCatchId() {
-        String value = getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_NON_TARGET_CATCH_ID.key);
-        return value;
+        return getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_NON_TARGET_CATCH_ID.key);
     }
 
     public String getSpeciesListSeineTargetCatchId() {
-        String value = getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_TARGET_CATCH_ID.key);
-        return value;
+        return getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_TARGET_CATCH_ID.key);
     }
 
     public String getSpeciesListSeineSchoolEstimateId() {
-        String value = getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_SCHOOL_ESTIMATE_ID.key);
-        return value;
+        return getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_SCHOOL_ESTIMATE_ID.key);
     }
 
     public String getSpeciesListSeineObjectObservedSpeciesId() {
-        String value = getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_OBJECT_OBSERVED_SPECIES_ID.key);
-        return value;
+        return getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_OBJECT_OBSERVED_SPECIES_ID.key);
     }
 
     public String getSpeciesListSeineObjectSchoolEstimateId() {
-        String value = getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_OBJECT_SCHOOL_ESTIMATE_ID.key);
-        return value;
+        return getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_OBJECT_SCHOOL_ESTIMATE_ID.key);
     }
 
     public String getSpeciesListLonglineCatchId() {
-        String value = getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_LONGLINE_CATCH_ID.key);
-        return value;
+        return getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_LONGLINE_CATCH_ID.key);
     }
 
     public String getSpeciesListLonglineEncounterId() {
-        String value = getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_LONGLINE_ENCOUNTER_ID.key);
-        return value;
+        return getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_LONGLINE_ENCOUNTER_ID.key);
     }
 
     public String getSpeciesListLonglineDepredatorId() {
-        String value = getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_LONGLINE_DEPREDATOR_ID.key);
-        return value;
+        return getOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_LONGLINE_DEPREDATOR_ID.key);
     }
 
     public void setSpeciesListSeineNonTargetCatchId(String speciesListSeineNonTargetCatchId) {
@@ -917,8 +860,7 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
     }
 
     public Color getMapBackgroundColor() {
-        Color result = getOptionAsColor(ObserveSwingApplicationConfigOption.MAP_BACKGROUND_COLOR.key);
-        return result;
+        return getOptionAsColor(ObserveSwingApplicationConfigOption.MAP_BACKGROUND_COLOR.key);
     }
 
     public List<File> getMapLayerFiles() {
@@ -934,8 +876,7 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
     }
 
     public File getMapStyleFile() {
-        File result = getOptionAsFile(ObserveSwingApplicationConfigOption.MAP_STYLE_FILE.key);
-        return result;
+        return getOptionAsFile(ObserveSwingApplicationConfigOption.MAP_STYLE_FILE.key);
     }
 
     public String[] getTreeOpenNodeIds() {
@@ -1026,7 +967,7 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
 
         File dbDirectory = new File(getLocalDBDirectory(), DB_NAME);
 
-        ObserveDataSourceConfigurationTopiaH2 result = configurationMainFactory.createObserveDataSourceConfigurationTopiaH2(
+        return configurationMainFactory.createObserveDataSourceConfigurationTopiaH2(
                 label,
                 dbDirectory,
                 DB_NAME,
@@ -1036,14 +977,13 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
                 isShowMigrationSql(),
                 getModelVersion()
         );
-        return result;
     }
 
     public ObserveDataSourceConfigurationTopiaPG getDataSourceConfigurationPG(String label) {
         ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get();
         ObserveDataSourceConfigurationMainFactory configurationMainFactory = applicationContext.getObserveDataSourceConfigurationMainFactory();
 
-        ObserveDataSourceConfigurationTopiaPG result = configurationMainFactory.createObserveDataSourceConfigurationTopiaPG(
+        return configurationMainFactory.createObserveDataSourceConfigurationTopiaPG(
                 label,
                 getObstunaUrl(),
                 getObstunaLogin(),
@@ -1053,14 +993,13 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
                 isShowMigrationSql(),
                 getModelVersion()
         );
-        return result;
     }
 
     public ObserveDataSourceConfigurationRest getDataSourceConfigurationRest(String label) {
         ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get();
         ObserveDataSourceConfigurationMainFactory configurationMainFactory = applicationContext.getObserveDataSourceConfigurationMainFactory();
 
-        ObserveDataSourceConfigurationRest result = configurationMainFactory.createObserveDataSourceConfigurationRest(
+        return configurationMainFactory.createObserveDataSourceConfigurationRest(
                 label,
                 getServerUrl(),
                 getServerLogin(),
@@ -1068,7 +1007,6 @@ public class ObserveSwingApplicationConfig  extends ApplicationConfig {
                 getServerDataBaseName(),
                 getModelVersion()
         );
-        return result;
     }
 
     public void removeJaxxPropertyChangeListener() {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java
index c376453..91fe464 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java
@@ -31,7 +31,7 @@ import fr.ird.observe.application.swing.db.event.ObserveSwingDataSourceEvent;
 import fr.ird.observe.application.swing.db.event.ObserveSwingDataSourceListener;
 import fr.ird.observe.services.ObserveService;
 import fr.ird.observe.services.ObserveServiceInitializer;
-import fr.ird.observe.services.ObserveServiceMainFactory;
+import fr.ird.observe.services.runner.ObserveServiceMainFactory;
 import fr.ird.observe.services.ObserveServicesProvider;
 import fr.ird.observe.services.ObserveSpeciesListConfiguration;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration;
@@ -159,8 +159,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements
 //    }
 
     public boolean canWriteData() {
-        boolean result = connection != null && connection.canWriteData();
-        return result;
+        return connection != null && connection.canWriteData();
     }
 
     public Version getVersion() {
@@ -172,18 +171,15 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements
     }
 
     public boolean canReadReferential() {
-        boolean result = connection != null && connection.canReadReferential();
-        return result;
+        return connection != null && connection.canReadReferential();
     }
 
     public boolean canReadData() {
-        boolean result = connection != null && connection.canReadData();
-        return result;
+        return connection != null && connection.canReadData();
     }
 
     public boolean canWriteReferential() {
-        boolean result = connection != null && connection.canWriteReferential();
-        return result;
+        return connection != null && connection.canWriteReferential();
     }
 
     public ObserveDataSourceInformation getInformation() {
@@ -283,9 +279,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements
 
         DataSourceService dataSourceService = newDataSourceService();
 
-        Set<ObserveDbUserDto> users = dataSourceService.getUsers(getConfiguration());
-
-        return users;
+        return dataSourceService.getUsers(getConfiguration());
     }
 
 
@@ -382,9 +376,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements
 
         DataSourceService dataSourceService = newDataSourceService();
 
-        ObserveDataSourceInformation dataSourceInformation = dataSourceService.checkCanConnect(configuration);
-
-        return dataSourceInformation;
+        return dataSourceService.checkCanConnect(configuration);
 
     }
 
@@ -475,14 +467,12 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements
         speciesListConfiguration.setSpeciesListSeineSchoolEstimateId(config.getSpeciesListSeineSchoolEstimateId());
         speciesListConfiguration.setSpeciesListSeineTargetCatchId(config.getSpeciesListSeineTargetCatchId());
 
-        ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create(
+        return ObserveServiceInitializer.create(
                 locale,
                 referentialLocale,
                 tmpDirectory,
                 speciesListConfiguration,
                 configurationAndConnection);
-
-        return observeServiceInitializer;
     }
 
     protected void fireOpening() {
@@ -531,8 +521,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements
 
         ObserveServiceMainFactory serviceFactory = ObserveServiceMainFactory.get();
 
-        S service = serviceFactory.newService(observeServiceInitializer, serviceType);
-        return service;
+        return serviceFactory.newService(observeServiceInitializer, serviceType);
     }
 
     @Override
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java
index 33ec3fb..4f67c72 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java
@@ -434,8 +434,7 @@ public class ObserveMainUIHandler {
         if (context instanceof ObserveMainUI) {
             return (ObserveMainUI) context;
         }
-        ObserveMainUI ui = ObserveSwingApplicationContext.get().getMainUI();
-        return ui;
+        return ObserveSwingApplicationContext.get().getMainUI();
     }
 
     protected void $afterCompleteSetup(final ObserveMainUI ui) {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUICallback.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUICallback.java
index 43b192e6..d2a9492 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUICallback.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveUICallback.java
@@ -41,7 +41,6 @@ import static org.nuiton.i18n.I18n.n;
  * @since 1.4
  */
 public enum ObserveUICallback implements Runnable {
-
     application(n("observe.action.reload.application"),
                 "application-reload") {
         @Override
@@ -105,8 +104,7 @@ public enum ObserveUICallback implements Runnable {
     }
 
     public ImageIcon getIcon() {
-        ImageIcon icon = UIHelper.createActionIcon(iconPath);
-        return icon;
+        return UIHelper.createActionIcon(iconPath);
     }
 
     public String getLabel() {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java
index 7cdec28..ae14cb6 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java
@@ -188,7 +188,7 @@ public class UIHelper extends SwingUtil {
                 parent = ObserveSwingApplicationContext.get().getMainUI();
             }
         }
-        int response = JOptionPane.showOptionDialog(
+        return JOptionPane.showOptionDialog(
                 parent,
                 message,
                 title,
@@ -198,7 +198,6 @@ public class UIHelper extends SwingUtil {
                 options,
                 options[defaultOption]
         );
-        return response;
     }
 
     /**
@@ -235,8 +234,7 @@ public class UIHelper extends SwingUtil {
             log.debug(title + " : " + file);
         }
         FileChooserUtil.setCurrentDirectory(oldBasedir);
-        File result = file == null ? incoming : file;
-        return result;
+        return file == null ? incoming : file;
     }
 
     /**
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java
index 05bbb93..bdb4d65 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java
@@ -379,8 +379,7 @@ public class ShowConfigAction extends AbstractAction {
             String name = callback.name();
             String description = callback.getLabel();
             Icon icon = callback.getIcon();
-            Runnable action = callback;
-            registerCallBack(name, description, icon, action);
+            registerCallBack(name, description, icon, callback);
 
             return modelBuilder;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java
index 94c741e..82b4b80 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/AbstractUIAction.java
@@ -107,7 +107,6 @@ public abstract class AbstractUIAction extends AbstractAction {
 
         TreePath activityPath = path.pathByAddingChild(node1);
 
-        boolean wasCollapsed = tree.isCollapsed(activityPath);
-        return wasCollapsed;
+        return tree.isCollapsed(activityPath);
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java
index 240672b..23335c1 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java
@@ -60,8 +60,7 @@ public class AdminUIHandler {
         if (index > -1) {
             c = (AdminTabUI) ui.getTabs().getComponentAt(index);
         }
-        AdminStep result = c == null ? null : c.getStep();
-        return result;
+        return c == null ? null : c.getStep();
     }
 
     public AdminTabUI getStepUI(AdminUI ui, AdminStep step) {
@@ -80,8 +79,7 @@ public class AdminUIHandler {
 
     public AdminTabUI getSelectedStepUI(AdminUI ui) {
         AdminStep step = getSelectedStep(ui);
-        AdminTabUI tabUI = getStepUI(ui, step);
-        return tabUI;
+        return getStepUI(ui, step);
     }
 
     public void blockOperations(AdminUI ui) {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java
index 7f39a11..9abe4cf 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java
@@ -1419,8 +1419,7 @@ public class AdminUIModel extends WizardExtModel<AdminStep> {
 
     protected ObserveSwingDataSource createDataSource(StorageUIModel model) {
 
-        ObserveSwingDataSource dataSource = storageHandler.newDataSourceFromModel(model);
-        return dataSource;
+        return storageHandler.newDataSourceFromModel(model);
     }
 
     protected void doOpenSource(ObserveSwingDataSource source) {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java
index 075a23e..748839d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java
@@ -107,8 +107,7 @@ public class ReportModel extends AdminActionModel {
         ReportBuilder builder = new ReportBuilder();
         try {
 
-            List<Report> result = builder.load(resource);
-            return result;
+            return builder.load(resource);
         } finally {
             builder.clear();
         }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java
index 5f489b8..9b4a9d7 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java
@@ -180,8 +180,7 @@ public class ResultTableModel extends AbstractTableModel {
 
     @Override
     public Object getValueAt(int rowIndex, int columnIndex) {
-        Serializable data = this.data == null ? null : this.data.getValue(columnIndex, rowIndex);
-        return data;
+        return this.data == null ? null : this.data.getValue(columnIndex, rowIndex);
     }
 
     @Override
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java
index b8a7322..5d75acd 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java
@@ -65,14 +65,12 @@ public abstract class DataSynchronizeTaskSupport {
 
     protected String decorateProgram() {
         DecoratorService decoratorService = ObserveSwingApplicationContext.get().getDecoratorService();
-        String programStr = decoratorService.getReferentialReferenceDecorator(ProgramDto.class).toString(getProgram());
-        return programStr;
+        return decoratorService.getReferentialReferenceDecorator(ProgramDto.class).toString(getProgram());
     }
 
     protected String decorateTrip() {
         DecoratorService decoratorService = ObserveSwingApplicationContext.get().getDecoratorService();
-        String tripStr = decoratorService.getTripReferenceDecorator(getTrip()).toString(getTrip());
-        return tripStr;
+        return decoratorService.getTripReferenceDecorator(getTrip()).toString(getTrip());
     }
 
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java
index b8e1481..08c56ea 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java
@@ -117,8 +117,7 @@ public abstract class ContentUIHandler<E extends IdDto> {
         try {
 
             Class<ContentUIHandler<E>> handlerClass = (Class<ContentUIHandler<E>>) Class.forName(modelName);
-            ContentUIHandler<E> handler = ConstructorUtils.invokeConstructor(handlerClass, ui);
-            return handler;
+            return ConstructorUtils.invokeConstructor(handlerClass, ui);
 
         } catch (Exception e) {
             throw new ObserveSwingTechnicalException("Could not create handler for ui: " + ui, e);
@@ -268,19 +267,16 @@ public abstract class ContentUIHandler<E extends IdDto> {
     }
 
     public Class<E> getBeanType() {
-        Class<E> mainEntityClass = getModel().getBeanType();
-        return mainEntityClass;
+        return getModel().getBeanType();
     }
 
     public E getBean() {
         ContentUIModel<E> model = getModel();
-        E bean = model.getBean();
-        return bean;
+        return model.getBean();
     }
 
     public DecoratorService getDecoratorService() {
-        DecoratorService result = ObserveSwingApplicationContext.get().getDecoratorService();
-        return result;
+        return ObserveSwingApplicationContext.get().getDecoratorService();
     }
 
     public void initUI() {
@@ -495,8 +491,7 @@ public abstract class ContentUIHandler<E extends IdDto> {
             DecoratorUtil.sort((JXPathDecorator<E>) decorator, data, 0);
             return data;
         } else {
-            List<E> result = new ArrayList<>();
-            return result;
+            return new ArrayList<>();
         }
     }
 
@@ -610,8 +605,7 @@ public abstract class ContentUIHandler<E extends IdDto> {
     }
 
     protected DataContext getDataContext() {
-        DataContext dataContext = ui.getDataContext();
-        return dataContext;
+        return ui.getDataContext();
     }
 
     protected ObserveSwingDataSource getDataSource() {
@@ -619,8 +613,7 @@ public abstract class ContentUIHandler<E extends IdDto> {
     }
 
     protected ObserveOpenDataManager getOpenDataManager() {
-        ObserveOpenDataManager openDataManager = ObserveSwingApplicationContext.get().getOpenDataManager();
-        return openDataManager;
+        return ObserveSwingApplicationContext.get().getOpenDataManager();
     }
 
     protected boolean doSave(E bean) throws Exception {
@@ -686,8 +679,7 @@ public abstract class ContentUIHandler<E extends IdDto> {
     }
 
     protected String getEntityLabel(Class<?> klass) {
-        String result = DecoratorService.getEntityLabel(klass);
-        return result;
+        return DecoratorService.getEntityLabel(klass);
     }
 
     protected void prepareValidationContext() {
@@ -717,9 +709,7 @@ public abstract class ContentUIHandler<E extends IdDto> {
     }
 
     protected final String getValidatorContextName(ContentMode mode) {
-        String contextName =
-                mode == ContentMode.CREATE ? "ui-create" : "ui-update";
-        return contextName;
+        return mode == ContentMode.CREATE ? "ui-create" : "ui-update";
     }
 
     protected void updateActions() {
@@ -1092,8 +1082,7 @@ public abstract class ContentUIHandler<E extends IdDto> {
         Iterable<ReferentialReference<D>> filtredReferentialReferences = filterReferentialReferences(dtoType, propertyName, incomingReferences);
 
         ImmutableSet<ReferentialReference<D>> references1 = ImmutableSet.copyOf(filtredReferentialReferences);
-        ReferentialReferenceSet<D> filtredReferentialReferenceSet = ReferentialReferenceSet.of(dtoType, references1, incomingReferentialReferenceSet.getLastUpdate());
-        return filtredReferentialReferenceSet;
+        return ReferentialReferenceSet.of(dtoType, references1, incomingReferentialReferenceSet.getLastUpdate());
 
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java
index 53819af..2113a01 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java
@@ -169,8 +169,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E
 
         ObjectToStringConverter converter = BeanUIUtil.newDecoratedObjectToStringConverter(decorator);
         BeanUIUtil.decorate(comboBox, converter);
-        ComboBoxCellEditor editor = new ComboBoxCellEditor(comboBox);
-        return editor;
+        return new ComboBoxCellEditor(comboBox);
 
     }
 
@@ -186,8 +185,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E
 
     protected E getBean() {
 
-        E bean = ui.getModel().getBean();
-        return bean;
+        return ui.getModel().getBean();
 
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java
index d0f108c..db108f0 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java
@@ -258,9 +258,8 @@ public class ContentUIManager {
         if (log.isDebugEnabled()) {
             log.debug("mappingKey = [" + mappingKey + "] for node " + node);
         }
-        Class<? extends ObserveContentUI<?>> result = mapping.get(mappingKey);
 
-        return result;
+        return mapping.get(mappingKey);
     }
 
     @SuppressWarnings({"unchecked"})
@@ -321,9 +320,8 @@ public class ContentUIManager {
     }
 
     public ObserveContentUI<?> getCurrentContent() {
-        ObserveContentUI<?> component = (ObserveContentUI<?>)
+        return (ObserveContentUI<?>)
                 getLayout().getVisibleComponent(getLayoutContent());
-        return component;
     }
 
     public void openContent(ObserveContentUI<?> content) {
@@ -406,13 +404,11 @@ public class ContentUIManager {
     }
 
     protected JPanel getLayoutContent() {
-        JPanel content = getMainUI().getContent();
-        return content;
+        return getMainUI().getContent();
     }
 
     protected CardLayout2 getLayout() {
-        CardLayout2 layout = getMainUI().getContentLayout();
-        return layout;
+        return getMainUI().getContentLayout();
     }
 
     @Override
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java
index e251737..d3af38f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java
@@ -114,8 +114,7 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab
         try {
 
             Class<ContentUIModel<E>> modelClass = (Class<ContentUIModel<E>>) Class.forName(modelName);
-            ContentUIModel<E> model = modelClass.newInstance();
-            return model;
+            return modelClass.newInstance();
 
         } catch (Exception e) {
             throw new ObserveSwingTechnicalException("Could not create model for ui: " + ui, e);
@@ -261,24 +260,21 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab
     public <D extends ReferentialDto> Set<ReferentialReference<D>> getReferentialReferences(String name) {
 
         ReferentialReferenceSet<D> referentialReferenceSet = getReferentialReferenceSet(name);
-        Set<ReferentialReference<D>> references = referentialReferenceSet.getReferences();
-        return references;
+        return referentialReferenceSet.getReferences();
 
     }
 
     public <D extends DataDto> Set<DataReference<D>> getDataReferences(String name) {
 
         DataReferenceSet<D> referentialReferenceSet = getDataReferenceSet(name);
-        Set<DataReference<D>> references = referentialReferenceSet.getReferences();
-        return references;
+        return referentialReferenceSet.getReferences();
 
     }
 
     public <D extends ReferentialDto> Optional<ReferentialReference<D>> tryGetReferentialReferenceById(String name, String id) {
 
         ReferentialReferenceSet<D> referenceSet = getReferentialReferenceSet(name);
-        Optional<ReferentialReference<D>> optionalReference = referenceSet.tryGetReferenceById(id);
-        return optionalReference;
+        return referenceSet.tryGetReferenceById(id);
 
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java
index 914f0fe..eca9470 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java
@@ -1181,22 +1181,19 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong
 
                 case 0:
 
-                    boolean generateTabValid = getModel().isGenerateTabValid();
-                    result = generateTabValid;
+                    result = getModel().isGenerateTabValid();
 
                     break;
 
                 case 1:
 
-                    boolean compositionTabValid = getModel().isCompositionTabValid();
-                    result = compositionTabValid;
+                    result = getModel().isCompositionTabValid();
 
                     break;
 
                 case 2:
 
-                    boolean branchlineDetailTabValid = getUi().getBranchlineDetailUI().getHandler().tryToQuit();
-                    result = branchlineDetailTabValid;
+                    result = getUi().getBranchlineDetailUI().getHandler().tryToQuit();
 
                     break;
             }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java
index 932b644..6798e2e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java
@@ -153,8 +153,7 @@ public class LonglineDetailCompositionUIValidationHelper {
     public void removeOldMessages() {
         errorTableModel.removeMessages(input -> {
             SimpleBeanValidator<?> validator = input.getValidator();
-            boolean remove = validators.contains(validator);
-            return remove;
+            return validators.contains(validator);
         });
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java
index d45d967..c774dd5 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java
@@ -275,8 +275,7 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity
 
     @Override
     protected int getOpenablePosition(String parentId, ActivityLonglineDto bean) {
-        int position = getActivityLonglineService().getActivityLonglinePositionInTripLongline(parentId, bean.getId());
-        return position;
+        return getActivityLonglineService().getActivityLonglinePositionInTripLongline(parentId, bean.getId());
     }
 
     @Override
@@ -316,8 +315,7 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity
     @Override
     protected boolean obtainCanReopen(boolean create) {
 
-        boolean canReopen = !create && getOpenDataManager().canOpenActivityLongline(getSelectedParentId());
-        return canReopen;
+        return !create && getOpenDataManager().canOpenActivityLongline(getSelectedParentId());
 
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java
index ffd6909..82dc8fc 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java
@@ -291,9 +291,7 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline
     @Override
     protected int getOpenablePosition(String parentId, TripLonglineDto bean) {
 
-        int position = getTripLonglineService().getTripLonglinePositionInProgram(parentId, bean.getId());
-
-        return position;
+        return getTripLonglineService().getTripLonglinePositionInProgram(parentId, bean.getId());
     }
 
     @Override
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java
index baae055..d841c5a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java
@@ -303,8 +303,7 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei
 
     @Override
     protected int getOpenablePosition(String parentId, ActivitySeineDto bean) {
-        int position = getActivitySeineService().getActivitySeinePositionInRoute(parentId, bean.getId());
-        return position;
+        return getActivitySeineService().getActivitySeinePositionInRoute(parentId, bean.getId());
     }
 
     @Override
@@ -330,9 +329,7 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei
     @Override
     protected boolean obtainCanReopen(boolean create) {
 
-        boolean canReopen = !create && getOpenDataManager().canOpenActivitySeine(getSelectedParentId());
-
-        return canReopen;
+        return !create && getOpenDataManager().canOpenActivitySeine(getSelectedParentId());
     }
 
     public String getActivity6Label() {
@@ -341,10 +338,9 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei
 
         for (ReferentialReference<VesselActivitySeineDto> vesselActivity : activities) {
             if (ActivitySeineDto.ACTIVITY_FIN_DE_PECHE.equals(vesselActivity.getPropertyValue(VesselActivitySeineDto.PROPERTY_CODE))) {
-                String label = getDecoratorService().getReferentialReferenceDecorator(VesselActivitySeineDto.class).toString(vesselActivity);
-//                String label = getDecoratorService().decorate(VesselActivitySeineDto.class.getSimpleName(),
+                //                String label = getDecoratorService().decorate(VesselActivitySeineDto.class.getSimpleName(),
 //                                                              vesselActivity);
-                return label;
+                return getDecoratorService().getReferentialReferenceDecorator(VesselActivitySeineDto.class).toString(vesselActivity);
             }
         }
         throw new IllegalStateException(t("observe.error.no.activity.6"));
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java
index 04d35ef..ae1dc06 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java
@@ -226,8 +226,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> {
 
     @Override
     protected int getOpenablePosition(String parentId, RouteDto bean) {
-        int position = getRouteService().getRoutePositionInTripSeine(parentId, bean.getId());
-        return position;
+        return getRouteService().getRoutePositionInTripSeine(parentId, bean.getId());
     }
 
     @Override
@@ -422,8 +421,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> {
         // on peut reouvrir une route si :
         // - pas de route ouverte
         // - la maree courante est ouverte
-        boolean canReopen = !create && getOpenDataManager().canOpenRoute(getSelectedParentId());
-        return canReopen;
+        return !create && getOpenDataManager().canOpenRoute(getSelectedParentId());
     }
 
     protected void repaintTripNode() {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java
index 55b8b22..988678d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java
@@ -289,9 +289,7 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> {
 
     protected int getOpenablePosition(String parentId, TripSeineDto bean) {
 
-        int position = getTripSeineService().getTripSeinePositionInProgram(parentId, bean.getId());
-
-        return position;
+        return getTripSeineService().getTripSeinePositionInProgram(parentId, bean.getId());
     }
 
     @Override
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java
index 764a4a4..e928760 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java
@@ -450,8 +450,7 @@ public abstract class ContentTableModel<P extends IdDto, B extends IdDto> extend
 
     @SuppressWarnings("unchecked")
     protected ContentTableUIHandler<P, B> getHandler() {
-        ContentTableUIHandler<P, B> handler = context.getHandler();
-        return handler;
+        return context.getHandler();
     }
 
     protected abstract Collection<B> getChilds(P bean);
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java
index 6a4f053..53c43c9 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java
@@ -446,9 +446,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex
 
         String speciesId = (String) weightCategory.getPropertyValue(WeightCategoryDto.PROPERTY_SPECIES);
 
-        Optional<ReferentialReference<SpeciesDto>> optionalSpecies = getModel().tryGetReferentialReferenceById(TargetCatchDto.PROPERTY_SPECIES, speciesId);
-
-        return optionalSpecies;
+        return getModel().tryGetReferentialReferenceById(TargetCatchDto.PROPERTY_SPECIES, speciesId);
     }
 
     protected <EE extends Serializable, MM extends EditableTableModelSupport<EE>> void initInlineTable(JScrollPane pane,
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java
index f84d381..d97f0a8 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIModel.java
@@ -103,8 +103,7 @@ public abstract class ContentTableUIModel<E extends IdDto, D extends IdDto> exte
         try {
 
             Class<ContentTableUIModel<E, D>> modelClass = (Class<ContentTableUIModel<E, D>>) Class.forName(modelName);
-            ContentTableUIModel<E, D> model = ConstructorUtils.invokeConstructor(modelClass, ui);
-            return model;
+            return ConstructorUtils.invokeConstructor(modelClass, ui);
 
         } catch (Exception e) {
             throw new ObserveSwingTechnicalException("Could not create model for ui: " + ui, e);
@@ -159,8 +158,7 @@ public abstract class ContentTableUIModel<E extends IdDto, D extends IdDto> exte
     public final D newTableEditBean() {
         try {
 
-            D result = getChildType().getConstructor().newInstance();
-            return result;
+            return getChildType().getConstructor().newInstance();
 
         } catch (Exception ex) {
             throw new RuntimeException(ex);
@@ -212,9 +210,7 @@ public abstract class ContentTableUIModel<E extends IdDto, D extends IdDto> exte
 
         String[] properties = getChildProperties();
 
-        BinderModelBuilder<D, D> builder = binderService.newBinderBuilder(childType, properties);
-
-        return builder;
+        return binderService.newBinderBuilder(childType, properties);
 
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java
index d1b841d..9aa66e7 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java
@@ -202,7 +202,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip
 
         GearDto gearDto = gearDtoForm.getObject();
 
-        List<GearUseFeaturesMeasurementLonglineDto> measurements = Lists.newArrayList(
+        return Lists.newArrayList(
                 Iterables.transform(gearDto.getGearCaracteristic(),
                                     input -> {
                                         GearUseFeaturesMeasurementLonglineDto measurementLonglineDto = new GearUseFeaturesMeasurementLonglineDto();
@@ -213,8 +213,6 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip
                                         }
                                         return measurementLonglineDto;
                                     }));
-
-        return measurements;
     }
 
     @Override
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java
index e5f9e90..7310ebc 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java
@@ -269,14 +269,12 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> {
 
         String sectionId = (String) basket.getPropertyValue(BasketWithSectionIdDto.PROPERTY_SECTION_ID);
 
-        DataReference<SectionDto> section = sectionUniverse.stream()
-                // TODO sbavencoff 11/03/2016 utiliser le prédicat AbstractReference.newIdPredicate()
-                // A la migartion vers les prédicats JAVA8
-                .filter(s -> sectionId.equals(s.getId()))
-                .findFirst()
-                .get();
-
-        return section;
+        return sectionUniverse.stream()
+                              // TODO sbavencoff 11/03/2016 utiliser le prédicat AbstractReference.newIdPredicate()
+                              // A la migartion vers les prédicats JAVA8
+                              .filter(s -> sectionId.equals(s.getId()))
+                              .findFirst()
+                              .get();
 
     }
 
@@ -284,37 +282,31 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> {
 
         String basketId = (String) branchline.getPropertyValue(BranchlineWithBasketIdDto.PROPERTY_BASKET_ID);
 
-        DataReference<BasketDto> basket = basketUniverse.stream()
-                // TODO sbavencoff 11/03/2016 utiliser le prédicat DataReference.newLabelValuePredicate
-                // A la migartion vers les prédicats JAVA8
-                .filter(b -> basketId.equals(b.getId()))
-                .findFirst()
-                .get();
-
-        return basket;
+        return basketUniverse.stream()
+                             // TODO sbavencoff 11/03/2016 utiliser le prédicat DataReference.newLabelValuePredicate
+                             // A la migartion vers les prédicats JAVA8
+                             .filter(b -> basketId.equals(b.getId()))
+                             .findFirst()
+                             .get();
 
     }
 
     protected List<DataReference<BasketDto>> getBaskets(DataReference<SectionDto> section) {
 
-        List<DataReference<BasketDto>> baskets = basketUniverse.stream()
-                // TODO sbavencoff 11/03/2016 utiliser le prédicat DataReference.newLabelValuePredicate
-                // A la migartion vers les prédicat JAVA8
-                .filter(b -> section.getId().equals(b.getPropertyValue(BasketWithSectionIdDto.PROPERTY_SECTION_ID)))
-                .collect(Collectors.toList());
-
-        return baskets;
+        return basketUniverse.stream()
+                             // TODO sbavencoff 11/03/2016 utiliser le prédicat DataReference.newLabelValuePredicate
+                             // A la migartion vers les prédicat JAVA8
+                             .filter(b -> section.getId().equals(b.getPropertyValue(BasketWithSectionIdDto.PROPERTY_SECTION_ID)))
+                             .collect(Collectors.toList());
     }
 
     protected List<DataReference<BranchlineDto>> getBranchlines(DataReference<BasketDto> basket) {
 
-        List<DataReference<BranchlineDto>> branchlines = branchlineUniverse.stream()
-                // TODO sbavencoff 11/03/2016 utilise le prédicat DataReference.newLabelValuePredicate
-                // A la migartion vers les prédicat JAVA8
-                .filter(b -> basket.getId().equals(b.getPropertyValue(BranchlineWithBasketIdDto.PROPERTY_BASKET_ID)))
-                .collect(Collectors.toList());
-
-        return branchlines;
+        return branchlineUniverse.stream()
+                                 // TODO sbavencoff 11/03/2016 utilise le prédicat DataReference.newLabelValuePredicate
+                                 // A la migartion vers les prédicat JAVA8
+                                 .filter(b -> basket.getId().equals(b.getPropertyValue(BranchlineWithBasketIdDto.PROPERTY_BASKET_ID)))
+                                 .collect(Collectors.toList());
     }
 
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java
index adee159..7b4f2f4 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java
@@ -165,8 +165,7 @@ public class GearUseFeatureMeasurementCellEditor implements TableCellEditor {
 
         }
 
-        Component result = editor.getTableCellEditorComponent(table, value, isSelected, row, column);
-        return result;
+        return editor.getTableCellEditorComponent(table, value, isSelected, row, column);
 
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java
index b590272..18cc610 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java
@@ -103,8 +103,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer
 
         }
 
-        Component result = tableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-        return result;
+        return tableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
 
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java
index 27fd73d..861c5c6 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java
@@ -200,7 +200,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei
 
         GearDto gearDto = gearDtoForm.getObject();
 
-        List<GearUseFeaturesMeasurementSeineDto> measurements = Lists.newArrayList(
+        return Lists.newArrayList(
                 Iterables.transform(gearDto.getGearCaracteristic(),
                                     input -> {
                                         GearUseFeaturesMeasurementSeineDto measurementSeineDto = new GearUseFeaturesMeasurementSeineDto();
@@ -212,8 +212,6 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei
                                         return measurementSeineDto;
                                     }));
 
-        return measurements;
-
     }
 
     @Override
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java
index 2cb4705..420044d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java
@@ -112,8 +112,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam
 
     @Override
     protected String getEditBeanIdToLoad() {
-        String id = getDataContext().getSelectedSetId();
-        return id;
+        return getDataContext().getSelectedSetId();
     }
 
     @SuppressWarnings("unchecked")
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java
index b715acf..e9a0ef2 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java
@@ -464,8 +464,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT
     protected List<ReferentialReference<WeightCategoryDto>> getAllWeightCategories() {
 
         Set<ReferentialReference<WeightCategoryDto>> weightCategorySet = getModel().getReferentialReferences(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY);
-        List<ReferentialReference<WeightCategoryDto>> weightCategoryList = Lists.newArrayList(weightCategorySet);
-        return weightCategoryList;
+        return Lists.newArrayList(weightCategorySet);
 
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java
index 151e39d..334c60d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java
@@ -120,8 +120,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto
 
     @Override
     protected String getEditBeanIdToLoad() {
-        String id = getDataContext().getSelectedSetId();
-        return id;
+        return getDataContext().getSelectedSetId();
     }
 
     protected void onSelectedRowChanged(int editingRow, TargetLengthDto bean, boolean create) {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java
index 20c1003..75d2ae0 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java
@@ -677,8 +677,7 @@ public class StorageUIHandler {
         StorageUIModel model = ui.getModel();
         ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get();
         ObserveTextGenerator textGenerator = applicationContext.getTextGenerator();
-        String report = textGenerator.getDataSourceConnectionReport(model);
-        return report;
+        return textGenerator.getDataSourceConnectionReport(model);
     }
 
     public void destroy(StorageUI ui) {
@@ -700,9 +699,7 @@ public class StorageUIHandler {
     }
 
     protected DecoratorService getDecoratorService() {
-        DecoratorService decoratorService =
-                ObserveSwingApplicationContext.get().getDecoratorService();
-        return decoratorService;
+        return ObserveSwingApplicationContext.get().getDecoratorService();
     }
 
     public void initSelectData(StorageUI ui, ObserveSwingDataSource source, boolean selectAll) {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java
index f373e33..1ed30e3 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java
@@ -109,9 +109,7 @@ public class StorageUILauncher extends WizardUILancher<StorageStep, StorageUIMod
     }
 
     protected StorageUIHandler getStorageUIHandler() {
-        StorageUIHandler handler =
-                ui.getContextValue(StorageUIHandler.class);
-        return handler;
+        return ui.getContextValue(StorageUIHandler.class);
     }
 
     @Override
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java
index 35ceb33..940358f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java
@@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
 import fr.ird.observe.application.swing.db.constants.ConnexionStatus;
 import fr.ird.observe.application.swing.db.constants.CreationMode;
 import fr.ird.observe.application.swing.db.constants.DbMode;
-import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory;
+import fr.ird.observe.services.runner.ObserveDataSourceConfigurationMainFactory;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2;
@@ -1583,7 +1583,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
 
         ObserveSwingApplicationContext context = ObserveSwingApplicationContext.get();
         ObserveDataSourceConfigurationMainFactory configurationFactory = context.getObserveDataSourceConfigurationMainFactory();
-        ObserveDataSourceConfigurationTopiaH2 result = configurationFactory.createObserveDataSourceConfigurationTopiaH2(
+        return configurationFactory.createObserveDataSourceConfigurationTopiaH2(
                 label,
                 h2Config.getDirectory(),
                 h2Config.getDbName(),
@@ -1593,14 +1593,13 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                 h2Config.isShowMigrationSql(),
                 h2Config.getModelVersion()
         );
-        return result;
     }
 
     public ObserveDataSourceConfigurationTopiaPG toPGStorageConfig(String label) {
 
         ObserveSwingApplicationContext context = ObserveSwingApplicationContext.get();
         ObserveDataSourceConfigurationMainFactory configurationFactory = context.getObserveDataSourceConfigurationMainFactory();
-        ObserveDataSourceConfigurationTopiaPG result = configurationFactory.createObserveDataSourceConfigurationTopiaPG(
+        return configurationFactory.createObserveDataSourceConfigurationTopiaPG(
                 label,
                 pgConfig.getJdbcUrl(),
                 pgConfig.getUsername(),
@@ -1610,14 +1609,13 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                 pgConfig.isShowMigrationSql(),
                 pgConfig.getModelVersion()
         );
-        return result;
     }
 
     public ObserveDataSourceConfigurationRest toRestStorageConfig(String label) {
 
         ObserveSwingApplicationContext context = ObserveSwingApplicationContext.get();
         ObserveDataSourceConfigurationMainFactory configurationFactory = context.getObserveDataSourceConfigurationMainFactory();
-        ObserveDataSourceConfigurationRest result = configurationFactory.createObserveDataSourceConfigurationRest(
+        return configurationFactory.createObserveDataSourceConfigurationRest(
                 label,
                 restConfig.getServerUrl(),
                 restConfig.getLogin(),
@@ -1625,7 +1623,6 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                 restConfig.getOptionalDatabaseName().orElse(null),
                 restConfig.getModelVersion()
         );
-        return result;
     }
 
     protected void copyTo(StorageUIModel dst) {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java
index 6f2c6ab..ba58eeb 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java
@@ -289,11 +289,9 @@ public class DataSelectionModel implements Serializable {
             return Collections.emptyList();
         }
 
-        List<DataReference> result = datas.get(program).stream()
-                                          .filter(trip -> selectedData.contains(trip))
-                                          .collect(Collectors.toList());
-
-        return result;
+        return datas.get(program).stream()
+                    .filter(trip -> selectedData.contains(trip))
+                    .collect(Collectors.toList());
     }
 
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java
index b07177d..a049a4b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java
@@ -183,8 +183,7 @@ public class RolesTableModel extends AbstractTableModel {
     }
 
     protected ObserveDbUserDto getUser(int rowIndex) {
-        ObserveDbUserDto user = roles == null ? null : roles.get(rowIndex);
-        return user;
+        return roles == null ? null : roles.get(rowIndex);
     }
 
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SecurityModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SecurityModel.java
index ab48b1a..b3d045d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SecurityModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SecurityModel.java
@@ -143,8 +143,7 @@ public class SecurityModel implements Serializable {
 
     public int getAssigned() {
         int countNotAssigned = (int) users.stream().filter(ObserveDbUserDtos.newRolePredicate(null)).count();
-        int count = users.size() - countNotAssigned;
-        return count;
+        return users.size() - countNotAssigned;
     }
 
     public void addPropertyChangeListener(PropertyChangeListener listener) {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java
index cfcad63..1de0247 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java
@@ -299,20 +299,17 @@ public class StorageTabUIHandler {
     }
 
     public Icon updateConnexionStatutIcon(ConfigUI ui, ConnexionStatus status) {
-        Icon icon = (Icon) ui.getConnexionStatus().getClientProperty(status.name().toLowerCase() + "Icon");
-        return icon;
+        return (Icon) ui.getConnexionStatus().getClientProperty(status.name().toLowerCase() + "Icon");
     }
 
     public Color updateConnexionStatutColor(ConfigUI ui, ConnexionStatus status) {
-        Color color = (Color) ui.getConnexionStatus().getClientProperty(status.name().toLowerCase() + "Color");
-        return color;
+        return (Color) ui.getConnexionStatus().getClientProperty(status.name().toLowerCase() + "Color");
     }
 
     public String updateConnexionStatutText(ConfigUI ui, ConnexionStatus status) {
         ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get();
         ObserveTextGenerator textGenerator = applicationContext.getTextGenerator();
-        String text = textGenerator.getConnexionTestResultMessage(ui.getModel());
-        return text;
+        return textGenerator.getConnexionTestResultMessage(ui.getModel());
     }
 
     public void chooseDumpFile(ConfigUI ui) {
@@ -392,8 +389,7 @@ public class StorageTabUIHandler {
 
     protected String updateCanMigrateLabel(ChooseDbModeUI ui,
                                            boolean canMigrate) {
-        String text = t("observe.storage.action.canMigrate", ui.getModel().getModelVersion());
-        return text;
+        return t("observe.storage.action.canMigrate", ui.getModel().getModelVersion());
     }
 
     public void obtainRemoteConnexion(ConfigReferentielUI ui) {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java
index 75ac62d..d584c99 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/AbstractObserveTreeCellRenderer.java
@@ -21,10 +21,17 @@
  */
 package fr.ird.observe.application.swing.ui.tree;
 
-import com.google.common.base.Preconditions;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.db.DataContext;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
+import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.ui.content.impl.seine.FloatingObjectUI;
+import fr.ird.observe.application.swing.ui.content.impl.seine.SetSeineUI;
+import fr.ird.observe.application.swing.ui.content.open.impl.longline.ActivityLonglineUI;
+import fr.ird.observe.application.swing.ui.content.open.impl.longline.TripLonglineUI;
+import fr.ird.observe.application.swing.ui.content.open.impl.seine.ActivitySeineUI;
+import fr.ird.observe.application.swing.ui.content.open.impl.seine.RouteUI;
+import fr.ird.observe.application.swing.ui.content.open.impl.seine.TripSeineUI;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.OpenableDto;
 import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
@@ -34,14 +41,6 @@ import fr.ird.observe.services.dto.referential.ReferentialReference;
 import fr.ird.observe.services.dto.seine.ActivitySeineDto;
 import fr.ird.observe.services.dto.seine.RouteDto;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
-import fr.ird.observe.application.swing.ui.content.impl.seine.FloatingObjectUI;
-import fr.ird.observe.application.swing.ui.content.impl.seine.SetSeineUI;
-import fr.ird.observe.application.swing.ui.content.open.impl.longline.ActivityLonglineUI;
-import fr.ird.observe.application.swing.ui.content.open.impl.longline.TripLonglineUI;
-import fr.ird.observe.application.swing.ui.content.open.impl.seine.ActivitySeineUI;
-import fr.ird.observe.application.swing.ui.content.open.impl.seine.RouteUI;
-import fr.ird.observe.application.swing.ui.content.open.impl.seine.TripSeineUI;
 import jaxx.runtime.swing.nav.tree.AbstractNavTreeCellRenderer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -54,6 +53,7 @@ import java.awt.Color;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import static org.nuiton.i18n.I18n.t;
 
@@ -147,8 +147,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
      * @return l'icone du noeud (ou null si non trouve)
      */
     public Icon getNavigationIcon(ObserveNode node) {
-        Icon icon = getNavigationIcon(node, null);
-        return icon;
+        return getNavigationIcon(node, null);
 
     }
 
@@ -247,16 +246,14 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
     protected String computeNodeText(ObserveNode node) {
 
         if (node.isStringNode()) {
-            String text = t(node.getId());
-            return text;
+            return t(node.getId());
         }
 
         Class<?> beanType = node.getInternalClass();
 
         if (node.isReferentielNode()) {
 
-            String text = t(DecoratorService.getEntityLabel(ObserveTreeHelper.TREE_NODE_PREFIX, beanType));
-            return text;
+            return t(DecoratorService.getEntityLabel(ObserveTreeHelper.TREE_NODE_PREFIX, beanType));
         }
 
         // noeud de donnée
@@ -267,26 +264,22 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
 
             // noeud d'un objet en cours de création
 
-            String text = t(node.getContext());
-            return text;
+            return t(node.getContext());
         }
 
         // noeud de donnée connue en base
 
         if (getDataProvider() == null) {
             // data provider non utilisable
-            String text = "No data provider opened to render " + id;
-            return text;
+            return "No data provider opened to render " + id;
         }
 
         if (node instanceof SetLonglineNode) {
-            String text = t("observe.tree.setLongline");
-            return text;
+            return t("observe.tree.setLongline");
         }
 
         if (node instanceof SetSeineNode) {
-            String text = t("observe.tree.setSeine");
-            return text;
+            return t("observe.tree.setSeine");
         }
 
         if (node instanceof DataReferenceNodeSupport) {
@@ -294,12 +287,11 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
 
             DataReference entity = entityNodeSupport.getEntity();
 
-            Preconditions.checkNotNull(entity, "L'entité doit être chargée dans le noeud: " + node);
+            Objects.requireNonNull(entity, "L'entité doit être chargée dans le noeud: " + node);
 
             Decorator<?> decorator = getDecoratorService().getDataReferenceDecorator((Class) beanType);
-            String text = decorator.toString(entity);
 
-            return text;
+            return decorator.toString(entity);
         }
 
         if (node instanceof ReferentialReferenceNodeSupport) {
@@ -307,12 +299,11 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel
 
             ReferentialReference entity = entityNodeSupport.getEntity();
 
-            Preconditions.checkNotNull(entity, "L'entité doit être chargée dans le noeud: " + node);
+            Objects.requireNonNull(entity, "L'entité doit être chargée dans le noeud: " + node);
 
             Decorator<?> decorator = getDecoratorService().getReferentialReferenceDecorator((Class) beanType);
-            String text = decorator.toString(entity);
 
-            return text;
+            return decorator.toString(entity);
         }
 
         throw new IllegalStateException("Don't know how to render node: " + node);
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivityLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivityLonglineNode.java
index 73cdbf2..ff0a73c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivityLonglineNode.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivityLonglineNode.java
@@ -45,8 +45,7 @@ public class ActivityLonglineNode extends DataReferenceNodeSupport<ActivityLongl
     @Override
     protected DataReference<ActivityLonglineDto> fetchEntity() {
         ActivityLonglineService service = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newActivityLonglineService();
-        DataReference<ActivityLonglineDto> referenceDto = service.loadReferenceToRead(getId());
-        return referenceDto;
+        return service.loadReferenceToRead(getId());
     }
 
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivitySeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivitySeineNode.java
index 9839e8d..3dfed91 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivitySeineNode.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ActivitySeineNode.java
@@ -45,8 +45,7 @@ public class ActivitySeineNode extends DataReferenceNodeSupport<ActivitySeineDto
     @Override
     protected DataReference<ActivitySeineDto> fetchEntity() {
         ActivitySeineService service = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newActivitySeineService();
-        DataReference<ActivitySeineDto> referenceDto = service.loadReferenceToRead(getId());
-        return referenceDto;
+        return service.loadReferenceToRead(getId());
     }
 
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/FloatingObjectSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/FloatingObjectSeineNode.java
index 17a7fab..e6ed23e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/FloatingObjectSeineNode.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/FloatingObjectSeineNode.java
@@ -45,8 +45,7 @@ public class FloatingObjectSeineNode extends DataReferenceNodeSupport<FloatingOb
     @Override
     protected DataReference<FloatingObjectDto> fetchEntity() {
         FloatingObjectService service = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newFloatingObjectService();
-        DataReference<FloatingObjectDto> referenceDto = service.loadReferenceToRead(getId());
-        return referenceDto;
+        return service.loadReferenceToRead(getId());
     }
 
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java
index f71669b..638a8b5 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java
@@ -21,13 +21,23 @@
  */
 package fr.ird.observe.application.swing.ui.tree;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
-import fr.ird.observe.application.swing.decoration.DecoratorService;
-import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import fr.ird.observe.application.swing.db.DataContext;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
+import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
+import fr.ird.observe.application.swing.ui.ObserveMainUI;
+import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
+import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador;
+import fr.ird.observe.application.swing.ui.tree.loadors.ActivityLonglineNodeChildLoador;
+import fr.ird.observe.application.swing.ui.tree.loadors.ActivityLonglinesNodeChildLoador;
+import fr.ird.observe.application.swing.ui.tree.loadors.ActivitySeineNodeChildLoador;
+import fr.ird.observe.application.swing.ui.tree.loadors.ActivitySeinesNodeChildLoador;
+import fr.ird.observe.application.swing.ui.tree.loadors.ProgramLonglineNodeChildLoador;
+import fr.ird.observe.application.swing.ui.tree.loadors.ProgramSeineNodeChildLoador;
+import fr.ird.observe.application.swing.ui.tree.loadors.RootNodeChildLoador;
+import fr.ird.observe.application.swing.ui.tree.loadors.RoutesNodeChildLoador;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.IdDto;
 import fr.ird.observe.services.dto.constants.ReferentialLocale;
@@ -42,17 +52,6 @@ import fr.ird.observe.services.dto.seine.FloatingObjectDto;
 import fr.ird.observe.services.dto.seine.RouteDto;
 import fr.ird.observe.services.dto.seine.SetSeineDto;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
-import fr.ird.observe.application.swing.ui.ObserveMainUI;
-import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
-import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador;
-import fr.ird.observe.application.swing.ui.tree.loadors.ActivityLonglineNodeChildLoador;
-import fr.ird.observe.application.swing.ui.tree.loadors.ActivityLonglinesNodeChildLoador;
-import fr.ird.observe.application.swing.ui.tree.loadors.ActivitySeineNodeChildLoador;
-import fr.ird.observe.application.swing.ui.tree.loadors.ActivitySeinesNodeChildLoador;
-import fr.ird.observe.application.swing.ui.tree.loadors.ProgramLonglineNodeChildLoador;
-import fr.ird.observe.application.swing.ui.tree.loadors.ProgramSeineNodeChildLoador;
-import fr.ird.observe.application.swing.ui.tree.loadors.RootNodeChildLoador;
-import fr.ird.observe.application.swing.ui.tree.loadors.RoutesNodeChildLoador;
 import jaxx.runtime.JAXXContext;
 import jaxx.runtime.swing.nav.NavDataProvider;
 import jaxx.runtime.swing.nav.tree.NavTreeHelper;
@@ -71,6 +70,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import static org.nuiton.i18n.I18n.n;
@@ -92,8 +92,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
 
     public static ObserveNode createStringNode(String context) {
 
-        ObserveNode result = createStringNode(context, null);
-        return result;
+        return createStringNode(context, null);
 
     }
 
@@ -102,12 +101,11 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
         L childLoador = loadorType == null ? null : ObserveTreeHelper.getChildLoador(loadorType);
 
         String propertyLabel = DecoratorService.getPropertyLabel(TREE_NODE_PREFIX, context);
-        ObserveNode result = new ObserveNode(String.class,
-                                             propertyLabel,
-                                             context,
-                                             childLoador,
-                                             false);
-        return result;
+        return new ObserveNode(String.class,
+                               propertyLabel,
+                               context,
+                               childLoador,
+                               false);
 
     }
 
@@ -152,8 +150,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
         ObserveNode node =
                 new ObserveNode(n("observe.message.db.none.loaded"), false);
 
-        DefaultTreeModel model = createModel(node);
-        return model;
+        return createModel(node);
     }
 
     public TreeModel createModel(ObserveSwingDataSource source) {
@@ -550,14 +547,14 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
     public void removeProgram(String programId) {
         ObserveNode rootNode = getRootNode();
         ObserveNode result = rootNode.getChild(programId, getBridge(), dataProvider);
-        Preconditions.checkNotNull(result, "Could not find program node with id: " + programId);
+        Objects.requireNonNull(result, "Could not find program node with id: " + programId);
         removeNode(result);
     }
 
     public void updateProgram(ProgramDto bean) {
         ObserveNode rootNode = getRootNode();
         ObserveNode result = rootNode.getChild(bean.getId(), getBridge(), dataProvider);
-        Preconditions.checkNotNull(result, "Could not find program node with id: " + bean.getId());
+        Objects.requireNonNull(result, "Could not find program node with id: " + bean.getId());
         reloadNode(result, false);
         refreshNode(result, false);
     }
@@ -581,9 +578,9 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
 
         ObserveNode rootNode = getRootNode();
         ObserveNode programNode = rootNode.getChild(program.getId(), getBridge(), dataProvider);
-        Preconditions.checkNotNull(programNode, "Could not find program node with id: " + program);
+        Objects.requireNonNull(programNode, "Could not find program node with id: " + program);
         ObserveNode tripNode = programNode.getChild(trip.getId(), getBridge(), dataProvider);
-        Preconditions.checkNotNull(tripNode, "Could not find program node with id: " + trip);
+        Objects.requireNonNull(tripNode, "Could not find program node with id: " + trip);
         removeNode(tripNode);
 
         if (programNode.isLeaf()) {
@@ -637,7 +634,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> {
     }
 
     public void reloadNodeSubTree(ObserveNode node, boolean expandNode) {
-        Preconditions.checkNotNull(node, "node is null, we can not reload its structure");
+        Objects.requireNonNull(node, "node is null, we can not reload its structure");
         ObserveTreeBridge bridge = getBridge();
 
         // 1. Let's clear node structure
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramLonglineNode.java
index 7b7b18a..05b0e2e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramLonglineNode.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramLonglineNode.java
@@ -51,7 +51,6 @@ public class ProgramLonglineNode extends ReferentialReferenceNodeSupport<Program
     @Override
     protected ReferentialReference<ProgramDto> fetchEntity() {
         ReferentialService service = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newReferentialService();
-        ReferentialReference<ProgramDto> referenceDto = service.loadReference(ProgramDto.class, getId());
-        return referenceDto;
+        return service.loadReference(ProgramDto.class, getId());
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramSeineNode.java
index 8d2a78d..6d0d1cf 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramSeineNode.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ProgramSeineNode.java
@@ -49,8 +49,7 @@ public class ProgramSeineNode extends ReferentialReferenceNodeSupport<ProgramDto
     @Override
     protected ReferentialReference<ProgramDto> fetchEntity() {
         ReferentialService service = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newReferentialService();
-        ReferentialReference<ProgramDto> referenceDto = service.loadReference(ProgramDto.class, getId());
-        return referenceDto;
+        return service.loadReference(ProgramDto.class, getId());
     }
 
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/RouteSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/RouteSeineNode.java
index 8e7e873..e3be2b8 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/RouteSeineNode.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/RouteSeineNode.java
@@ -44,7 +44,6 @@ public class RouteSeineNode extends DataReferenceNodeSupport<RouteDto> {
     @Override
     protected DataReference<RouteDto> fetchEntity() {
         RouteService routeService = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newRouteService();
-        DataReference<RouteDto> referenceDto = routeService.loadReferenceToRead(getId());
-        return referenceDto;
+        return routeService.loadReferenceToRead(getId());
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetLonglineNode.java
index 20a94e0..3757916 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetLonglineNode.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetLonglineNode.java
@@ -45,8 +45,7 @@ public class SetLonglineNode extends DataReferenceNodeSupport<SetLonglineDto> {
     @Override
     protected DataReference<SetLonglineDto> fetchEntity() {
         SetLonglineService service = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newSetLonglineService();
-        DataReference<SetLonglineDto> referenceDto = service.loadReferenceToRead(getId());
-        return referenceDto;
+        return service.loadReferenceToRead(getId());
     }
 
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetSeineNode.java
index ca623f5..614535f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetSeineNode.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/SetSeineNode.java
@@ -45,8 +45,7 @@ public class SetSeineNode extends DataReferenceNodeSupport<SetSeineDto> {
     @Override
     protected DataReference<SetSeineDto> fetchEntity() {
         SetSeineService service = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newSetSeineService();
-        DataReference<SetSeineDto> referenceDto = service.loadReferenceToRead(getId());
-        return referenceDto;
+        return service.loadReferenceToRead(getId());
     }
 
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripLonglineNode.java
index 67ed029..fe3ec9f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripLonglineNode.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripLonglineNode.java
@@ -44,8 +44,7 @@ public class TripLonglineNode extends DataReferenceNodeSupport<TripLonglineDto>
     @Override
     protected DataReference<TripLonglineDto> fetchEntity() {
         TripLonglineService tripLonglineService = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newTripLonglineService();
-        DataReference<TripLonglineDto> referenceDto = tripLonglineService.loadReferenceToRead(getId());
-        return referenceDto;
+        return tripLonglineService.loadReferenceToRead(getId());
     }
 
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripSeineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripSeineNode.java
index c4edf00..b5b2b23 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripSeineNode.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/TripSeineNode.java
@@ -45,7 +45,6 @@ public class TripSeineNode extends DataReferenceNodeSupport<TripSeineDto> {
     @Override
     protected DataReference<TripSeineDto> fetchEntity() {
         TripSeineService tripSeineService = ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newTripSeineService();
-        DataReference<TripSeineDto> referenceDto = tripSeineService.loadReferenceToRead(getId());
-        return referenceDto;
+        return tripSeineService.loadReferenceToRead(getId());
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java
index 167ade1..6a02617 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java
@@ -72,8 +72,7 @@ public class ChangeActivityRouteActionListener extends NodeChangeActionListener
         ObserveNode routeNode = getTreeHelper().getChild(grandParentNode, parentNodeId);
         String activitiesNodeId = DecoratorService.getPropertyLabel(ObserveTreeHelper.TREE_NODE_PREFIX,
                                                                     RouteDto.PROPERTY_ACTIVITY_SEINE);
-        ObserveNode activities = getTreeHelper().getChild(routeNode, activitiesNodeId);
-        return activities;
+        return getTreeHelper().getChild(routeNode, activitiesNodeId);
     }
 
     @Override
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java
index 3b63e17..578c67b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java
@@ -72,8 +72,7 @@ public class ChangeActivityTripActionListener extends NodeChangeActionListener {
         ObserveNode tripLonglineNode = getTreeHelper().getChild(grandParentNode, parentNodeId);
         String activitiesNodeId = DecoratorService.getPropertyLabel(ObserveTreeHelper.TREE_NODE_PREFIX,
                                                                     TripLonglineDto.PROPERTY_ACTIVITY_LONGLINE);
-        ObserveNode activities = getTreeHelper().getChild(tripLonglineNode, activitiesNodeId);
-        return activities;
+        return getTreeHelper().getChild(tripLonglineNode, activitiesNodeId);
     }
 
     @Override
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java
index 925cfa6..a6c4b32 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java
@@ -72,8 +72,7 @@ public class ChangeRouteTripActionListener extends NodeChangeActionListener {
         ObserveNode tripNode = getTreeHelper().getChild(grandParentNode, parentNodeId);
         String routesNodeId = DecoratorService.getPropertyLabel(ObserveTreeHelper.TREE_NODE_PREFIX,
                                                                 TripSeineDto.PROPERTY_ROUTE);
-        ObserveNode routesNode = getTreeHelper().getChild(tripNode, routesNodeId);
-        return routesNode;
+        return getTreeHelper().getChild(tripNode, routesNodeId);
     }
 
     @Override
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java
index 9ad252d..c38104b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/AbstractNodeChildLoador.java
@@ -44,14 +44,12 @@ public abstract class AbstractNodeChildLoador<T, O> extends NavTreeNodeChildLoad
 
     protected ObserveSwingDataSource getDataSource(NavDataProvider dataProvider) {
         ObserveDataProvider provider = (ObserveDataProvider) dataProvider;
-        ObserveSwingDataSource result = provider.getDataSource();
-        return result;
+        return provider.getDataSource();
     }
 
     protected DataSelectionModel getSelectionModel(NavDataProvider dataProvider) {
         ObserveDataProvider provider = (ObserveDataProvider) dataProvider;
-        DataSelectionModel result = provider.getSelectionModel();
-        return result;
+        return provider.getSelectionModel();
     }
 
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java
index 98bd589..5baf077 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java
@@ -104,8 +104,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str
     @Override
     public ObserveNode createNode(String data, NavDataProvider dataProvider) {
 
-        ObserveNode result = ObserveTreeHelper.createStringNode(data);
-        return result;
+        return ObserveTreeHelper.createStringNode(data);
 
     }
 
@@ -114,8 +113,7 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Str
             throw new NullPointerException("Ne peut pas ajouter un objet null");
         }
 
-        ObserveNode child = new SetLonglineNode(data);
-        return child;
+        return new SetLonglineNode(data);
 
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java
index 551776d..765aa6b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglinesNodeChildLoador.java
@@ -66,8 +66,7 @@ public class ActivityLonglinesNodeChildLoador extends AbstractDataReferenceChild
             throw new NullPointerException("Ne peut pas ajouter un objet null");
         }
 
-        ObserveNode result = new ActivityLonglineNode(data);
-        return result;
+        return new ActivityLonglineNode(data);
 
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java
index 93110b4..096ae68 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeineNodeChildLoador.java
@@ -96,8 +96,7 @@ public class ActivitySeineNodeChildLoador extends AbstractDataReferenceChildLoad
             throw new NullPointerException("Ne peut pas ajouter un objet null");
         }
 
-        SetSeineNode child = new SetSeineNode(data);
-        return child;
+        return new SetSeineNode(data);
 
     }
 
@@ -107,8 +106,7 @@ public class ActivitySeineNodeChildLoador extends AbstractDataReferenceChildLoad
             throw new NullPointerException("Ne peut pas ajouter un objet null");
         }
 
-        FloatingObjectSeineNode result = new FloatingObjectSeineNode(data);
-        return result;
+        return new FloatingObjectSeineNode(data);
 
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java
index 7f3d762..d2fa5c0 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivitySeinesNodeChildLoador.java
@@ -64,8 +64,7 @@ public class ActivitySeinesNodeChildLoador extends AbstractDataReferenceChildLoa
             throw new NullPointerException("Ne peut pas ajouter un objet null");
         }
 
-        ActivitySeineNode result = new ActivitySeineNode(data);
-        return result;
+        return new ActivitySeineNode(data);
 
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java
index 9868a1a..421426e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/FloatingObjectNodeChildLoador.java
@@ -69,8 +69,7 @@ public class FloatingObjectNodeChildLoador extends AbstractNodeChildLoador<Strin
     @Override
     public ObserveNode createNode(String data, NavDataProvider dataProvider) {
 
-        ObserveNode result = ObserveTreeHelper.createStringNode(data);
-        return result;
+        return ObserveTreeHelper.createStringNode(data);
 
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceCommonNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceCommonNodeChildLoador.java
index fda5d7e..76529b4 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceCommonNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceCommonNodeChildLoador.java
@@ -84,12 +84,11 @@ public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<Clas
     @Override
     public ObserveNode createNode(Class data, NavDataProvider dataProvider) {
 
-        ObserveNode result = new ObserveNode(
+        return new ObserveNode(
                 data,
                 data.getSimpleName(),
                 null,
                 true
         );
-        return result;
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java
index bb56708..4ba3e24 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java
@@ -90,12 +90,11 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Cl
     @Override
     public ObserveNode createNode(Class data, NavDataProvider dataProvider) {
 
-        ObserveNode result = new ObserveNode(
+        return new ObserveNode(
                 data,
                 data.getSimpleName(),
                 null,
                 true
         );
-        return result;
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceSeineNodeChildLoador.java
index 6b6c6c0..48392cb 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceSeineNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ReferenceSeineNodeChildLoador.java
@@ -81,12 +81,11 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<Class
 
     @Override
     public ObserveNode createNode(Class data, NavDataProvider dataProvider) {
-        ObserveNode result = new ObserveNode(
+        return new ObserveNode(
                 data,
                 data.getSimpleName(),
                 null,
                 true
         );
-        return result;
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java
index 25762a6..8c61679 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetLonglineNodeChildLoador.java
@@ -72,8 +72,7 @@ public class SetLonglineNodeChildLoador extends AbstractNodeChildLoador<String,
     @Override
     public ObserveNode createNode(String data, NavDataProvider dataProvider) {
 
-        ObserveNode result = ObserveTreeHelper.createStringNode(data);
-        return result;
+        return ObserveTreeHelper.createStringNode(data);
 
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java
index 5ee9671..cd07713 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/SetSeineNodeChildLoador.java
@@ -79,7 +79,6 @@ public class SetSeineNodeChildLoador extends AbstractNodeChildLoador<String, Str
     @Override
     public ObserveNode createNode(String data, NavDataProvider dataProvider) {
 
-        ObserveNode result = ObserveTreeHelper.createStringNode(data);
-        return result;
+        return ObserveTreeHelper.createStringNode(data);
     }
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java
index 84c2b68..274abf4 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/DecoratedNodeEntity.java
@@ -22,11 +22,12 @@ package fr.ird.observe.application.swing.ui.util;
  * #L%
  */
 
-import com.google.common.base.Preconditions;
-import fr.ird.observe.services.dto.IdDto;
 import fr.ird.observe.application.swing.ui.tree.AbstrctReferenceNodeSupport;
+import fr.ird.observe.services.dto.IdDto;
 import org.nuiton.decorator.Decorator;
 
+import java.util.Objects;
+
 /**
  * @author Kevin Morin (Code Lutin)
  * @since 5.0
@@ -38,8 +39,8 @@ public class DecoratedNodeEntity {
     private final String label;
 
     public static <E extends IdDto> DecoratedNodeEntity newDecoratedNodeEntity(AbstrctReferenceNodeSupport<E, ?> node, Decorator<?> decorator) {
-        Preconditions.checkNotNull(node);
-        Preconditions.checkNotNull(decorator);
+        Objects.requireNonNull(node);
+        Objects.requireNonNull(decorator);
         return new DecoratedNodeEntity(node.getId(), decorator.toString(node.getEntity()));
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java
index c8dfdeb..b73c4c6 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java
@@ -131,16 +131,14 @@ public class ObserveValidationMessageTableRenderer extends DefaultTableCellRende
     }
 
     public ImageIcon getIcon(NuitonValidatorScope scope) {
-        ImageIcon icon = SwingValidatorUtil.getIcon(scope);
-        return icon;
+        return SwingValidatorUtil.getIcon(scope);
     }
 
     public String getMessage(JTable table, String value, int row) {
         ValidationMessageTableModel tableModel =
                 (ValidationMessageTableModel) table.getModel();
         ValidationMessage validationMessage = tableModel.getRow(row);
-        String text = validationMessage.getMessage();
-        return text;
+        return validationMessage.getMessage();
 
     }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AbstractSelectTableAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AbstractSelectTableAction.java
index c855a6a..9e0f926 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AbstractSelectTableAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AbstractSelectTableAction.java
@@ -61,13 +61,11 @@ public abstract class AbstractSelectTableAction<M extends EditableTableModelSupp
     }
 
     protected int getSelectedRow() {
-        int result = table.getSelectedRow();
-        return result;
+        return table.getSelectedRow();
     }
 
     protected int getSelectedColumn() {
-        int result = table.getSelectedColumn();
-        return result;
+        return table.getSelectedColumn();
     }
 
     protected int getRowCount() {
@@ -79,9 +77,8 @@ public abstract class AbstractSelectTableAction<M extends EditableTableModelSupp
     }
 
     protected boolean isCellEditable(int rowIndex, int columnIndex) {
-        boolean result = rowIndex > -1 && columnIndex > -1 &&
+        return rowIndex > -1 && columnIndex > -1 &&
                 table.isCellEditable(rowIndex, columnIndex);
-        return result;
     }
 
     protected boolean isCreateNewRow(int rowIndex) {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableWithCacheTableModelSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableWithCacheTableModelSupport.java
index 9b90041..6eac7df 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableWithCacheTableModelSupport.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableWithCacheTableModelSupport.java
@@ -123,8 +123,7 @@ public abstract class EditableTableWithCacheTableModelSupport<E extends IdDto> e
     }
 
     public Set<Integer> getCacheRowsChanged() {
-        Set<Integer> rows = cacheByRow.keySet();
-        return rows;
+        return cacheByRow.keySet();
     }
 
     @Override
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPane.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPane.java
index 73b2230..b196bec 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPane.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPane.java
@@ -339,9 +339,8 @@ public class ObserveMapPane extends JMapPane {
 
             double deltaX = matrix00 * x + matrix01 * y;
             double deltaY = matrix10 * x + matrix11 * y;
-            Point2D.Double result = new Point2D.Double(center.getX() + deltaX, center.getY() + deltaY);
 
-            return result;
+            return new Point2D.Double(center.getX() + deltaX, center.getY() + deltaY);
         }
 
         // on cherche la ditance entre le centre du text et sa bordure dans le direction donné
@@ -353,9 +352,7 @@ public class ObserveMapPane extends JMapPane {
             double deltaW = Math.abs(textArea.getWidth() / 2 / (matrix00 * x + matrix01 * y));
             double deltaH = Math.abs(textArea.getHeight() / 2 / (matrix10 * x + matrix11 * y));
 
-            double delta =  Math.min(deltaH, deltaW);
-
-            return delta;
+            return Math.min(deltaH, deltaW);
         }
 
         public String getLabel() {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPaneLegendItem.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPaneLegendItem.java
index d3e7211..5e67329 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPaneLegendItem.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/ObserveMapPaneLegendItem.java
@@ -47,8 +47,7 @@ public class ObserveMapPaneLegendItem {
     }
 
     public static Coordinate pointCoordinates() {
-        Coordinate coordinate = new Coordinate(LEGEND_SYMBOL_WIDTH / 2, LEGEND_ITEM_HEIGHT / 2);
-        return coordinate;
+        return new Coordinate(LEGEND_SYMBOL_WIDTH / 2, LEGEND_ITEM_HEIGHT / 2);
     }
 
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java
index a615e63..0d4af1c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationContext.java
@@ -70,8 +70,7 @@ public class ValidationContext {
         @Override
         public TripSeineDto get(ObserveSwingDataSource dataSource, String id) {
             TripSeineService service = dataSource.newTripSeineService();
-            TripSeineDto dto = service.loadDto(id);
-            return dto;
+            return service.loadDto(id);
         }
     };
 
@@ -80,8 +79,7 @@ public class ValidationContext {
         @Override
         public RouteDto get(ObserveSwingDataSource dataSource, String id) {
             RouteService service = dataSource.newRouteService();
-            RouteDto dto = service.loadDto(id);
-            return dto;
+            return service.loadDto(id);
         }
     };
 
@@ -90,8 +88,7 @@ public class ValidationContext {
         @Override
         public ActivitySeineDto get(ObserveSwingDataSource dataSource, String id) {
             ActivitySeineService service = dataSource.newActivitySeineService();
-            ActivitySeineDto dto = service.loadDto(id);
-            return dto;
+            return service.loadDto(id);
         }
     };
 
@@ -100,8 +97,7 @@ public class ValidationContext {
         @Override
         public TripLonglineDto get(ObserveSwingDataSource dataSource, String id) {
             TripLonglineService service = dataSource.newTripLonglineService();
-            TripLonglineDto dto = service.loadDto(id);
-            return dto;
+            return service.loadDto(id);
         }
     };
 
@@ -110,8 +106,7 @@ public class ValidationContext {
         @Override
         public ActivityLonglineDto get(ObserveSwingDataSource dataSource, String id) {
             ActivityLonglineService service = dataSource.newActivityLonglineService();
-            ActivityLonglineDto dto = service.loadDto(id);
-            return dto;
+            return service.loadDto(id);
         }
     };
 
@@ -120,8 +115,7 @@ public class ValidationContext {
         @Override
         public SetSeineDto get(ObserveSwingDataSource dataSource, String id) {
             SetSeineService service = dataSource.newSetSeineService();
-            SetSeineDto dto = service.loadDto(id);
-            return dto;
+            return service.loadDto(id);
         }
     };
 
@@ -130,8 +124,7 @@ public class ValidationContext {
         @Override
         public SetLonglineDto get(ObserveSwingDataSource dataSource, String id) {
             SetLonglineService service = dataSource.newSetLonglineService();
-            SetLonglineDto dto = service.loadDto(id);
-            return dto;
+            return service.loadDto(id);
         }
     };
 
@@ -140,8 +133,7 @@ public class ValidationContext {
         @Override
         public FloatingObjectDto get(ObserveSwingDataSource dataSource, String id) {
             FloatingObjectService service = dataSource.newFloatingObjectService();
-            FloatingObjectDto dto = service.loadDto(id);
-            return dto;
+            return service.loadDto(id);
         }
     };
 
@@ -150,8 +142,7 @@ public class ValidationContext {
         @Override
         public SpeciesDto get(ObserveSwingDataSource dataSource, String id) {
             ReferentialService service = dataSource.newReferentialService();
-            SpeciesDto dto = service.loadSpecies(id);
-            return dto;
+            return service.loadSpecies(id);
         }
     };
 
@@ -307,8 +298,7 @@ public class ValidationContext {
 
         public final D get(String id) {
             ObserveSwingDataSource dataSource = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource();
-            D dto = get(dataSource, id);
-            return dto;
+            return get(dataSource, id);
         }
 
         public abstract D get(ObserveSwingDataSource dataSource, String id);
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationService.java b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationService.java
index 292da62..ef99999 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationService.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidationService.java
@@ -88,12 +88,11 @@ public class ValidationService {
             String contextName,
             NuitonValidatorScope[] scopes,
             Class<?>... beanclass) {
-        ValidatorsMap map = detectValidators(
+        return detectValidators(
                 contextName,
                 scopes,
                 beanclass
         );
-        return map;
     }
 
     /**
@@ -125,12 +124,11 @@ public class ValidationService {
 //                    "could not obtains types for reason " + e.getMessage(), e);
 //        }
 
-        ValidatorsMap result = detectValidators(
+        return detectValidators(
                 contextName,
                 scopes,
                 types.toArray(new Class<?>[types.size()])
         );
-        return result;
     }
 
     @SuppressWarnings("unchecked")
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidatorsMap.java b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidatorsMap.java
index b0d9b65..5131642 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidatorsMap.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ValidatorsMap.java
@@ -54,8 +54,7 @@ public class ValidatorsMap implements Map<Class<?>, SimpleBeanValidator<?>> {
     }
 
     public <X> SimpleBeanValidator<X> getValidator(Class<X> klass) {
-        SimpleBeanValidator<X> beanValidator = (SimpleBeanValidator<X>) get(klass);
-        return beanValidator;
+        return (SimpleBeanValidator<X>) get(klass);
     }
 
     @Override
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java
index c46d69f..b5e1410 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java
@@ -38,7 +38,7 @@ import fr.ird.observe.application.web.security.ObserveWebSecurityApplicationCont
 import fr.ird.observe.services.ObserveService;
 import fr.ird.observe.services.ObserveServiceFactory;
 import fr.ird.observe.services.ObserveServiceInitializer;
-import fr.ird.observe.services.ObserveServiceMainFactory;
+import fr.ird.observe.services.runner.ObserveServiceMainFactory;
 import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier;
 import org.debux.webmotion.server.call.HttpContext;
 import org.nuiton.version.Version;
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java
index 18a6e53..394781a 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java
@@ -87,8 +87,7 @@ public class ObserveWebApplicationConfiguration {
     }
 
     public Version getModelVersion() {
-        Version result = applicationConfig.getOption(Version.class, ObserveWebApplicationConfigurationOption.MODEL_VERSION.getKey());
-        return result;
+        return applicationConfig.getOption(Version.class, ObserveWebApplicationConfigurationOption.MODEL_VERSION.getKey());
     }
 
     public File getBaseDirectory() {
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelper.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelper.java
index 3def452..2a4e44f 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelper.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelper.java
@@ -58,8 +58,7 @@ public class ObserveWebDatabasesHelper {
 
         ObserveWebDatabasesBean observeWebDatabasesBean = loadBean(file);
         validateObserveWebDatabasesBean(observeWebDatabasesBean);
-        ObserveWebDatabasesImmutable observeWebDatabasesImmutable = observeWebDatabasesBean.toImmutable();
-        return observeWebDatabasesImmutable;
+        return observeWebDatabasesBean.toImmutable();
 
     }
 
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java
index 391b156..473ed75 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelper.java
@@ -62,8 +62,7 @@ public class ObserveWebUsersHelper {
 
         ObserveWebUsersBean observeWebUsersBean = loadBean(file);
         validateObserveWebUsersBean(databases, observeWebUsersBean);
-        ObserveWebUsersImmutable observeWebUsersImmutable = observeWebUsersBean.toImmutable();
-        return observeWebUsersImmutable;
+        return observeWebUsersBean.toImmutable();
 
     }
 
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java
index 6b60c43..9db5b26 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java
@@ -66,9 +66,7 @@ public class DataSourceServiceController extends ObserveServiceControllerSupport
 
         ObserveDataSourceConfiguration dataSourceConfigurationTopia = getTopiaDataSourceConfiguration(dataSourceConfiguration);
 
-        ObserveDataSourceInformation information = getAnonymousService(dataSourceConfigurationTopia).checkCanConnect(dataSourceConfigurationTopia);
-
-        return information;
+        return getAnonymousService(dataSourceConfigurationTopia).checkCanConnect(dataSourceConfigurationTopia);
     }
 
     @Override
@@ -81,8 +79,7 @@ public class DataSourceServiceController extends ObserveServiceControllerSupport
         ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).create(dataSourceConfigurationTopia, dataSourceCreateConfiguration);
 
         String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection);
-        ObserveDataSourceConnectionRest dataSourceConnection = createDataSourceConnection(observeDataSourceConnection, authenticationToken);
-        return dataSourceConnection;
+        return createDataSourceConnection(observeDataSourceConnection, authenticationToken);
 
     }
 
@@ -94,8 +91,7 @@ public class DataSourceServiceController extends ObserveServiceControllerSupport
         ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).open(dataSourceConfigurationTopia);
 
         String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection);
-        ObserveDataSourceConnectionRest dataSourceConnection = createDataSourceConnection(observeDataSourceConnection, authenticationToken);
-        return dataSourceConnection;
+        return createDataSourceConnection(observeDataSourceConnection, authenticationToken);
 
     }
 
@@ -154,8 +150,7 @@ public class DataSourceServiceController extends ObserveServiceControllerSupport
         Optional<String> optionalDatabaseName = dataSourceConfigurationRest.getOptionalDatabaseName();
 
         ObserveWebSecurityApplicationContext securityApplicationContext = getSecurityApplicationContext();
-        ObserveDataSourceConfiguration dataSourceConfiguration = securityApplicationContext.getDataSourceConfiguration(login, password, optionalDatabaseName);
-        return dataSourceConfiguration;
+        return securityApplicationContext.getDataSourceConfiguration(login, password, optionalDatabaseName);
 
     }
 
@@ -164,14 +159,13 @@ public class DataSourceServiceController extends ObserveServiceControllerSupport
         ObserveDataSourceConfigurationAndConnection configurationAndConnection =
                 new ObserveDataSourceConfigurationAndConnection(dataSourceConfiguration, dataSourceConnection);
 
-        String authenticationToken = getSecurityApplicationContext().registerDataSourceConfiguration(configurationAndConnection);
-        return authenticationToken;
+        return getSecurityApplicationContext().registerDataSourceConfiguration(configurationAndConnection);
 
     }
 
     protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) {
 
-        ObserveDataSourceConnectionRest dataSourceConnection = new ObserveDataSourceConnectionRest(
+        return new ObserveDataSourceConnectionRest(
                 getApplicationConfiguration().getApiUrl(),
                 authenticationToken,
                 observeDataSourceConnection.canReadReferential(),
@@ -181,8 +175,6 @@ public class DataSourceServiceController extends ObserveServiceControllerSupport
                 observeDataSourceConnection.getVersion()
         );
 
-        return dataSourceConnection;
-
     }
 
 }
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveServiceControllerSupport.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveServiceControllerSupport.java
index 242dd4a..5480d70 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveServiceControllerSupport.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveServiceControllerSupport.java
@@ -62,9 +62,7 @@ public abstract class ObserveServiceControllerSupport<S extends ObserveService>
         ObserveWebSecurityApplicationContext securityApplicationContext = getSecurityApplicationContext();
         ObserveDataSourceConfigurationAndConnection configurationAndConnection = securityApplicationContext.getDataSourceConfigurationAndConnection(authenticationToken);
 
-        S service = requestContext.newService(serviceType, configurationAndConnection);
-
-        return service;
+        return requestContext.newService(serviceType, configurationAndConnection);
     }
 
     protected S getAnonymousService(ObserveDataSourceConfiguration dataSourceConfiguration) {
@@ -75,9 +73,8 @@ public abstract class ObserveServiceControllerSupport<S extends ObserveService>
         Preconditions.checkState(!requiredAuthentication, "Vous avez demandé un service anonyme, alors que l'annotation " + NoDataAccess.class.getName() + " n'est pas présente sur la méthode du service");
 
         ObserveWebRequestContext requestContext = getRequestContext();
-        S service = requestContext.newService(serviceType, dataSourceConfiguration);
 
-        return service;
+        return requestContext.newService(serviceType, dataSourceConfiguration);
     }
 
     protected Method getServiceMethod(Method method) {
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java
index 8e2b0b9..f083587 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java
@@ -97,12 +97,10 @@ public class ObserveWebErrorController extends WebMotionController {
 
         }
 
-        ObserveHttpError error = new ObserveHttpError(statusCode,
-                                                      exception == null ? null : exception.getClass(),
-                                                      message,
-                                                      exception);
-
-        return error;
+        return new ObserveHttpError(statusCode,
+                                    exception == null ? null : exception.getClass(),
+                                    message,
+                                    exception);
 
     }
 
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java
index 90d5ab6..a57d733 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java
@@ -38,9 +38,7 @@ public class PingServiceController extends ObserveWebMotionController implements
 
         ObserveWebApplicationConfiguration configuration = getApplicationConfiguration();
 
-        Version version = configuration.getModelVersion();
-
-        return version;
+        return configuration.getModelVersion();
     }
 
 }
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java
index 636bead..e523256 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/injector/ImmutableSetInjector.java
@@ -22,7 +22,6 @@ package fr.ird.observe.application.web.injector;
  * #L%
  */
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -31,6 +30,7 @@ import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler;
 import org.debux.webmotion.server.mapping.Mapping;
 
 import java.lang.reflect.Type;
+import java.util.Objects;
 
 /**
  * Cet injecteur a été mis en place pour permettre la conversion des immutableSet arrivant dans une requete.
@@ -38,7 +38,7 @@ import java.lang.reflect.Type;
  * essayant de les instancier avant de pousser des valeurs dedans... les ImmutableSet ne sont pas instanciables.
  *
  * Nous nous contentons ici de pousser les valeurs de la requête directement dans l'immutableSet
- * car celles-ci nous arrivent non sérialisées (cf. fr.ird.observe.services.ObserveServiceFactoryRest.RemoteInvocationHandler.addParameters())
+ * car celles-ci nous arrivent non sérialisées (cf. fr.ird.observe.services.rest.ObserveServiceFactoryRest.RemoteInvocationHandler.addParameters())
  *
  * Cet injecteur ne fonctionnera pas si les données arrivent sérialisées.
  *
@@ -63,7 +63,7 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I
 
             Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name);
 
-            Preconditions.checkNotNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!");
+            Objects.requireNonNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!");
 
             String[] values = (String[]) parameterTree.getValue();
             for (String value: values) {
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveClassInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveClassInjector.java
index 98988d3..d07ebe5 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveClassInjector.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveClassInjector.java
@@ -22,7 +22,6 @@ package fr.ird.observe.application.web.injector;
  * #L%
  */
 
-import com.google.common.base.Preconditions;
 import com.google.gson.JsonParseException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -31,6 +30,7 @@ import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler;
 import org.debux.webmotion.server.mapping.Mapping;
 
 import java.lang.reflect.Type;
+import java.util.Objects;
 
 /**
  * @author Sylvain Bavencoff - bavencoff@codelutin.com
@@ -48,7 +48,7 @@ public class ObserveClassInjector implements ExecutorParametersInjectorHandler.I
         if (type.equals(Class.class)) {
 
             Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name);
-            Preconditions.checkNotNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!");
+            Objects.requireNonNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!");
 
             String className = ((String[]) parameterTree.getValue())[0];
             className = className.replace("\"", "");
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java
index 80b9593..e5a0db3 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java
@@ -22,7 +22,6 @@ package fr.ird.observe.application.web.injector;
  * #L%
  */
 
-import com.google.common.base.Preconditions;
 import com.google.gson.Gson;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest;
@@ -33,6 +32,7 @@ import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler;
 import org.debux.webmotion.server.mapping.Mapping;
 
 import java.lang.reflect.Type;
+import java.util.Objects;
 
 /**
  * Pour injecter une configuration de source de données.
@@ -62,7 +62,7 @@ public class ObserveDataSourceConfigurationInjector implements ExecutorParameter
         if (type.equals(ObserveDataSourceConfiguration.class)) {
 
             Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name);
-            Preconditions.checkNotNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!");
+            Objects.requireNonNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!");
             String gsonContent = ((String[]) parameterTree.getValue())[0];
 
             dataSourceConfiguration = gson.fromJson(gsonContent, ObserveDataSourceConfigurationRest.class);
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java
index 28a3b00..a734c28 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveReferenceSetRequestInjector.java
@@ -22,7 +22,6 @@ package fr.ird.observe.application.web.injector;
  * #L%
  */
 
-import com.google.common.base.Preconditions;
 import com.google.gson.Gson;
 import fr.ird.observe.services.service.ReferenceSetsRequest;
 import org.apache.commons.logging.Log;
@@ -32,6 +31,7 @@ import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler;
 import org.debux.webmotion.server.mapping.Mapping;
 
 import java.lang.reflect.Type;
+import java.util.Objects;
 
 /**
  * Created on 13/11/15.
@@ -56,7 +56,7 @@ public class ObserveReferenceSetRequestInjector implements ExecutorParametersInj
         if (type.equals(ReferenceSetsRequest.class)) {
 
             Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name);
-            Preconditions.checkNotNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!");
+            Objects.requireNonNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!");
             String gsonContent = ((String[]) parameterTree.getValue())[0];
 
             referenceSetRequest = gson.fromJson(gsonContent, ReferenceSetsRequest.class);
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/injector/SqlScriptProducerRequestInjector.java b/application-web/src/main/java/fr/ird/observe/application/web/injector/SqlScriptProducerRequestInjector.java
index 33fb257..2cd8a91 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/injector/SqlScriptProducerRequestInjector.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/injector/SqlScriptProducerRequestInjector.java
@@ -22,7 +22,6 @@ package fr.ird.observe.application.web.injector;
  * #L%
  */
 
-import com.google.common.base.Preconditions;
 import com.google.gson.Gson;
 import fr.ird.observe.services.service.AddSqlScriptProducerRequest;
 import org.apache.commons.logging.Log;
@@ -32,6 +31,7 @@ import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler;
 import org.debux.webmotion.server.mapping.Mapping;
 
 import java.lang.reflect.Type;
+import java.util.Objects;
 
 /**
  * @author Sylvain Bavencoff - bavencoff@codelutin.com
@@ -56,7 +56,7 @@ public class SqlScriptProducerRequestInjector implements ExecutorParametersInjec
 
             Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name);
 
-            Preconditions.checkNotNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!");
+            Objects.requireNonNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!");
 
             String gsonContent = ((String[]) parameterTree.getValue())[0];
 
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java b/application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java
index 1a23641..faebcda 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java
@@ -48,9 +48,8 @@ public class ObserveWebRequestContext {
 
     public static ObserveWebRequestContext getRequestContext(HttpContext httpContext) {
 
-        ObserveWebRequestContext result = (ObserveWebRequestContext)
+        return (ObserveWebRequestContext)
                 httpContext.getRequest().getAttribute(REQUEST_OBSERVE_WEB_REQUEST_CONTEXT);
-        return result;
     }
 
     public static void setRequestContext(HttpContext httpContext,
@@ -96,8 +95,7 @@ public class ObserveWebRequestContext {
                 applicationContext.getApplicationConfiguration().getTemporaryDirectory(),
                 speciesListConfiguration,
                 dataSourceConfiguration);
-        S service = applicationContext.newService(observeServiceInitializer, serviceType);
-        return service;
+        return applicationContext.newService(observeServiceInitializer, serviceType);
 
     }
 
@@ -109,8 +107,7 @@ public class ObserveWebRequestContext {
                 applicationContext.getApplicationConfiguration().getTemporaryDirectory(),
                 speciesListConfiguration,
                 configurationAndConnection);
-        S service = applicationContext.newService(observeServiceInitializer, serviceType);
-        return service;
+        return applicationContext.newService(observeServiceInitializer, serviceType);
 
     }
 
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java b/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java
index 0a667a4..8223792 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java
@@ -32,7 +32,7 @@ import fr.ird.observe.application.web.configuration.db.ObserveWebDatabases;
 import fr.ird.observe.application.web.configuration.user.ObserveWebUser;
 import fr.ird.observe.application.web.configuration.user.ObserveWebUserPermission;
 import fr.ird.observe.application.web.configuration.user.ObserveWebUsers;
-import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory;
+import fr.ird.observe.services.runner.ObserveDataSourceConfigurationMainFactory;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection;
 import fr.ird.observe.services.security.BadObserveWebUserPasswordException;
@@ -103,7 +103,7 @@ public class ObserveWebSecurityApplicationContext implements Closeable {
 
         authenticateCache.removeAllAuthenticationTokens();
         ObserveWebDatabase defaultDatabase = databases.getDefaultDatabase();
-        Preconditions.checkNotNull(defaultDatabase);
+        Objects.requireNonNull(defaultDatabase);
         defaultDatabaseName = defaultDatabase.getName();
 
         ImmutableMap.Builder<String, ObserveDataSourceConfiguration> dataSourceConfigurationsCacheBuilder = new ImmutableMap.Builder<>();
@@ -198,8 +198,7 @@ public class ObserveWebSecurityApplicationContext implements Closeable {
     public String registerDataSourceConfiguration(ObserveDataSourceConfigurationAndConnection configurationAndConnection) {
 
         // Register data source configuration in cache
-        String authenticationToken = authenticateCache.registerDataSourceConfiguration(configurationAndConnection);
-        return authenticationToken;
+        return authenticateCache.registerDataSourceConfiguration(configurationAndConnection);
 
     }
 
@@ -222,8 +221,7 @@ public class ObserveWebSecurityApplicationContext implements Closeable {
         if (!Objects.equals(user.getPassword(), userPassword)) {
             throw new BadObserveWebUserPasswordException(userLogin, userPassword);
         }
-        ObserveDataSourceConfiguration dataSourceConfiguration = getDataSourceConfiguration(userLogin, optionalDatabaseName);
-        return dataSourceConfiguration;
+        return getDataSourceConfiguration(userLogin, optionalDatabaseName);
 
     }
 
diff --git a/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityAuthenticationTokenCache.java b/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityAuthenticationTokenCache.java
index c85bc10..bc4fedf 100644
--- a/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityAuthenticationTokenCache.java
+++ b/application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityAuthenticationTokenCache.java
@@ -65,9 +65,7 @@ public class ObserveWebSecurityAuthenticationTokenCache implements Closeable {
 
     public ObserveDataSourceConfigurationAndConnection getDataSourceConfigurationAndConnectionIfPresent(String authenticationToken) {
 
-        ObserveDataSourceConfigurationAndConnection configurationAndConnection = authenticationTokenCache.getIfPresent(authenticationToken);
-
-        return configurationAndConnection;
+        return authenticationTokenCache.getIfPresent(authenticationToken);
     }
 
 
diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java
index 740ed24..dd280bf 100644
--- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java
+++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java
@@ -82,8 +82,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration {
             throw new TopiaException("No unique constraintfound for table " + tableName + " and column " + columnName);
         }
 
-        String constraintName = result.get(0);
-        return constraintName;
+        return result.get(0);
     }
 
     public static String getFirstTableUniqueConstraintName(TopiaSqlSupport tx, final String tableName) {
@@ -115,8 +114,7 @@ public class H2DataSourceMigration extends AbstractDataSourceMigration {
             throw new TopiaException("Aucune contrainte de type unique trouvée sur la table " + tableName);
         }
 
-        String constraintName = result.get(0);
-        return constraintName;
+        return result.get(0);
     }
 
     public static Set<String> getConstraintNames(TopiaSqlSupport tx, final String tableName) {
diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java
index af9c875..7a7ccb4 100644
--- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java
+++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java
@@ -125,8 +125,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration {
             throw new TopiaException("No unique constraint found for table " + tableName + " and column " + columnName);
         }
 
-        String constraintName = result.get(0);
-        return constraintName;
+        return result.get(0);
     }
 
     public static String getFirstTableUniqueConstraintName(TopiaSqlSupport  tx, final String tableName) {
@@ -158,8 +157,7 @@ public class PGDataSourceMigration extends AbstractDataSourceMigration {
             throw new TopiaException("Aucune contrainte de type unique trouvée sur la table " + tableName);
         }
 
-        String constraintName = result.get(0);
-        return constraintName;
+        return result.get(0);
     }
 
     public static Set<String> getConstraintNames(TopiaSqlSupport  tx, final String tableName) {
diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java
index 599a923..3576ed1 100644
--- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java
+++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java
@@ -98,15 +98,12 @@ public class DataSourceMigrationForVersion_3_1 extends AbstractObserveMigrationC
                          "GROUP BY e.espece%1$s, e.ocean\n" +
                          "HAVING count(e.*) > 1\n" +
                          "ORDER BY e.espece%1$s, e.ocean;";
-            PreparedStatement ps = connection.prepareStatement(String.format(sql, tableName));
-            return ps;
+            return connection.prepareStatement(String.format(sql, tableName));
         }
 
         @Override
         public Pair<String, String> prepareResult(ResultSet set) throws SQLException {
-            Pair<String, String> result =
-                    Pair.of(set.getString(1), set.getString(2));
-            return result;
+            return Pair.of(set.getString(1), set.getString(2));
         }
     }
 
diff --git a/entities/pom.xml b/entities/pom.xml
index 27e9dbc..9f279aa 100644
--- a/entities/pom.xml
+++ b/entities/pom.xml
@@ -125,13 +125,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.nuiton</groupId>
-      <artifactId>nuiton-validator</artifactId>
-      <scope>test</scope>
-      <classifier>tests</classifier>
-    </dependency>
-
   </dependencies>
 
   <build>
diff --git a/entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java b/entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java
index e5c4070..b85d21a 100644
--- a/entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java
+++ b/entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java
@@ -46,8 +46,7 @@ public abstract class AbstractObserveTopiaDao<E extends ObserveEntity> extends A
     }
 
     public Date getLastUpdateDate() {
-        Date result = topiaSqlSupport.findSingleResult(getLastUpdateDateSqlQuery);
-        return result;
+        return topiaSqlSupport.findSingleResult(getLastUpdateDateSqlQuery);
     }
 
     public <O> List<O> findAllFromHql(String hql, Map<String, Object> hqlParameters) {
diff --git a/entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java b/entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java
index 01efbbb..3527931 100644
--- a/entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java
+++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java
@@ -22,7 +22,6 @@ package fr.ird.observe;
  * #L%
  */
 
-import com.google.common.base.Preconditions;
 import fr.ird.observe.entities.LastUpdateDate;
 import fr.ird.observe.entities.LastUpdateDateTopiaDao;
 import fr.ird.observe.entities.ObserveEntity;
@@ -37,6 +36,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Date;
+import java.util.Objects;
 import java.util.Optional;
 
 public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersistenceContext {
@@ -106,7 +106,7 @@ public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersiste
     public <E extends ObserveEntity> Class<E> getType(E entity) {
 
         ObserveEntityEnum entityEnum = ObserveEntityEnum.valueOf(entity);
-        Preconditions.checkNotNull(entityEnum, "Entity " + entity + " is not managed by ToPIA");
+        Objects.requireNonNull(entityEnum, "Entity " + entity + " is not managed by ToPIA");
         return (Class<E>) entityEnum.getContract();
 
     }
@@ -118,8 +118,7 @@ public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersiste
     public long countTable(String fullyTableName) {
 
         CountTableSqlWork countQuery = new CountTableSqlWork(fullyTableName);
-        Long count = getSqlSupport().findSingleResult(countQuery);
-        return count;
+        return getSqlSupport().findSingleResult(countQuery);
 
     }
 
@@ -134,9 +133,8 @@ public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersiste
         @Override
         public PreparedStatement prepareQuery(Connection connection) throws SQLException {
             String sql = "SELECT count(*) FROM " + fullyTableName;
-            PreparedStatement statement = connection.prepareStatement(sql);
 
-            return statement;
+            return connection.prepareStatement(sql);
         }
 
         @Override
diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java
index d4296cf..9245799 100644
--- a/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java
+++ b/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java
@@ -38,15 +38,13 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A
 
     public List<ActivityLongline> findAllStubByTripId(String tripId, int referenceLocale) {
 
-        List<ActivityLongline> result = StubSqlQuery.findAll(topiaSqlSupport, tripId, referenceLocale);
-        return result;
+        return StubSqlQuery.findAll(topiaSqlSupport, tripId, referenceLocale);
 
     }
 
     public ActivityLongline findStubByTopiaId(String activityId, int referenceLocale) {
 
-        ActivityLongline result = StubSqlQuery.find(topiaSqlSupport, activityId, referenceLocale);
-        return result;
+        return StubSqlQuery.find(topiaSqlSupport, activityId, referenceLocale);
 
     }
 
diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java b/entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java
index 3978d72..63b8bc4 100644
--- a/entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java
+++ b/entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java
@@ -22,7 +22,6 @@ package fr.ird.observe.entities.longline;
  * #L%
  */
 
-import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -31,6 +30,7 @@ import org.jdesktop.beans.AbstractSerializableBean;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -107,15 +107,14 @@ public class SectionTemplate extends AbstractSerializableBean {
         Preconditions.checkArgument(isFloatlineLengthsValid());
 
         List<Float> floatlineLengthsAsList = getFloatlineLengthsAsList();
-        boolean valid = basketsCount + 1 == floatlineLengthsAsList.size();
-        return valid;
+        return basketsCount + 1 == floatlineLengthsAsList.size();
 
     }
 
     public void applyToBaskets(List<Basket> baskets) {
 
         Preconditions.checkArgument(isFloatlineLengthsValid());
-        Preconditions.checkNotNull(baskets);
+        Objects.requireNonNull(baskets);
         Preconditions.checkArgument(!baskets.isEmpty());
         Preconditions.checkArgument(isCompiliantWithBasketCount(baskets.size()));
 
@@ -169,8 +168,8 @@ public class SectionTemplate extends AbstractSerializableBean {
 
         SectionTemplate that = (SectionTemplate) o;
 
-        return Objects.equal(floatlineLengths, that.floatlineLengths)
-               && Objects.equal(id, that.id);
+        return Objects.equals(floatlineLengths, that.floatlineLengths)
+                && Objects.equals(id, that.id);
 
     }
 
diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/Sections.java b/entities/src/main/java/fr/ird/observe/entities/longline/Sections.java
index 83f7e4f..4c12500 100644
--- a/entities/src/main/java/fr/ird/observe/entities/longline/Sections.java
+++ b/entities/src/main/java/fr/ird/observe/entities/longline/Sections.java
@@ -35,15 +35,13 @@ public class Sections {
 
     public static Basket getFirstBasket(Section section) {
 
-        Basket basket = section.isBasketEmpty() ? null : Iterables.getFirst(section.getBasket(), null);
-        return basket;
+        return section.isBasketEmpty() ? null : Iterables.getFirst(section.getBasket(), null);
 
     }
 
     public static Basket getLastBasket(Section section) {
 
-        Basket basket= section.isBasketEmpty() ? null : Iterables.getLast(section.getBasket());
-        return basket;
+        return section.isBasketEmpty() ? null : Iterables.getLast(section.getBasket());
 
     }
 }
diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/TdrTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/TdrTopiaDao.java
index dd1df71..db06494 100644
--- a/entities/src/main/java/fr/ird/observe/entities/longline/TdrTopiaDao.java
+++ b/entities/src/main/java/fr/ird/observe/entities/longline/TdrTopiaDao.java
@@ -92,8 +92,7 @@ public class TdrTopiaDao extends AbstractTdrTopiaDao<Tdr> {
 
         @Override
         public String prepareResult(ResultSet set) throws SQLException {
-            String result = set.getString(1);
-            return result;
+            return set.getString(1);
         }
 
         public void setSetId(String setId) {
diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java
index cf28b00..5e04ca8 100644
--- a/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java
+++ b/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java
@@ -66,15 +66,13 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl
 
     public List<TripLongline> findAllStubByProgramId(String programId, int referenceLocale) {
 
-        List<TripLongline> result = StubSqlQuery.findAll(topiaSqlSupport, programId, referenceLocale);
-        return result;
+        return StubSqlQuery.findAll(topiaSqlSupport, programId, referenceLocale);
 
     }
 
     public TripLongline findStubByTopiaId(String tripId, int referenceLocale) {
 
-        TripLongline result = StubSqlQuery.find(topiaSqlSupport, tripId, referenceLocale);
-        return result;
+        return StubSqlQuery.find(topiaSqlSupport, tripId, referenceLocale);
 
     }
 
@@ -403,8 +401,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl
         @Override
         public Timestamp prepareResult(ResultSet set) throws SQLException {
 
-            Timestamp result = set.getTimestamp(1);
-            return result;
+            return set.getTimestamp(1);
 
         }
 
diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java
index dbcc009..f7a7e2c 100644
--- a/entities/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java
+++ b/entities/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java
@@ -44,10 +44,9 @@ public class HarbourImpl extends HarbourAbstract {
 
     @Override
     public void setQuadrant(Integer quadrant) {
-        Integer old = quadrant;
-        fireOnPreWrite(PROPERTY_QUADRANT, old, quadrant);
+        fireOnPreWrite(PROPERTY_QUADRANT, quadrant, quadrant);
         this.quadrant = quadrant;
-        fireOnPostWrite(PROPERTY_QUADRANT, old, quadrant);
+        fireOnPostWrite(PROPERTY_QUADRANT, quadrant, quadrant);
     }
 
 }
diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java
index 3039042..db5e491 100644
--- a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java
+++ b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java
@@ -22,7 +22,6 @@ package fr.ird.observe.entities.referentiel;
  * #L%
  */
 
-import com.google.common.base.Preconditions;
 import fr.ird.observe.ObserveTopiaDaoSupplier;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -40,6 +39,7 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -133,9 +133,7 @@ public class LengthWeightParameters {
             throw new DuplicateLengthWeightParameterException(species, ocean, sex, date, list);
         }
 
-        LengthWeightParameter result = list.get(0);
-
-//        if (log.isDebugEnabled()) {
+        //        if (log.isDebugEnabled()) {
 //            StringBuilder sb = new StringBuilder("Paramétrage trouvé pour les données suivantes :");
 //            sb.append("\nEspece     : ");
 //            sb.append(getDecoratorService().decorate(species));
@@ -148,7 +146,7 @@ public class LengthWeightParameters {
 //            log.debug(sb.toString());
 //        }
 
-        return result;
+        return list.get(0);
 
     }
     /**
@@ -176,9 +174,9 @@ public class LengthWeightParameters {
                                                                          Sex sex,
                                                                          Date date) {
 
-        Preconditions.checkNotNull(daoSupplier, "daoSupplier parameter can't be null");
-        Preconditions.checkNotNull(species, "species parameter can't be null");
-        Preconditions.checkNotNull(sex, "sex parameter can't be null");
+        Objects.requireNonNull(daoSupplier, "daoSupplier parameter can't be null");
+        Objects.requireNonNull(species, "species parameter can't be null");
+        Objects.requireNonNull(sex, "sex parameter can't be null");
 
         List<LengthWeightParameter> list = findBySpecies(daoSupplier, species);
 
@@ -272,19 +270,17 @@ public class LengthWeightParameters {
     }
 
     public static boolean validateWeightRelation(LengthWeightParameter parametrage) {
-        boolean result = validateRelation(parametrage,
-                                          parametrage.getLengthWeightFormula(),
-                                          VARIABLE_TAILLE
+        return validateRelation(parametrage,
+                                parametrage.getLengthWeightFormula(),
+                                VARIABLE_TAILLE
         );
-        return result;
     }
 
     public static boolean validateLengthRelation(LengthWeightParameter parametrage) {
-        boolean result = validateRelation(parametrage,
-                                          parametrage.getWeightLengthFormula(),
-                                          VARIABLE_POIDS
+        return validateRelation(parametrage,
+                                parametrage.getWeightLengthFormula(),
+                                VARIABLE_POIDS
         );
-        return result;
     }
 
     public static Float computeLength(LengthWeightParameter parametrage,
diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java
index af8de9e..45a9b8a 100644
--- a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java
+++ b/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java
@@ -115,19 +115,17 @@ public class LengthWeightParemeterHelper {
     }
 
     public static boolean validateWeightRelation(LengthWeightParameter parametrage) {
-        boolean result = validateRelation(parametrage,
-                                          parametrage.getLengthWeightFormula(),
-                                          VARIABLE_TAILLE
+        return validateRelation(parametrage,
+                                parametrage.getLengthWeightFormula(),
+                                VARIABLE_TAILLE
         );
-        return result;
     }
 
     public static boolean validateLengthRelation(LengthWeightParameter parametrage) {
-        boolean result = validateRelation(parametrage,
-                                          parametrage.getWeightLengthFormula(),
-                                          VARIABLE_POIDS
+        return validateRelation(parametrage,
+                                parametrage.getWeightLengthFormula(),
+                                VARIABLE_POIDS
         );
-        return result;
     }
 
     public static Float computeLength(LengthWeightParameter parametrage,
diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java
index 37f8597..7a5cada 100644
--- a/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java
+++ b/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java
@@ -29,8 +29,7 @@ public class ProgramImpl extends ProgramAbstract {
     @Override
     public String getGearTypePrefix() {
 
-        String result = gearType==null?null:gearType.getPrefix();
-        return result;
+        return gearType==null?null:gearType.getPrefix();
 
     }
 
diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java
index cc321d5..c2e3923 100644
--- a/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java
+++ b/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java
@@ -36,8 +36,7 @@ import java.util.List;
 public class ProgramTopiaDao extends AbstractProgramTopiaDao<Program> {
 
     public List<Program> findAllStub(int referenceLocale) {
-        List<Program> result = StubSqlQuery.findAll(topiaSqlSupport, referenceLocale);
-        return result;
+        return StubSqlQuery.findAll(topiaSqlSupport, referenceLocale);
 
     }
 
diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java b/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java
index 152fe5d..7ffc67f 100644
--- a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java
+++ b/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java
@@ -143,8 +143,7 @@ public class ActivitySeineImpl extends ActivitySeineAbstract {
 
     @Override
     public SchoolTypePersist getSchoolType() {
-        SchoolTypePersist type = ActivitySeines.getSchoolType(this);
-        return type;
+        return ActivitySeines.getSchoolType(this);
     }
 
     @Override
diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java
index 74cdba8..1bf95ba 100644
--- a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java
+++ b/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java
@@ -38,15 +38,13 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit
 
     public List<ActivitySeine> findAllStubByRouteId(String routeId, int referenceLocale) {
 
-        List<ActivitySeine> result = StubSqlQuery.findAll(topiaSqlSupport, routeId, referenceLocale);
-        return result;
+        return StubSqlQuery.findAll(topiaSqlSupport, routeId, referenceLocale);
 
     }
 
     public ActivitySeine findStubByTopiaId(String activityId, int referenceLocale) {
 
-        ActivitySeine result = StubSqlQuery.find(topiaSqlSupport, activityId, referenceLocale);
-        return result;
+        return StubSqlQuery.find(topiaSqlSupport, activityId, referenceLocale);
 
     }
 
diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java
index e3ddbea..7f47513 100644
--- a/entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java
+++ b/entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java
@@ -38,15 +38,13 @@ public class FloatingObjectTopiaDao extends AbstractFloatingObjectTopiaDao<Float
 
     public List<FloatingObject> findAllStubByActivityId(String activityId, int referenceLocale) {
 
-        List<FloatingObject> result = StubSqlQuery.findAll(topiaSqlSupport, activityId, referenceLocale);
-        return result;
+        return StubSqlQuery.findAll(topiaSqlSupport, activityId, referenceLocale);
 
     }
 
     public FloatingObject findStubByTopiaId(String floatingObjectId, int referenceLocale) {
 
-        FloatingObject result = StubSqlQuery.find(topiaSqlSupport, floatingObjectId, referenceLocale);
-        return result;
+        return StubSqlQuery.find(topiaSqlSupport, floatingObjectId, referenceLocale);
 
     }
 
diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java
index b2f637d..a0e624e 100644
--- a/entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java
+++ b/entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java
@@ -22,10 +22,8 @@ package fr.ird.observe.entities.seine;
  * #L%
  */
 
-import com.google.common.base.Preconditions;
 import org.nuiton.topia.persistence.support.TopiaSqlQuery;
 import org.nuiton.topia.persistence.support.TopiaSqlSupport;
-import org.nuiton.topia.persistence.support.TopiaSqlWork;
 
 import java.sql.Connection;
 import java.sql.Date;
@@ -33,20 +31,19 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
+import java.util.Objects;
 
 public class RouteTopiaDao extends AbstractRouteTopiaDao<Route> {
 
     public List<Route> findAllStubByTripId(String tripSeineId) {
 
-        List<Route> result = StubSqlQuery.findAll(topiaSqlSupport, tripSeineId);
-        return result;
+        return StubSqlQuery.findAll(topiaSqlSupport, tripSeineId);
 
     }
 
     public Route findStubByTopiaId(String routeId) {
 
-        Route result = StubSqlQuery.find(topiaSqlSupport, routeId);
-        return result;
+        return StubSqlQuery.find(topiaSqlSupport, routeId);
 
     }
 
@@ -120,7 +117,7 @@ public class RouteTopiaDao extends AbstractRouteTopiaDao<Route> {
      */
     public void updateActivitiesDate(final String routeId) {
 
-        Preconditions.checkNotNull(routeId,"routeId can't be null");
+        Objects.requireNonNull(routeId, "routeId can't be null");
 
         Route route = forTopiaIdEquals(routeId).findUnique();
 
diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchs.java b/entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchs.java
index 7514876..74648e0 100644
--- a/entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchs.java
+++ b/entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchs.java
@@ -32,10 +32,9 @@ import java.util.stream.Collectors;
 public class TargetCatchs {
 
     public static List<TargetCatch> filterDiscarded(Collection<TargetCatch> source, boolean discardedFilter) {
-        List<TargetCatch> target = source.stream()
-                                         .filter(t -> discardedFilter == t.isDiscarded())
-                                         .collect(Collectors.toList());
-        return target;
+        return source.stream()
+                     .filter(t -> discardedFilter == t.isDiscarded())
+                     .collect(Collectors.toList());
     }
 
 }
diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java
index afca6b4..8299e27 100644
--- a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java
+++ b/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java
@@ -69,15 +69,13 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> {
 
     public List<TripSeine> findAllStubByProgramId(String programId, int referenceLocale) {
 
-        List<TripSeine> result = StubSqlQuery.findAll(topiaSqlSupport, programId, referenceLocale);
-        return result;
+        return StubSqlQuery.findAll(topiaSqlSupport, programId, referenceLocale);
 
     }
 
     public TripSeine findStubByTopiaId(String tripId, int referenceLocale) {
 
-        TripSeine result = StubSqlQuery.find(topiaSqlSupport, tripId, referenceLocale);
-        return result;
+        return StubSqlQuery.find(topiaSqlSupport, tripId, referenceLocale);
 
     }
 
@@ -353,8 +351,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> {
         @Override
         public Date prepareResult(ResultSet set) throws SQLException {
 
-            Date result = set.getDate(1);
-            return result;
+            return set.getDate(1);
 
         }
 
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java b/services-model/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java
index ccf7475..90f1faf 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/AbstractReferenceSet.java
@@ -50,13 +50,11 @@ public abstract class AbstractReferenceSet<D extends IdDto, R extends AbstractRe
     }
 
     public R getReferenceById(String id) {
-        R referenceDto = tryGetReferenceById(id).orElse(null);
-        return referenceDto;
+        return tryGetReferenceById(id).orElse(null);
     }
 
     public Optional<R> tryGetReferenceById(String id) {
-        Optional<R> referenceDto = references.stream().filter(AbstractReference.newIdPredicate(id)).findFirst();
-        return referenceDto;
+        return references.stream().filter(AbstractReference.newIdPredicate(id)).findFirst();
     }
 
     public R getReferenceByPosition(int index) {
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java b/services-model/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java
index ce3d8cb..0b459e7 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java
@@ -32,8 +32,7 @@ public class DataReferenceSet<R extends DataDto> extends AbstractReferenceSet<R,
     public static <R extends DataDto> DataReferenceSet<R> of(Class<R> type,
                                                              ImmutableSet<DataReference<R>> references) {
 
-        DataReferenceSet<R> referenceSet = new DataReferenceSet<>(type, references);
-        return referenceSet;
+        return new DataReferenceSet<>(type, references);
 
     }
 
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java
index 77a22c6..9933604 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java
@@ -22,10 +22,11 @@ package fr.ird.observe.services.dto;
  * #L%
  */
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration;
 
+import java.util.Objects;
+
 /**
  * Created on 22/08/15.
  *
@@ -97,18 +98,18 @@ public class DataSourceCreateConfigurationDto extends AbstractObserveDto {
     }
 
     public void setImportDatabase(byte... importDatabase) {
-        Preconditions.checkNotNull(importDatabase, "'importDatabase' can't be null.");
+        Objects.requireNonNull(importDatabase, "'importDatabase' can't be null.");
         this.optionalImportDatabase = importDatabase;
     }
 
     public void setImportReferentialDataSourceConfiguration(ObserveDataSourceConfiguration importReferentialDataSourceConfiguration) {
-        Preconditions.checkNotNull(importReferentialDataSourceConfiguration, "'importReferentialDataSourceConfiguration' can't be null.");
+        Objects.requireNonNull(importReferentialDataSourceConfiguration, "'importReferentialDataSourceConfiguration' can't be null.");
         this.optionalImportReferentialDataSourceConfiguration = importReferentialDataSourceConfiguration;
     }
 
     public void setImportDataConfiguration(ObserveDataSourceConfiguration importDataDataSourceConfiguration, ImmutableSet<String> importDataIds) {
-        Preconditions.checkNotNull(importDataDataSourceConfiguration, "'importDataDataSourceConfiguration' can't be null.");
-        Preconditions.checkNotNull(importDataIds, "'importDataIds' can't be null.");
+        Objects.requireNonNull(importDataDataSourceConfiguration, "'importDataDataSourceConfiguration' can't be null.");
+        Objects.requireNonNull(importDataIds, "'importDataIds' can't be null.");
         this.optionalImportDataDataSourceConfiguration = importDataDataSourceConfiguration;
         this.optionalImportDataIds = importDataIds;
     }
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/Form.java b/services-model/src/main/java/fr/ird/observe/services/dto/Form.java
index ac26e6a..6feb52c 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/Form.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/Form.java
@@ -56,8 +56,7 @@ public class Form<R extends IdDto> implements ObserveDto, Serializable {
                                                        R object,
                                                        String referentialReferenceSetsRequestName,
                                                        String dataReferenceSetsRequestName) {
-        Form<R> result = new Form<>(type, object, referentialReferenceSetsRequestName, dataReferenceSetsRequestName);
-        return result;
+        return new Form<>(type, object, referentialReferenceSetsRequestName, dataReferenceSetsRequestName);
     }
 
     protected Form(Class<R> type, R object, String referentialReferenceSetsRequestName, String dataReferenceSetsRequestName) {
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java b/services-model/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java
index 63d5106..c90ca8e 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java
@@ -169,8 +169,7 @@ public class DataMatrix implements ObserveDto {
     }
 
     public static DataMatrix merge(DataMatrix... incomings) {
-        DataMatrix result = merge(-1, -1, incomings);
-        return result;
+        return merge(-1, -1, incomings);
     }
 
     public static DataMatrix merge(int rows,
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java b/services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java
index 070431a..acd82a1 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java
@@ -125,8 +125,7 @@ public enum ReferentialLocale {
 
     public <E extends I18nReferentialDto> String getLabel(E i18nEntity) {
 
-        String result = I18nReferentialDtos.decorate(ordinal(), i18nEntity);
-        return result;
+        return I18nReferentialDtos.decorate(ordinal(), i18nEntity);
 
     }
 }
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java
index c720d20..0eab82b 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java
@@ -50,9 +50,8 @@ public class BlobAdapter implements JsonSerializer<Blob>, JsonDeserializer<Blob>
 
 
         try {
-            SerialBlob blob = new SerialBlob(bytes);
 
-            return blob;
+            return new SerialBlob(bytes);
 
         } catch (SQLException e) {
             throw new JsonParseException("could not create blob ", e);
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java
index 28cb9bd..bed883a 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java
@@ -74,8 +74,7 @@ public class ClassAdapter implements JsonSerializer<Class<?>>, JsonDeserializer<
     protected Class<?> loadClass(String className) {
 
         try {
-            Class<?> result = Class.forName(className);
-            return result;
+            return Class.forName(className);
         } catch (ClassNotFoundException e) {
             throw new JsonParseException("Class not found: " + className, e);
         }
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java
index 6cc8d53..352e480 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java
@@ -70,8 +70,7 @@ public class ImmutableMultimapAdapter implements JsonSerializer<ImmutableMultima
             }
         }
 
-        ImmutableMultimap result = builder.build();
-        return result;
+        return builder.build();
 
     }
 
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java
index e1e85b9..40960fb 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java
@@ -22,7 +22,6 @@ package fr.ird.observe.services.dto.gson;
  * #L%
  */
 
-import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
@@ -36,9 +35,9 @@ import fr.ird.observe.services.dto.Form;
 import fr.ird.observe.services.dto.actions.report.ReportVariable;
 import fr.ird.observe.services.dto.gson.reference.DataReferenceAdapter;
 import fr.ird.observe.services.dto.gson.reference.DataReferenceSetAdapter;
-import fr.ird.observe.services.dto.gson.reference.UnknownReferenceAdapter;
 import fr.ird.observe.services.dto.gson.reference.ReferentialReferenceAdapter;
 import fr.ird.observe.services.dto.gson.reference.ReferentialReferenceSetAdapter;
+import fr.ird.observe.services.dto.gson.reference.UnknownReferenceAdapter;
 import fr.ird.observe.services.dto.referential.ReferentialMultimap;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
 import fr.ird.observe.services.dto.referential.ReferentialReferenceSet;
@@ -46,6 +45,7 @@ import org.nuiton.version.Version;
 
 import java.sql.Blob;
 import java.util.Date;
+import java.util.function.Supplier;
 
 /**
  * @author Arnaud Thimel - thimel@codelutin.com
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java
index c5a876a..1a0c731 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java
@@ -43,16 +43,12 @@ public class VersionAdapter implements JsonSerializer<Version>, JsonDeserializer
 
         String versionStr = json.getAsString();
 
-        Version version = Versions.valueOf(versionStr);
-
-        return version;
+        return Versions.valueOf(versionStr);
     }
 
     @Override
     public JsonElement serialize(Version src, Type typeOfSrc, JsonSerializationContext context) {
 
-        JsonElement jsonElement = context.serialize(src.getVersion());
-
-        return jsonElement;
+        return context.serialize(src.getVersion());
     }
 }
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java
index 5ca6b0e..373cc57 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java
@@ -58,9 +58,7 @@ public abstract class AbstractReferenceAdapter<D extends IdDto, R extends Abstra
         String[] propertyNames = definition.getPropertyNames();
         Class<?>[] propertyTypes = definition.getPropertyTypes();
 
-        R reference = deserialize(jsonObject, context, dtoType, propertyNames, propertyTypes);
-
-        return reference;
+        return deserialize(jsonObject, context, dtoType, propertyNames, propertyTypes);
 
     }
 
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java
index c9c7ea3..3f491d6 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceSetAdapter.java
@@ -69,8 +69,7 @@ public abstract class AbstractReferenceSetAdapter<D extends IdDto, R extends Abs
 
         }
 
-        S referenceSet = newReferenceSet(dtoType, references.build(), jsonObject, context);
-        return referenceSet;
+        return newReferenceSet(dtoType, references.build(), jsonObject, context);
 
     }
 
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java
index c43e48f..c9fa27d 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java
@@ -52,8 +52,7 @@ public class DataReferenceSetAdapter<D extends DataDto> extends AbstractReferenc
 
     @Override
     protected DataReference<D> deserializeReference(JsonElement referenceJsonElement, JsonDeserializationContext context, Class<D> dtoType, String[] propertyNames, Class<?>... propertyTypes) {
-        DataReference<D> reference = referenceAdapter.deserialize(referenceJsonElement, dtoType, context);
-        return reference;
+        return referenceAdapter.deserialize(referenceJsonElement, dtoType, context);
     }
 
 }
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java
index dc8a79a..5d04232 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java
@@ -51,16 +51,13 @@ public class ReferentialReferenceSetAdapter<D extends ReferentialDto> extends Ab
             lastUpdate = context.deserialize(lastUpdateElement, Date.class);
         }
 
-        ReferentialReferenceSet<D> referenceSet = ReferentialReferenceSet.of(dtoType, references, lastUpdate);
-
-        return referenceSet;
+        return ReferentialReferenceSet.of(dtoType, references, lastUpdate);
     }
 
     @Override
     protected ReferentialReference<D> deserializeReference(JsonElement referenceJsonElement, JsonDeserializationContext context, Class<D> dtoType, String[] propertyNames, Class<?>... propertyTypes) {
 
-        ReferentialReference<D> reference = referenceAdapter.deserialize(referenceJsonElement, dtoType, context);
-        return reference;
+        return referenceAdapter.deserialize(referenceJsonElement, dtoType, context);
 
     }
 
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java b/services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java
index 2565789..3c21d48 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/longline/SectionTemplate.java
@@ -22,7 +22,6 @@ package fr.ird.observe.services.dto.longline;
  * #L%
  */
 
-import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -31,6 +30,7 @@ import org.jdesktop.beans.AbstractSerializableBean;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -107,15 +107,14 @@ public class SectionTemplate extends AbstractSerializableBean {
         Preconditions.checkArgument(isFloatlineLengthsValid());
 
         List<Float> floatlineLengthsAsList = getFloatlineLengthsAsList();
-        boolean valid = basketsCount + 1 == floatlineLengthsAsList.size();
-        return valid;
+        return basketsCount + 1 == floatlineLengthsAsList.size();
 
     }
 
     public void applyToBaskets(List<BasketDto> baskets) {
 
         Preconditions.checkArgument(isFloatlineLengthsValid());
-        Preconditions.checkNotNull(baskets);
+        Objects.requireNonNull(baskets);
         Preconditions.checkArgument(!baskets.isEmpty());
         Preconditions.checkArgument(isCompiliantWithBasketCount(baskets.size()));
 
@@ -169,8 +168,8 @@ public class SectionTemplate extends AbstractSerializableBean {
 
         SectionTemplate that = (SectionTemplate) o;
 
-        return Objects.equal(floatlineLengths, that.floatlineLengths)
-               && Objects.equal(id, that.id);
+        return Objects.equals(floatlineLengths, that.floatlineLengths)
+               && Objects.equals(id, that.id);
 
     }
 
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java
index ecb540a..9d086f6 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java
@@ -49,6 +49,7 @@ import fr.ird.observe.services.dto.seine.TripSeineDto;
 
 import java.util.Date;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
 
 /**
@@ -184,19 +185,18 @@ public enum DataReferenceSetDefinitions {
     private final ReferenceSetDefinition definition;
 
     protected static <R extends DataDto> ReferenceSetDefinition.Builder newDefinitionBuilder(Class<R> type) {
-        ReferenceSetDefinition.Builder<R> builder = ReferenceSetDefinition.builder(type);
-        return builder;
+        return ReferenceSetDefinition.builder(type);
     }
 
     public static <D extends DataDto> ReferenceSetDefinition<D> getDefinition(Class<D> type) {
         ReferenceSetDefinition<D> referenceSetDefinition = MAPPING.get(type.getName());
-        Preconditions.checkNotNull(referenceSetDefinition, "Could not find definition for type: " + type);
+        Objects.requireNonNull(referenceSetDefinition, "Could not find definition for type: " + type);
         return referenceSetDefinition;
     }
 
     public static <D extends DataDto> ReferenceSetDefinition<D> getDefinition(String name) {
         ReferenceSetDefinition<D> referenceSetDefinition = MAPPING.get(name);
-        Preconditions.checkNotNull(referenceSetDefinition, "Could not find definition for type: " + name);
+        Objects.requireNonNull(referenceSetDefinition, "Could not find definition for type: " + name);
         return referenceSetDefinition;
     }
 
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java b/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java
index ee2c28a..ba51081 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java
@@ -50,8 +50,7 @@ public class ReferenceBinderEngineSupplier implements Supplier<ReferenceBinderEn
         if (!iterator.hasNext()) {
             throw new IllegalStateException("No referenceBinderEngine defined in class-path");
         }
-        ReferenceBinderEngine result = iterator.next().get();
-        return result;
+        return iterator.next().get();
 
     }
 
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java
index 5f4c297..31e9a49 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java
@@ -22,7 +22,6 @@ package fr.ird.observe.services.dto.reference;
  * #L%
  */
 
-import com.google.common.base.Preconditions;
 import fr.ird.observe.services.dto.constants.GearType;
 import fr.ird.observe.services.dto.referential.CountryDto;
 import fr.ird.observe.services.dto.referential.FpaZoneDto;
@@ -87,6 +86,7 @@ import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto;
 import fr.ird.observe.services.dto.referential.seine.WindDto;
 
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
 
 /**
@@ -275,13 +275,13 @@ public enum ReferentialReferenceSetDefinitions {
 
     public static <D extends ReferentialDto> ReferenceSetDefinition<D> getDefinition(Class<D> type) {
         ReferenceSetDefinition<D> referenceSetDefinition = MAPPING.get(type.getName());
-        Preconditions.checkNotNull(referenceSetDefinition, "Could not find definition for type: " + type);
+        Objects.requireNonNull(referenceSetDefinition, "Could not find definition for type: " + type);
         return referenceSetDefinition;
     }
 
     public static <D extends ReferentialDto> ReferenceSetDefinition<D> getDefinition(String name) {
         ReferenceSetDefinition<D> referenceSetDefinition = MAPPING.get(name);
-        Preconditions.checkNotNull(referenceSetDefinition, "Could not find definition for type: " + name);
+        Objects.requireNonNull(referenceSetDefinition, "Could not find definition for type: " + name);
         return referenceSetDefinition;
     }
 
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java
index 0055e76..59c3853 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java
@@ -30,8 +30,7 @@ public class ProgramDto extends AbstractProgramDto {
 
     public String getGearTypePrefix() {
 
-        String result = gearType == null ? null : gearType.getPrefix();
-        return result;
+        return gearType == null ? null : gearType.getPrefix();
 
     }
 
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java
index b351ed7..3a17e89 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java
@@ -22,7 +22,6 @@ package fr.ird.observe.services.dto.referential;
  * #L%
  */
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
@@ -32,6 +31,7 @@ import com.google.common.collect.SetMultimap;
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author smaisonneuve
@@ -61,7 +61,7 @@ public class ReferentialMultimap<K extends ReferentialDto> implements SetMultima
         private final ImmutableSetMultimap.Builder builder =  ImmutableSetMultimap.builder();
 
         public <K extends ReferentialDto> Builder add(K referentialDto) {
-            Preconditions.checkNotNull(referentialDto, "Can't add a null object in ReferentialMultimap");
+            Objects.requireNonNull(referentialDto, "Can't add a null object in ReferentialMultimap");
             builder.put(referentialDto.getClass(), referentialDto);
             return this;
         }
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java
index aa5e9b4..7c63c13 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java
@@ -40,8 +40,7 @@ public class ReferentialReferenceSet<R extends ReferentialDto> extends AbstractR
                                                                            ImmutableSet<ReferentialReference<R>> references,
                                                                            Date lastUpdate) {
 
-        ReferentialReferenceSet<R> referenceSet = new ReferentialReferenceSet<>(type, references, lastUpdate);
-        return referenceSet;
+        return new ReferentialReferenceSet<>(type, references, lastUpdate);
 
     }
 
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java
index 1d15181..22770c3 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java
@@ -44,22 +44,19 @@ public class ReferentialReferences {
 
     public static <D extends ReferentialDto> List<ReferentialReference<D>> filterEnabled(Collection<ReferentialReference<D>> references) {
 
-        List<ReferentialReference<D>> result = references.stream().filter(ReferentialReference::isEnabled).collect(Collectors.toList());
-        return result;
+        return references.stream().filter(ReferentialReference::isEnabled).collect(Collectors.toList());
 
     }
 
     public static <D extends ReferentialDto> List<ReferentialReference<D>> filterContains(Collection<ReferentialReference<D>> references, Set<String> containsIds) {
 
-        List<ReferentialReference<D>> result = references.stream().filter(r -> containsIds.contains(r.getId())).collect(Collectors.toList());
-        return result;
+        return references.stream().filter(r -> containsIds.contains(r.getId())).collect(Collectors.toList());
 
     }
 
     public static <D extends ReferentialDto> List<ReferentialReference<D>> filterNotContains(Collection<ReferentialReference<D>> references, Set<String> containsIds) {
 
-        List<ReferentialReference<D>> result = references.stream().filter(r -> !containsIds.contains(r.getId())).collect(Collectors.toList());
-        return result;
+        return references.stream().filter(r -> !containsIds.contains(r.getId())).collect(Collectors.toList());
 
     }
 
diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java
index 29b4139..bb8d7c0 100644
--- a/services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java
+++ b/services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchDtos.java
@@ -32,10 +32,9 @@ import java.util.stream.Collectors;
 public class TargetCatchDtos extends AbstractTargetCatchDtos {
 
     public static List<TargetCatchDto> filterDiscarded(Collection<TargetCatchDto> source, boolean discardedFilter) {
-        List<TargetCatchDto> target = source.stream()
-                                            .filter(t -> discardedFilter == t.isDiscarded())
-                                            .collect(Collectors.toList());
-        return target;
+        return source.stream()
+                     .filter(t -> discardedFilter == t.isDiscarded())
+                     .collect(Collectors.toList());
     }
 
     public static <BeanType extends TargetCatchDto> void copyTargetCatchDto(BeanType source, BeanType target) {
diff --git a/services-model/src/main/java/fr/ird/observe/util/GPSPoint.java b/services-model/src/main/java/fr/ird/observe/util/GPSPoint.java
index 45b86ff..0a2d90c 100644
--- a/services-model/src/main/java/fr/ird/observe/util/GPSPoint.java
+++ b/services-model/src/main/java/fr/ird/observe/util/GPSPoint.java
@@ -161,8 +161,7 @@ public class GPSPoint implements Serializable {
      * @return la distance calculée entre les deux points en kilometres.
      */
     public double getDistanceInKm(GPSPoint p1) {
-        double d = getDistanceInMile(p1) * MILE_TO_KM;
-        return d;
+        return getDistanceInMile(p1) * MILE_TO_KM;
     }
 
     /**
@@ -243,8 +242,7 @@ public class GPSPoint implements Serializable {
     public long getDelay(GPSPoint p1) {
         long d0 = getTime().getTime();
         long d1 = p1.getTime().getTime();
-        long delta = d1 - d0;
-        return delta;
+        return d1 - d0;
     }
 
 }
diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml
index deca19b..d081ee1 100644
--- a/services-topia-validation/pom.xml
+++ b/services-topia-validation/pom.xml
@@ -73,10 +73,6 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
 
     <!-- ToPIA -->
 
diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySpeedValidator.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySpeedValidator.java
index 9d25414..db74ae9 100644
--- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySpeedValidator.java
+++ b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ActivitySpeedValidator.java
@@ -178,8 +178,7 @@ public class ActivitySpeedValidator extends FieldValidatorSupport {
                         pop = true;
                     }
                     try {
-                        String message = super.getMessage(object);
-                        return message;
+                        return super.getMessage(object);
                     } finally {
                         if (pop) {
                             stack.pop();
diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/CollectionUniqueKeyValidator2.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/CollectionUniqueKeyValidator2.java
index 8ac13ca..1e572dc 100644
--- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/CollectionUniqueKeyValidator2.java
+++ b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/CollectionUniqueKeyValidator2.java
@@ -39,8 +39,7 @@ public class CollectionUniqueKeyValidator2 extends CollectionUniqueKeyValidator
         if (o instanceof TopiaEntity) {
             o = ((TopiaEntity) o).getTopiaId();
         }
-        Integer uniqueKeyHashCode = super.getUniqueKeyHashCode(o);
-        return uniqueKeyHashCode;
+        return super.getUniqueKeyHashCode(o);
     }
 
     @Override
diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ObserveCollectionUniqueKeyValidator.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ObserveCollectionUniqueKeyValidator.java
index 671b9a2..9e37b3c 100644
--- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ObserveCollectionUniqueKeyValidator.java
+++ b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/ObserveCollectionUniqueKeyValidator.java
@@ -22,7 +22,6 @@ package fr.ird.observe.services.topia.validation.validators;
  * #L%
  */
 
-import com.google.common.base.Objects;
 import com.opensymphony.xwork2.validator.ValidationException;
 import org.nuiton.topia.persistence.TopiaEntity;
 import org.nuiton.validator.xwork2.field.NuitonFieldValidatorSupport;
@@ -31,6 +30,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -121,7 +121,7 @@ public class ObserveCollectionUniqueKeyValidator extends NuitonFieldValidatorSup
             index++;
 
             String topiaId = ((TopiaEntity) o).getTopiaId();
-            if (Objects.equal(topiaIdToExclude, topiaId)) {
+            if (Objects.equals(topiaIdToExclude, topiaId)) {
 
                 // Do not treate against object
                 continue;
@@ -201,8 +201,7 @@ public class ObserveCollectionUniqueKeyValidator extends NuitonFieldValidatorSup
                 o2 = ((Date)o2).getTime();
             }
 
-            boolean equals = Objects.equal(o1, o2);
-            return equals;
+            return Objects.equals(o1, o2);
 
         }
 
diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueHomeIdValidator.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueHomeIdValidator.java
index a2efabd..48379bd 100644
--- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueHomeIdValidator.java
+++ b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueHomeIdValidator.java
@@ -22,7 +22,6 @@ package fr.ird.observe.services.topia.validation.validators;
  * #L%
  */
 
-import com.google.common.base.Objects;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.validator.ValidationException;
 import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport;
@@ -30,6 +29,7 @@ import fr.ird.observe.entities.longline.ActivityLongline;
 import fr.ird.observe.entities.longline.SetLongline;
 import fr.ird.observe.entities.longline.TripLongline;
 
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -68,7 +68,7 @@ public class SetLonglineUniqueHomeIdValidator extends FieldValidatorSupport {
 
 
                 if (setLongline1 != null
-                    && !Objects.equal(setLonglineTopiaId, setLongline1.getTopiaId())
+                    && !Objects.equals(setLonglineTopiaId, setLongline1.getTopiaId())
                     && homeId.equals(setLongline1.getHomeId())) {
 
                     notValid = true;
diff --git a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueNumberValidator.java b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueNumberValidator.java
index 4e2bc26..d89c982 100644
--- a/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueNumberValidator.java
+++ b/services-topia-validation/src/main/java/fr/ird/observe/services/topia/validation/validators/SetLonglineUniqueNumberValidator.java
@@ -22,7 +22,6 @@ package fr.ird.observe.services.topia.validation.validators;
  * #L%
  */
 
-import com.google.common.base.Objects;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.validator.ValidationException;
 import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport;
@@ -30,6 +29,7 @@ import fr.ird.observe.entities.longline.ActivityLongline;
 import fr.ird.observe.entities.longline.SetLongline;
 import fr.ird.observe.entities.longline.TripLongline;
 
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -68,7 +68,7 @@ public class SetLonglineUniqueNumberValidator extends FieldValidatorSupport {
 
 
                 if (setLongline1 != null
-                    && !Objects.equal(setLonglineTopiaId, setLongline1.getTopiaId())
+                    && !Objects.equals(setLonglineTopiaId, setLongline1.getTopiaId())
                     && number.equals(setLongline1.getNumber())) {
 
                     notValid = true;
diff --git a/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java b/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java
index 85400e5..09a698a 100644
--- a/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java
+++ b/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModel.java
@@ -81,8 +81,7 @@ public class TopiaMetadataModel implements Iterable<TopiaMetadataEntity> {
         try (Reader reader = new InputStreamReader(url.openStream())) {
 
             Gson gson = new GsonBuilder().create();
-            TopiaMetadataModel metadataModel = gson.fromJson(reader, TopiaMetadataModel.class);
-            return metadataModel;
+            return gson.fromJson(reader, TopiaMetadataModel.class);
 
         }
     }

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Observe-commits] 03/08: clean code

codelutin.com scm