This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit b01793c59f6a12a0e353fa5107e84b761a3db525 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 10:59:19 2016 +0100 Refs #8168 postgresql 9.4.1208.jre7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 93574ee..13eb6ff 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ <!--<h2Version>1.4.182</h2Version>--> <!--<h2Version>1.3.176</h2Version>--> <h2Version>1.3.175</h2Version> - <postgresqlVersion>9.3-1102-jdbc41</postgresqlVersion> + <postgresqlVersion>9.4.1208.jre7</postgresqlVersion> <slf4jVersion>1.7.7</slf4jVersion> <coserVersion>1.5.6</coserVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 6e77cc35245a3bd2920bc6f0ab2f25c4cfe01ebd Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:00:41 2016 +0100 Refs #8168 sqlite-jdbc 3.8.11.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d04a0e9..db58fab 100644 --- a/pom.xml +++ b/pom.xml @@ -333,7 +333,7 @@ <dependency> <groupId>org.xerial</groupId> <artifactId>sqlite-jdbc</artifactId> - <version>3.8.7</version> + <version>3.8.11.2</version> </dependency> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 9a81ac28967c1cc9b70fdeb110ffe871da8b0267 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:01:57 2016 +0100 Refs #8168 nuiton-validator 3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 839e2ed..ce23960 100644 --- a/pom.xml +++ b/pom.xml @@ -263,7 +263,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>3.0-rc-2</version> + <version>3.0</version> </dependency> <dependency> <groupId>org.nuiton</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 0add68f5e972e527eb53297ebfc8286718a6419f Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:02:49 2016 +0100 Refs #8168 nuiton-csv 3.0-rc-5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a57607..c7e38a1 100644 --- a/pom.xml +++ b/pom.xml @@ -268,7 +268,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>3.0-rc-4</version> + <version>3.0-rc-5</version> </dependency> <dependency> <groupId>org.nuiton.web</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 2a0486b3c738755564c0ed67acadf49f7161c64c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:04:29 2016 +0100 Refs #8168 xwork-core + struts + struts plugins 2.3.28 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index af40fda..93a9670 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ <nuitonWebVersion>1.17</nuitonWebVersion> <!--<struts2Version>2.3.20</struts2Version>--> - <struts2Version>2.3.15.3</struts2Version> + <struts2Version>2.3.28</struts2Version> <!--<jqueryPluginVersion>3.7.1</jqueryPluginVersion>--> <jqueryPluginVersion>3.6.1</jqueryPluginVersion> <!--<h2Version>1.4.182</h2Version>--> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 1a78bd54d8e1f981a69c384ba2dbc235e5cb9d19 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:05:39 2016 +0100 Refs #8168 httpcomponents:httpclient 4.5.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0407306..2c7324e 100644 --- a/pom.xml +++ b/pom.xml @@ -228,7 +228,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.3.6</version> + <version>4.5.2</version> </dependency> <!-- Google --> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 999dba4cfaa67d18a90f4ba3daf8f4d8cad8a0cc Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:06:42 2016 +0100 Refs #8168 commons-collections4 4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e15d6fc..3d8ff3a 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.0</version> + <version>4.1</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 6895be001c003843b96dbdc637045b2e8dbe13d9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:08:04 2016 +0100 Refs #8168 guava 19.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b62bc8..ac17b56 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>18.0</version> + <version>19.0</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 0fadc2e8939e54f274d70af38fdbbd64a77fc0d2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:21:02 2016 +0100 Revert "Refs #8168 struts2-jquery-plugins 3.7.1" This reverts commit 33bcdb0ac895126b27574ce6db0af68b043eaa0b. --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e838c84..faecae5 100644 --- a/pom.xml +++ b/pom.xml @@ -132,9 +132,10 @@ <nuitonI18nVersion>3.4.1</nuitonI18nVersion> <nuitonWebVersion>1.17</nuitonWebVersion> + <!--<struts2Version>2.3.20</struts2Version>--> <struts2Version>2.3.28</struts2Version> - <!--<jqueryPluginVersion>3.6.1</jqueryPluginVersion>--> - <jqueryPluginVersion>3.7.1</jqueryPluginVersion> + <!--<jqueryPluginVersion>3.7.1</jqueryPluginVersion>--> + <jqueryPluginVersion>3.6.1</jqueryPluginVersion> <!--<h2Version>1.4.182</h2Version>--> <!--<h2Version>1.3.176</h2Version>--> <h2Version>1.3.175</h2Version> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 10fde427b912b864498aaf8ad46a0e6d31b00937 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:31:33 2016 +0100 Fix doc format --- src/site/en/rst/install.rst.vm | 1 + 1 file changed, 1 insertion(+) diff --git a/src/site/en/rst/install.rst.vm b/src/site/en/rst/install.rst.vm index f4ea54b..dcea242 100644 --- a/src/site/en/rst/install.rst.vm +++ b/src/site/en/rst/install.rst.vm @@ -170,6 +170,7 @@ Before starting Echobase, one should define a **echobase.log.dir** jvm variable :: JAVA_OPTS="$JAVA_OPTS -Dechobase.log.dir=/var/local/echobase/logs" + or:: CATALINA_OPTS="$CATALINA_OPTS -Dechobase.log.dir=/var/local/echobase/logs" -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit ce723d797e541f33c5d759b40bb4ef5cc84c9511 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 23 11:32:55 2016 +0100 Use inline variables when possible --- .../fr/ifremer/echobase/EchoBaseDateConverter.java | 3 +- .../echobase/config/EchoBaseConfiguration.java | 36 ++--- .../fr/ifremer/echobase/entities/DriverType.java | 6 +- .../EchoBaseUserTopiaApplicationContext.java | 6 +- .../EchoBaseUserTopiaPersistenceContext.java | 3 +- .../echobase/entities/ExportQueryTopiaDao.java | 6 +- .../echobase/entities/data/CategoryTopiaDao.java | 6 +- .../echobase/entities/data/CellTopiaDao.java | 15 +- .../fr/ifremer/echobase/entities/data/Cells.java | 12 +- .../echobase/entities/references/CellTypes.java | 15 +- .../echobase/entities/references/Gears.java | 5 +- .../fr/ifremer/echobase/io/EchoBaseIOUtil.java | 3 +- .../echobase/persistence/EchoBaseEntityHelper.java | 13 +- .../EchobaseTopiaApplicationContexts.java | 3 +- .../echobase/persistence/JdbcConfiguration.java | 3 +- .../internalDb/MigrationCallBackForVersion2_2.java | 3 +- .../services/DefaultEchoBaseServiceContext.java | 3 +- .../echobase/services/service/CoserApiService.java | 3 +- .../echobase/services/service/DbEditorService.java | 12 +- .../services/service/DecoratorService.java | 3 +- .../services/service/UserDbPersistenceService.java | 167 +++++++-------------- .../echobase/services/service/UserService.java | 9 +- .../service/exportCoser/ExportCoserService.java | 3 +- .../services/service/exportdb/ExportService.java | 19 +-- .../service/exportquery/ExportQueryService.java | 18 +-- .../service/exportquery/GenericSQLQuery.java | 10 +- .../importdata/AbstractImportDataService.java | 18 +-- .../service/importdata/csv/MapCellImportModel.java | 3 +- .../importdata/csv/RegionCellImportModel.java | 3 +- .../importdb/EchoBaseImportModelFactory.java | 10 +- .../importdb/strategy/EchoBaseImportStrategy.java | 3 +- .../strategy/AcousticRemoveDataStrategy.java | 11 +- .../strategy/CatchesRemoveDataStrategy.java | 6 +- .../strategy/CommonAllRemoveDataStrategy.java | 21 ++- .../strategy/CommonTransectRemoveDataStrategy.java | 15 +- .../strategy/CommonTransitRemoveDataStrategy.java | 17 +-- .../strategy/CommonVoyageRemoveDataStrategy.java | 21 ++- .../strategy/LegacyVoyageRemoveDataStrategy.java | 21 ++- .../strategy/OperationRemoveDataStrategy.java | 6 +- .../strategy/ResultEsduRemoveDataStrategy.java | 6 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 6 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 6 +- .../strategy/ResultRegionRemoveDataStrategy.java | 6 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 9 +- .../services/service/spatial/GisService.java | 3 +- .../services/service/spatial/LizmapRepository.java | 6 +- .../workingDb/WorkingDbConfigurationService.java | 7 +- .../services/FakeEchoBaseServiceContext.java | 6 +- .../removedata/AbstractRemoveDataServiceTest.java | 3 +- .../echobase/ui/EchoBaseApplicationContext.java | 12 +- .../fr/ifremer/echobase/ui/EchoBaseSession.java | 12 +- .../echobase/ui/actions/EchoBaseActionSupport.java | 9 +- .../ui/actions/embeddedApplication/Build.java | 5 +- .../ui/interceptors/AbstractCheckInterceptor.java | 3 +- .../ui/interceptors/CheckLogguedInterceptor.java | 7 +- .../ui/interceptors/EchoBaseInjectInterceptor.java | 17 +-- .../validators/EchoBaseFieldValidatorSupport.java | 3 +- 57 files changed, 241 insertions(+), 425 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java b/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java index 1783a33..2ca5989 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseDateConverter.java @@ -64,8 +64,7 @@ public class EchoBaseDateConverter extends DateTimeConverter { if (getDefaultType().equals(targetType) && value instanceof String) { // let's do our own stuff - Date parse = format.parse((String) value); - return parse; + return format.parse((String) value); } return super.convertToType(targetType, value); } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java index 1f0dd98..3af8af3 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java @@ -157,8 +157,7 @@ public class EchoBaseConfiguration { } public Properties getProperties() { - Properties result = applicationConfig.getFlatOptions(); - return result; + return applicationConfig.getFlatOptions(); } public File getDataDirectory() { @@ -204,8 +203,7 @@ public class EchoBaseConfiguration { } public File getDefaultLogDirectory() { - File file = new File(getDataDirectory(), "log"); - return file; + return new File(getDataDirectory(), "log"); } public char getCsvSeparator() { @@ -237,14 +235,12 @@ public class EchoBaseConfiguration { } public boolean isEmbedded() { - boolean result = applicationConfig.getOptionAsBoolean( + return applicationConfig.getOptionAsBoolean( EchoBaseConfigurationOption.EMBEDDED.key); - return result; } public URL getDocumentationUrl() { - URL result = applicationConfig.getOptionAsURL(EchoBaseConfigurationOption.DOCUMENTATION_URL.key); - return result; + return applicationConfig.getOptionAsURL(EchoBaseConfigurationOption.DOCUMENTATION_URL.key); } public String getDocumentationUrl(Locale locale) { @@ -259,19 +255,16 @@ public class EchoBaseConfiguration { } public URL getCoserApiURL() { - URL result = applicationConfig.getOptionAsURL( + return applicationConfig.getOptionAsURL( EchoBaseConfigurationOption.COSER_API_URL.key); - return result; } public boolean getOptionAsBoolean(String propertyName) { - boolean result = applicationConfig.getOptionAsBoolean(propertyName); - return result; + return applicationConfig.getOptionAsBoolean(propertyName); } public boolean isUpdateSchema() { - boolean result = applicationConfig.getOptionAsBoolean(OPTION_UPDATE_SCHEMA); - return result; + return applicationConfig.getOptionAsBoolean(OPTION_UPDATE_SCHEMA); } public File getGisTemplatesDirectory() { @@ -282,13 +275,11 @@ public class EchoBaseConfiguration { } public File getQgisDefaultTemplateFile() { - File file = new File(getGisTemplatesDirectory(), QGIS_DEFAULT_TEMPLATE_NAME); - return file; + return new File(getGisTemplatesDirectory(), QGIS_DEFAULT_TEMPLATE_NAME); } public File getLizmapDefaultTemplateFile() { - File file = new File(getGisTemplatesDirectory(), LIZMAP_DEFAULT_TEMPLATE_NAME); - return file; + return new File(getGisTemplatesDirectory(), LIZMAP_DEFAULT_TEMPLATE_NAME); } public File getQgisTemplateFile() { @@ -327,19 +318,16 @@ public class EchoBaseConfiguration { } public String getLizmapApplicationJdbcUrl() { - String jdbcUrl = applicationConfig.getOption( + return applicationConfig.getOption( EchoBaseConfigurationOption.LIZMAP_APPLICATION_JDBC_URL.key); - return jdbcUrl; } public String getLizmapApplicationMapUrl() { - String url = applicationConfig.getOption(EchoBaseConfigurationOption.LIZMAP_APPLICATION_MAP_URL.key); - return url; + return applicationConfig.getOption(EchoBaseConfigurationOption.LIZMAP_APPLICATION_MAP_URL.key); } public String getLizmapRepositoryName() { - String repository = applicationConfig.getOption(EchoBaseConfigurationOption.LIZMAP_REPOSITORY_NAME.key); - return repository; + return applicationConfig.getOption(EchoBaseConfigurationOption.LIZMAP_REPOSITORY_NAME.key); } /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java index bfb5a1f..a9568d1 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java @@ -41,8 +41,7 @@ public enum DriverType implements I18nAble { n("echobase.common.driverType.h2")) { @Override public String getPilotVersion(EchoBaseConfiguration config) { - String version = config.getH2Version(); - return version; + return config.getH2Version(); } }, POSTGRESQL(org.postgresql.Driver.class, @@ -50,8 +49,7 @@ public enum DriverType implements I18nAble { n("echobase.common.driverType.postgres")) { @Override public String getPilotVersion(EchoBaseConfiguration config) { - String version = config.getPostgresqlVersion(); - return version; + return config.getPostgresqlVersion(); } }; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java index 5f694cc..9f95cb8 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java @@ -62,8 +62,7 @@ public class EchoBaseUserTopiaApplicationContext extends AbstractEchoBaseUserTop @Override public EchoBaseUserTopiaPersistenceContext newPersistenceContext() { - EchoBaseUserTopiaPersistenceContext persistenceContext = newPersistenceContext(true); - return persistenceContext; + return newPersistenceContext(true); } @@ -141,8 +140,7 @@ public class EchoBaseUserTopiaApplicationContext extends AbstractEchoBaseUserTop private boolean computeSpatialSupport(EchoBaseUserTopiaPersistenceContext persistenceContext) { String dialect = persistenceContext.getHibernateSupport().getHibernateConfiguration().getProperty(Environment.DIALECT); - boolean result = DriverType.POSTGRESQL.getDialectClass().getName().equals(dialect); - return result; + return DriverType.POSTGRESQL.getDialectClass().getName().equals(dialect); } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java index d09114d..22e49c0 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java @@ -75,8 +75,7 @@ public class EchoBaseUserTopiaPersistenceContext extends AbstractEchoBaseUserTop public boolean isPostgresql() { String dialect = getHibernateSupport().getHibernateConfiguration().getProperty(Environment.DIALECT); - boolean result = DriverType.POSTGRESQL.getDialectClass().getName().equals(dialect); - return result; + return DriverType.POSTGRESQL.getDialectClass().getName().equals(dialect); } } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryTopiaDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryTopiaDao.java index 24c8e22..363c56d 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryTopiaDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryTopiaDao.java @@ -26,14 +26,12 @@ import org.nuiton.topia.persistence.TopiaException; public class ExportQueryTopiaDao extends AbstractExportQueryTopiaDao<ExportQuery> { public boolean isQueryExists(String queryName) throws TopiaException { - boolean result = forNameEquals(queryName).exists(); - return result; + return forNameEquals(queryName).exists(); } public boolean isQueryExists(String id, String queryName) throws TopiaException { - boolean result = forNameEquals(queryName). + return forNameEquals(queryName). addNotEquals(ExportQuery.PROPERTY_TOPIA_ID, id). exists(); - return result; } } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryTopiaDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryTopiaDao.java index 6805b1e..2ff1c76 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryTopiaDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CategoryTopiaDao.java @@ -32,16 +32,14 @@ public class CategoryTopiaDao extends AbstractCategoryTopiaDao<Category> { public List<Category> getCategoryUsingEchotype(Voyage voyage) throws TopiaException { String hql = "SELECT DISTINCT c FROM VoyageImpl v, CategoryImpl c WHERE " + "v = :voyage AND c.echotype in elements(v.echotype)"; - List<Category> result = forHql(hql, "voyage", voyage).findAll(); - return result; + return forHql(hql, "voyage", voyage).findAll(); } public long countCategoryUsingEchotype(Voyage voyage) { String hql = "SELECT COUNT(DISTINCT c) FROM VoyageImpl v, CategoryImpl c WHERE " + "v = :voyage AND c.echotype in elements(v.echotype)"; try { - Long result = findUnique(hql, TopiaUtil.convertPropertiesArrayToMap("voyage", voyage)); - return result; + return findUnique(hql, TopiaUtil.convertPropertiesArrayToMap("voyage", voyage)); } catch (TopiaException e) { throw new EchoBaseTechnicalException(e); } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellTopiaDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellTopiaDao.java index a9ce6e4..5ebf017 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellTopiaDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/CellTopiaDao.java @@ -36,27 +36,23 @@ public class CellTopiaDao extends AbstractCellTopiaDao<Cell> { public long countVoyageOrphanCells(Voyage voyage) { TopiaSqlQuery<Long> query = newCountVoyageOrphanCellsQuery(voyage); - Long result = topiaSqlSupport.findSingleResult(query); - return result; + return topiaSqlSupport.findSingleResult(query); } public long countVoyageCellResults(Voyage voyage) { TopiaSqlQuery<Long> query = newCountVoyageCellResultsQuery(voyage); - Long result = topiaSqlSupport.findSingleResult(query); - return result; + return topiaSqlSupport.findSingleResult(query); } public List<String> getVoyageCellIds() throws TopiaException { TopiaSqlQuery<String> query = newVoyageCellIdsQuery(); - List<String> cellIds = topiaSqlSupport.findMultipleResult(query); - return cellIds; + return topiaSqlSupport.findMultipleResult(query); } public List<String> getVoyageCellIds(Voyage voyage) throws TopiaException { TopiaSqlQuery<String> query = newVoyageCellIdsQuery(voyage); - List<String> cellIds = topiaSqlSupport.findMultipleResult(query); - return cellIds; + return topiaSqlSupport.findMultipleResult(query); } public ValueParser<Cell> newCellValueParser(Voyage voyage) { @@ -122,8 +118,7 @@ public class CellTopiaDao extends AbstractCellTopiaDao<Cell> { public PreparedStatement prepareQuery(Connection connection) throws SQLException { String hql = "SELECT c.topiaid FROM Cell c " + "WHERE c.cell IS NULL AND c.dataprocessing IS NULL AND c.voyage IS NULL"; - PreparedStatement result = connection.prepareStatement(hql); - return result; + return connection.prepareStatement(hql); } @Override diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Cells.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Cells.java index fd18932..187f760 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Cells.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Cells.java @@ -42,9 +42,8 @@ public class Cells { @Override public boolean apply(Cell input) { CellType cellType = input.getCellType(); - boolean result = cellType != null && + return cellType != null && CellTypes.IS_REGION_CELL_TYPE.apply(cellType); - return result; } }; @@ -52,9 +51,8 @@ public class Cells { @Override public boolean apply(Cell input) { CellType cellType = input.getCellType(); - boolean result = cellType != null && + return cellType != null && CellTypes.IS_MAP_CELL_TYPE.apply(cellType); - return result; } }; @@ -62,9 +60,8 @@ public class Cells { @Override public boolean apply(Cell input) { CellType cellType = input.getCellType(); - boolean result = cellType != null && + return cellType != null && CellTypes.IS_ELEMENTARY_CELL_TYPE.apply(cellType); - return result; } }; @@ -72,9 +69,8 @@ public class Cells { @Override public boolean apply(Cell input) { CellType cellType = input.getCellType(); - boolean result = cellType != null && + return cellType != null && CellTypes.IS_ESDU_CELL_TYPE.apply(cellType); - return result; } }; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypes.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypes.java index fce41ba..9c0f9c6 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypes.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypes.java @@ -40,8 +40,7 @@ public class CellTypes { @Override public boolean apply(CellType input) { - boolean result = CellTypeImpl.ESDU.equals(input.getId().toLowerCase()); - return result; + return CellTypeImpl.ESDU.equals(input.getId().toLowerCase()); } }; @@ -49,8 +48,7 @@ public class CellTypes { @Override public boolean apply(CellType input) { - boolean result = CellTypeImpl.ELEMENTARY.equals(input.getId().toLowerCase()); - return result; + return CellTypeImpl.ELEMENTARY.equals(input.getId().toLowerCase()); } }; @@ -62,8 +60,7 @@ public class CellTypes { @Override public boolean apply(CellType input) { - boolean result = acceptedNames.contains(input.getId()); - return result; + return acceptedNames.contains(input.getId()); } }; @@ -74,8 +71,7 @@ public class CellTypes { @Override public boolean apply(CellType input) { - boolean result = acceptedNames.contains(input.getId()); - return result; + return acceptedNames.contains(input.getId()); } }; @@ -87,8 +83,7 @@ public class CellTypes { @Override public boolean apply(CellType input) { - boolean result = acceptedNames.contains(input.getId()); - return result; + return acceptedNames.contains(input.getId()); } }; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java index 4865b41..52a60df 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java @@ -34,9 +34,8 @@ public class Gears { @Override public String apply(Gear input) { //FIXME : Remove the dummy test when all gear in db have a casino name - String casinoGearName = input.getCasinoGearName(); -// return StringUtils.isEmpty(casinoGearName) ? input.getName() : casinoGearName; - return casinoGearName; + // return StringUtils.isEmpty(casinoGearName) ? input.getName() : casinoGearName; + return input.getCasinoGearName(); } }; } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java b/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java index 6040c81..9f1c4ea 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java @@ -242,8 +242,7 @@ public class EchoBaseIOUtil { } public static boolean isExecutableFile(File file) { - boolean isExecutableFile = (file != null && file.exists() && file.canExecute() && !file.isDirectory()); - return isExecutableFile; + return (file != null && file.exists() && file.canExecute() && !file.isDirectory()); } public static void forceMkdir(File directory) { diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java index d244b57..043475b 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java @@ -130,14 +130,13 @@ public class EchoBaseEntityHelper { Preconditions.checkArgument( DriverType.POSTGRESQL.equals(driverType), "Can't create a meta configuration for a none postgresql database."); - JdbcConfiguration metaConfiguration = JdbcConfiguration.newConfig( + + return JdbcConfiguration.newConfig( driverType, connectUrl, jdbcConfiguration.getLogin(), jdbcConfiguration.getPassword() ); - - return metaConfiguration; } public static void closeConnection(AbstractTopiaPersistenceContext transaction) { @@ -176,9 +175,7 @@ public class EchoBaseEntityHelper { */ public static boolean isInternalSchemaCreated(EchoBaseInternalTopiaApplicationContext tx) throws TopiaException { - boolean schemaFound = tx.isTableExists(EchoBaseUserImpl.class); - - return schemaFound; + return tx.isTableExists(EchoBaseUserImpl.class); } /** @@ -191,8 +188,6 @@ public class EchoBaseEntityHelper { */ public static boolean isWorkingDbSchemaCreated(EchoBaseUserTopiaApplicationContext tx) throws TopiaException { - boolean schemaFound = tx.isTableExists(VoyageImpl.class); - - return schemaFound; + return tx.isTableExists(VoyageImpl.class); } } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaApplicationContexts.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaApplicationContexts.java index 665fa76..6b72970 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaApplicationContexts.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaApplicationContexts.java @@ -69,8 +69,7 @@ public class EchobaseTopiaApplicationContexts { */ public static EchoBaseUserTopiaApplicationContext newWorkingDb(JdbcConfiguration jdbcConfiguration) { - EchoBaseUserTopiaApplicationContext result = newUserDb(jdbcConfiguration, true); - return result; + return newUserDb(jdbcConfiguration, true); } /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java index c4458dc..d5af40d 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/JdbcConfiguration.java @@ -59,8 +59,7 @@ public class JdbcConfiguration implements Serializable { String databaseAbsolutePath = databaseFile.getAbsolutePath(); String url = "jdbc:h2:file:" + databaseAbsolutePath + "/echobase;LOG=0;CACHE_SIZE=65536;LOCK_MODE=0;UNDO_LOG=0"; - JdbcConfiguration result = newConfig(DriverType.H2, url, "sa", "sa"); - return result; + return newConfig(DriverType.H2, url, "sa", "sa"); } private static final long serialVersionUID = 1L; diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java index ecdcd13..79fa708 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java @@ -75,8 +75,7 @@ public class MigrationCallBackForVersion2_2 extends MigrationCallBackForVersion TopiaSqlQuery<ExportQuery> query = new TopiaSqlQuery<ExportQuery>() { @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { - PreparedStatement result = connection.prepareStatement("select topiaid, name from exportquery;"); - return result; + return connection.prepareStatement("select topiaid, name from exportquery;"); } @Override diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java index d770b88..a4a3c0b 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java @@ -127,8 +127,7 @@ public class DefaultEchoBaseServiceContext implements EchoBaseServiceContext { @Override public String getUserDbUrl() { - String result = getEchoBaseUserPersistenceContext().getUrl(); - return result; + return getEchoBaseUserPersistenceContext().getUrl(); } @Override diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserApiService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserApiService.java index 35f1c41..75e0e97 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserApiService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserApiService.java @@ -121,8 +121,7 @@ public class CoserApiService extends EchoBaseServiceSupport { try { Map<String, T> resultcontent = new GsonBuilder().create().fromJson(stringContent, type); - T result = resultcontent.get("data"); - return result; + return resultcontent.get("data"); } catch (Exception e) { throw new EchoBaseTechnicalException("Could not obtain response content from: " + action, e); } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java index ba61704..0fcab32 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java @@ -101,8 +101,7 @@ public class DbEditorService extends EchoBaseServiceSupport { try { TopiaDao<E> dao = persistenceContext.getDao(entityType); - List<E> result = dao.findAll(); - return result; + return dao.findAll(); } catch (TopiaException eee) { throw new EchoBaseTechnicalException("Could not obtain data", eee); } @@ -110,8 +109,7 @@ public class DbEditorService extends EchoBaseServiceSupport { public TableMeta<EchoBaseUserEntityEnum> getTableMeta(EchoBaseUserEntityEnum tableName) { DbMeta<EchoBaseUserEntityEnum> dbMeta = getDbMeta(); - TableMeta<EchoBaseUserEntityEnum> result = dbMeta.getTable(tableName); - return result; + return dbMeta.getTable(tableName); } public Map<?, ?>[] getData(EchoBaseUserEntityEnum type, TopiaPagerBean pager) { @@ -165,8 +163,7 @@ public class DbEditorService extends EchoBaseServiceSupport { PagerBeanUtil.computeRecordIndexesAndPagesNumber(pager); } - List<E> result = dao.find(hql, hqlParameters, pager); - return result; + return dao.find(hql, hqlParameters, pager); } catch (TopiaException eee) { throw new EchoBaseTechnicalException("Could not obtain data", eee); } @@ -183,8 +180,7 @@ public class DbEditorService extends EchoBaseServiceSupport { hql += " WHERE " + extraWhereQuery; } hql += " ORDER BY e.id"; - Iterable<E> result = dao.forHql(hql, Collections.<String, Object>emptyMap()).findAllLazy(5000); - return result; + return dao.forHql(hql, Collections.<String, Object>emptyMap()).findAllLazy(5000); } catch (TopiaException eee) { throw new EchoBaseTechnicalException("Could not obtain data", eee); } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java index 04f7d2a..4c19c44 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java @@ -128,8 +128,7 @@ public class DecoratorService extends EchoBaseServiceSupport { public String decorate(Object o, String context) { Decorator<?> decorator = getDecorator(o.getClass(), context); - String result = decorator.toString(o); - return result; + return decorator.toString(o); } public final <E extends Enum<E> & I18nAble> Map<String, String> decorateEnums(E... enumValues) { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java index 73394b3..67d81cd 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java @@ -131,11 +131,10 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { public AgeCategory createAgeCategory(String ageCategoryName, String ageCategoryMeaning) { - AgeCategory ageCategory = persistenceContext.getAgeCategoryDao().create( + return persistenceContext.getAgeCategoryDao().create( AgeCategory.PROPERTY_NAME, ageCategoryName, AgeCategory.PROPERTY_MEANING, ageCategoryMeaning ); - return ageCategory; } //------------------------------------------------------------------------// @@ -143,9 +142,8 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public AreaOfOperation getAreaOfOperation(String id) { - AreaOfOperation areaOfOperation = persistenceContext.getAreaOfOperationDao(). + return persistenceContext.getAreaOfOperationDao(). findByTopiaId(id); - return areaOfOperation; } //------------------------------------------------------------------------// @@ -154,46 +152,40 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { public Category getCategoryByEchotypeAndSpeciesCategory(Echotype echotype, SpeciesCategory speciesCategory) { - Category category = persistenceContext.getCategoryDao().forProperties( + return persistenceContext.getCategoryDao().forProperties( Category.PROPERTY_ECHOTYPE, echotype, Category.PROPERTY_SPECIES_CATEGORY, speciesCategory ).findAnyOrNull(); - return category; } public List<Category> getCategoryUsingEchotype(Voyage voyage) throws TopiaException { - List<Category> result = persistenceContext.getCategoryDao(). + return persistenceContext.getCategoryDao(). getCategoryUsingEchotype(voyage); - return result; } public List<Category> getCategorysByEchotype(Echotype echotype) { - List<Category> result = persistenceContext.getCategoryDao().forEchotypeEquals(echotype).findAll(); - return result; + return persistenceContext.getCategoryDao().forEchotypeEquals(echotype).findAll(); } public Iterable<Category> getCategories(Predicate<Category> acceptPredicate) { - Iterable<Category> result = Iterables.filter( + return Iterables.filter( persistenceContext.getCategoryDao(), acceptPredicate); - return result; } public long countCategoryUsingEchotype(Voyage voyage) throws TopiaException { - long result = persistenceContext.getCategoryDao(). + return persistenceContext.getCategoryDao(). countCategoryUsingEchotype(voyage); - return result; } public Category createCategory(Echotype echotype, SpeciesCategory speciesCategory) { - Category category = persistenceContext.getCategoryDao().create( + return persistenceContext.getCategoryDao().create( Category.PROPERTY_ECHOTYPE, echotype, Category.PROPERTY_SPECIES_CATEGORY, speciesCategory ); - return category; } public void deleteCategory(Category category) { @@ -238,15 +230,13 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { public Cell createCell(CellType cellType, String cellName) { - Cell cell = persistenceContext.getCellDao().create( + return persistenceContext.getCellDao().create( Cell.PROPERTY_CELL_TYPE, cellType, Cell.PROPERTY_NAME, cellName); - return cell; } public Cell createCell(Cell cell) { - Cell cellCreated = persistenceContext.getCellDao().create(cell); - return cellCreated; + return persistenceContext.getCellDao().create(cell); } public void deleteCell(Cell cell) { @@ -263,13 +253,11 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { } public CellType getCellType(String id) { - CellType cellType = persistenceContext.getCellTypeDao().findByTopiaId(id); - return cellType; + return persistenceContext.getCellTypeDao().findByTopiaId(id); } public CellType getCellTypeById(String id) { - CellType cellType = persistenceContext.getCellTypeDao().forIdEquals(id).findUnique(); - return cellType; + return persistenceContext.getCellTypeDao().forIdEquals(id).findUnique(); } //------------------------------------------------------------------------// @@ -277,11 +265,10 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public Data createData(DataMetadata dataMetaData, String dataValue) { - Data data = persistenceContext.getDataDao().create( + return persistenceContext.getDataDao().create( Data.PROPERTY_DATA_METADATA, dataMetaData, Data.PROPERTY_DATA_VALUE, dataValue ); - return data; } //------------------------------------------------------------------------// @@ -293,11 +280,9 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { } public DataAcquisition createDataAcquisition(AcousticInstrument instrument) { - DataAcquisition dataAcquisition = - persistenceContext.getDataAcquisitionDao().create( - DataAcquisition.PROPERTY_ACOUSTIC_INSTRUMENT, instrument - ); - return dataAcquisition; + return persistenceContext.getDataAcquisitionDao().create( + DataAcquisition.PROPERTY_ACOUSTIC_INSTRUMENT, instrument + ); } public void deleteDataAcquisition(DataAcquisition dataAcquisition) { @@ -309,21 +294,18 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public DataMetadata getDataMetadata(String id) { - DataMetadata dataMetadata = persistenceContext.getDataMetadataDao(). + return persistenceContext.getDataMetadataDao(). findByTopiaId(id); - return dataMetadata; } public DataMetadata getDataMetadataByName(String name) { - DataMetadata dataMetadata = persistenceContext.getDataMetadataDao(). + return persistenceContext.getDataMetadataDao(). forNameEquals(name).findUnique(); - return dataMetadata; } public DataMetadata tryToGetDataMetadataByName(String name) { - DataMetadata dataMetadata = persistenceContext.getDataMetadataDao(). + return persistenceContext.getDataMetadataDao(). forNameEquals(name).findUniqueOrNull(); - return dataMetadata; } public List<DataMetadata> getDataMetadatasInName(Set<String> names) { @@ -409,21 +391,18 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { public DataProcessing createDataProcessing(String id, String processingTemplate) { - DataProcessing dataAcquisition = persistenceContext.getDataProcessingDao().create( + return persistenceContext.getDataProcessingDao().create( DataProcessing.PROPERTY_ID, id, DataProcessing.PROPERTY_PROCESSING_TEMPLATE, processingTemplate ); - return dataAcquisition; } public DataProcessing getDataProcessing(String id) { - DataProcessing dataAcquisition = persistenceContext.getDataProcessingDao().findByTopiaId(id); - return dataAcquisition; + return persistenceContext.getDataProcessingDao().findByTopiaId(id); } public DataProcessing getDataProcessingContainsCell(Cell cell) { - DataProcessing dataAcquisition = persistenceContext.getDataProcessingDao().forCellContains(cell).findAnyOrNull(); - return dataAcquisition; + return persistenceContext.getDataProcessingDao().forCellContains(cell).findAnyOrNull(); } //------------------------------------------------------------------------// @@ -439,8 +418,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { } public Echotype createEchotype(Echotype echotype) { - Echotype echotypeCreated = persistenceContext.getEchotypeDao().create(echotype); - return echotypeCreated; + return persistenceContext.getEchotypeDao().create(echotype); } public void deleteEchotype(Echotype echotype) { @@ -456,14 +434,13 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { String userEmail, Date date, String comment) { - EntityModificationLog result = persistenceContext.getEntityModificationLogDao().create( + return persistenceContext.getEntityModificationLogDao().create( EntityModificationLog.PROPERTY_ENTITY_TYPE, entityType, EntityModificationLog.PROPERTY_ENTITY_ID, entityId, EntityModificationLog.PROPERTY_MODIFICATION_USER, userEmail, EntityModificationLog.PROPERTY_MODIFICATION_DATE, date, EntityModificationLog.PROPERTY_MODIFICATION_TEXT, comment ); - return result; } //------------------------------------------------------------------------// @@ -471,8 +448,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public GearMetadataValue createGearMetadataValue(GearMetadataValue gearMetadataValue) { - GearMetadataValue gearMetadataValueCreated = persistenceContext.getGearMetadataValueDao().create(gearMetadataValue); - return gearMetadataValueCreated; + return persistenceContext.getGearMetadataValueDao().create(gearMetadataValue); } //------------------------------------------------------------------------// @@ -493,14 +469,13 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { Date date, String comment, List<String> importIds) { - ImportLog importLog = persistenceContext.getImportLogDao().create( + return persistenceContext.getImportLogDao().create( ImportLog.PROPERTY_VOYAGE_ID, voyageId, ImportLog.PROPERTY_IMPORT_TYPE, importType, ImportLog.PROPERTY_IMPORT_USER, userEMail, ImportLog.PROPERTY_IMPORT_DATE, date, ImportLog.PROPERTY_IMPORT_TEXT, comment, ImportLog.PROPERTY_IMPORT_ID, importIds); - return importLog; } public void deleteImportLog(ImportLog importLog) { @@ -539,10 +514,9 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { throw new EchoBaseTechnicalException("Could not serialize file content " + file, e); } - ImportFile importFile = persistenceContext.getImportFileDao().create( + return persistenceContext.getImportFileDao().create( ImportFile.PROPERTY_NAME, inputFile.getFileName(), ImportFile.PROPERTY_FILE, serialBlob); - return importFile; } @@ -555,8 +529,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { public ImportFile getImportFile(String importFileId) { - ImportFile importFile = persistenceContext.getImportFileDao().findByTopiaId(importFileId); - return importFile; + return persistenceContext.getImportFileDao().findByTopiaId(importFileId); } @@ -574,8 +547,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { } public LengthAgeKey createLengthAgeKey(LengthAgeKey lengthAgeKey) { - LengthAgeKey lengthAgeKeyCreated = persistenceContext.getLengthAgeKeyDao().create(lengthAgeKey); - return lengthAgeKeyCreated; + return persistenceContext.getLengthAgeKeyDao().create(lengthAgeKey); } public void deleteLengthAgeKey(LengthAgeKey lengthAgeKey) { @@ -591,8 +563,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { } public LengthWeightKey createLengthWeightKey(LengthWeightKey lengthWeightKey) { - LengthWeightKey lengthWeightKeyCreated = persistenceContext.getLengthWeightKeyDao().create(lengthWeightKey); - return lengthWeightKeyCreated; + return persistenceContext.getLengthWeightKeyDao().create(lengthWeightKey); } public void deleteLengthWeightKey(LengthWeightKey lengthAgeKey) { @@ -604,18 +575,15 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public Mission getMission(String id) { - Mission mission = persistenceContext.getMissionDao().findByTopiaId(id); - return mission; + return persistenceContext.getMissionDao().findByTopiaId(id); } public boolean isMissionExistByName(String missionname) { - boolean result = persistenceContext.getMissionDao().forNameEquals(missionname).exists(); - return result; + return persistenceContext.getMissionDao().forNameEquals(missionname).exists(); } public Mission createMission(Mission mission) { - Mission missionCreated = persistenceContext.getMissionDao().create(mission); - return missionCreated; + return persistenceContext.getMissionDao().create(mission); } //------------------------------------------------------------------------// @@ -627,13 +595,11 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { } public Operation getOperationContainsSample(Sample sample) { - Operation dataAcquisition = persistenceContext.getOperationDao().forSampleContains(sample).findAnyOrNull(); - return dataAcquisition; + return persistenceContext.getOperationDao().forSampleContains(sample).findAnyOrNull(); } public Operation createOperation(Operation operation) { - Operation operationCreated = persistenceContext.getOperationDao().create(operation); - return operationCreated; + return persistenceContext.getOperationDao().create(operation); } public void deleteOperation(Operation operation) { @@ -645,8 +611,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public OperationMetadataValue createOperationMetadataValue(OperationMetadataValue operationMetadataValue) { - OperationMetadataValue operationMetadataValueCreated = persistenceContext.getOperationMetadataValueDao().create(operationMetadataValue); - return operationMetadataValueCreated; + return persistenceContext.getOperationMetadataValueDao().create(operationMetadataValue); } //------------------------------------------------------------------------// @@ -673,8 +638,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { } public Result createResult(Result result) { - Result resultCreated = persistenceContext.getResultDao().create(result); - return resultCreated; + return persistenceContext.getResultDao().create(result); } public void deleteResult(Result result) { @@ -690,18 +654,15 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public Sample getSample(String id) { - Sample sample = persistenceContext.getSampleDao().findByTopiaId(id); - return sample; + return persistenceContext.getSampleDao().findByTopiaId(id); } public Sample newSample() { - Sample sample = persistenceContext.getSampleDao().newInstance(); - return sample; + return persistenceContext.getSampleDao().newInstance(); } public Sample createSample(Sample sample) { - Sample sampleCreated = persistenceContext.getSampleDao().create(sample); - return sampleCreated; + return persistenceContext.getSampleDao().create(sample); } public void deleteSample(Sample sample) { @@ -713,8 +674,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public SampleType getSampleTypeByName(String name) { - SampleType sampleDataType = persistenceContext.getSampleTypeDao().forNameEquals(name).findUnique(); - return sampleDataType; + return persistenceContext.getSampleTypeDao().forNameEquals(name).findUnique(); } //------------------------------------------------------------------------// @@ -724,18 +684,16 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { public SampleData createSampleData(SampleDataType sampleDataType, String label, float value) { - SampleData sampleCreated = persistenceContext.getSampleDataDao().create( + return persistenceContext.getSampleDataDao().create( SampleData.PROPERTY_SAMPLE_DATA_TYPE, sampleDataType, SampleData.PROPERTY_DATA_LABEL, label, SampleData.PROPERTY_DATA_VALUE, value ); - return sampleCreated; } public SampleData createSampleData(SampleData sample) { - SampleData sampleCreated = persistenceContext.getSampleDataDao().create( + return persistenceContext.getSampleDataDao().create( sample); - return sampleCreated; } //------------------------------------------------------------------------// @@ -743,8 +701,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public SampleDataType getSampleDataTypeByName(String name) { - SampleDataType sampleDataType = persistenceContext.getSampleDataTypeDao().forNameEquals(name).findUnique(); - return sampleDataType; + return persistenceContext.getSampleDataTypeDao().forNameEquals(name).findUnique(); } //------------------------------------------------------------------------// @@ -754,11 +711,10 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { public SizeCategory createSizeCategory(String sizeCategoryName, String sizeCategoryMeaning) { - SizeCategory sizeCategory = persistenceContext.getSizeCategoryDao().create( + return persistenceContext.getSizeCategoryDao().create( SizeCategory.PROPERTY_NAME, sizeCategoryName, SizeCategory.PROPERTY_MEANING, sizeCategoryMeaning ); - return sizeCategory; } //------------------------------------------------------------------------// @@ -766,8 +722,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public List<Species> getSpecies() { - List<Species> species = persistenceContext.getSpeciesDao().findAll(); - return species; + return persistenceContext.getSpeciesDao().findAll(); } public Optional<Species> getOptionalSpecies(String id) { @@ -784,26 +739,24 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { SizeCategory sizeCategory, AgeCategory ageCategory, SexCategory sexCategory) { - SpeciesCategory category = persistenceContext.getSpeciesCategoryDao().forProperties( + return persistenceContext.getSpeciesCategoryDao().forProperties( SpeciesCategory.PROPERTY_SPECIES, species, SpeciesCategory.PROPERTY_SIZE_CATEGORY, sizeCategory, SpeciesCategory.PROPERTY_AGE_CATEGORY, ageCategory, SpeciesCategory.PROPERTY_SEX_CATEGORY, sexCategory ).findAnyOrNull(); - return category; } public SpeciesCategory createSpeciesCategory(Species species, SizeCategory sizeCategory, AgeCategory ageCategory, SexCategory sexCategory) { - SpeciesCategory category = persistenceContext.getSpeciesCategoryDao().create( + return persistenceContext.getSpeciesCategoryDao().create( SpeciesCategory.PROPERTY_SPECIES, species, SpeciesCategory.PROPERTY_SIZE_CATEGORY, sizeCategory, SpeciesCategory.PROPERTY_AGE_CATEGORY, ageCategory, SpeciesCategory.PROPERTY_SEX_CATEGORY, sexCategory ); - return category; } //------------------------------------------------------------------------// @@ -823,8 +776,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { } public Transect createTransect(Transect transect) { - Transect transectCreated = persistenceContext.getTransectDao().create(transect); - return transectCreated; + return persistenceContext.getTransectDao().create(transect); } public void deleteTransect(Transect transect) { @@ -844,8 +796,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { } public Transit createTransit(Transit transit) { - Transit transitCreated = persistenceContext.getTransitDao().create(transit); - return transitCreated; + return persistenceContext.getTransitDao().create(transit); } public void deleteTransit(Transit transit) { @@ -857,8 +808,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { //------------------------------------------------------------------------// public Vessel getVessel(String id) { - Vessel mission = persistenceContext.getVesselDao().findByTopiaId(id); - return mission; + return persistenceContext.getVesselDao().findByTopiaId(id); } //------------------------------------------------------------------------// @@ -882,8 +832,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { } public Voyage createVoyage(Voyage voyage) { - Voyage voyageCreated = persistenceContext.getVoyageDao().create(voyage); - return voyageCreated; + return persistenceContext.getVoyageDao().create(voyage); } public void deleteVoyage(Voyage voyage) { @@ -904,9 +853,8 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { Class<E> entityType, Function<E, K> function) { List<E> allVoyages = persistenceContext.getDao(entityType).findAll(); - Map<K, E> voyageMap = Maps.uniqueIndex( + return Maps.uniqueIndex( allVoyages, function); - return voyageMap; } public void executeSQL(String sqlScript) { @@ -935,8 +883,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { public boolean isIdExists(String id) { try { - boolean result = getDAOFromId(id).forTopiaIdEquals(id).exists(); - return result; + return getDAOFromId(id).forTopiaIdEquals(id).exists(); } catch (TopiaException e) { throw new EchoBaseTechnicalException( "Could not find out if id " + id + " exists.", e); @@ -958,8 +905,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { public long countTable(String tableName) { CountTableRows query = new CountTableRows(tableName); - Long count = findSingleResult(query); - return count; + return findSingleResult(query); } @@ -974,8 +920,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { String hql = "SELECT count(*) FROM " + tableName; - PreparedStatement result = connection.prepareStatement(hql); - return result; + return connection.prepareStatement(hql); } @Override diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java index d80e327..471625e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserService.java @@ -58,8 +58,7 @@ public class UserService extends EchoBaseServiceSupport { public List<EchoBaseUser> getUsers(TopiaPagerBean pager) { try { EchoBaseUserTopiaDao dao = getDao(); - List<EchoBaseUser> users = dao.findAll(pager); - return users; + return dao.findAll(pager); } catch (TopiaException eee) { throw new EchoBaseTechnicalException(eee); } @@ -69,8 +68,7 @@ public class UserService extends EchoBaseServiceSupport { Preconditions.checkNotNull(email); try { EchoBaseUserTopiaDao dao = getDao(); - EchoBaseUser user = dao.forEmailEquals(email).findAnyOrNull(); - return user; + return dao.forEmailEquals(email).findAnyOrNull(); } catch (TopiaException eee) { throw new EchoBaseTechnicalException(eee); } @@ -150,8 +148,7 @@ public class UserService extends EchoBaseServiceSupport { } public static String encodePassword(String password) { - String encodedPassword = StringUtil.encodeMD5(password); - return encodedPassword; + return StringUtil.encodeMD5(password); } public EchoBaseUser newUser() { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java index dd1d72c..977238d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/ExportCoserService.java @@ -423,8 +423,7 @@ public class ExportCoserService extends EchoBaseServiceSupport { throw new GenerateCoserMapException("Impossible de générer les cartes en utilisant EchoR", e.getMessage()); } - File result = new File(scriptPrefixPath + "meanMaps"); - return result; + return new File(scriptPrefixPath + "meanMaps"); } protected void copyMaps(EchoBaseProject coserProject, File mapsDirectory) throws IOException { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java index 63a6b93..61bb460 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java @@ -67,10 +67,9 @@ public class ExportService extends EchoBaseServiceSupport { if (log.isInfoEnabled()) { log.info("Export " + meta); } - String result = TopiaCsvExports.exportData(meta, - getModelFactory(asSeen), - defaultPrepareDataForExport); - return result; + return TopiaCsvExports.exportData(meta, + getModelFactory(asSeen), + defaultPrepareDataForExport); } public void exportData(TableMeta<EchoBaseUserEntityEnum> meta, File file) { @@ -143,11 +142,10 @@ public class ExportService extends EchoBaseServiceSupport { @Override public <E extends TopiaEntity> ExportModel<E> buildForExport(AssociationMeta<EchoBaseUserEntityEnum> associationMeta) { - ExportModel<E> model = EntityAssociationExportModel.newExportModel( + return EntityAssociationExportModel.newExportModel( getConfiguration().getCsvSeparator(), associationMeta ); - return model; } }; @@ -184,11 +182,10 @@ public class ExportService extends EchoBaseServiceSupport { @Override public <E extends TopiaEntity> ExportModel<E> buildForExport(AssociationMeta<EchoBaseUserEntityEnum> associationMeta) { - ExportModel<E> model = EntityAssociationExportModel.newExportModel( + return EntityAssociationExportModel.newExportModel( getConfiguration().getCsvSeparator(), associationMeta ); - return model; } }; @@ -197,16 +194,14 @@ public class ExportService extends EchoBaseServiceSupport { @Override public <E extends TopiaEntity> Iterable<E> prepareData(TableMeta<EchoBaseUserEntityEnum> tableMeta) { - Iterable<E> data = dbEditorService.iterateOnEntities(tableMeta, null); - return data; + return dbEditorService.iterateOnEntities(tableMeta, null); } @Override public <E extends TopiaEntity> Iterable<E> prepareData(AssociationMeta<EchoBaseUserEntityEnum> associationMeta) { TableMeta<EchoBaseUserEntityEnum> tableMeta = dbEditorService.getTableMeta(associationMeta.getSource()); - Iterable<E> data = dbEditorService.iterateOnEntities(tableMeta, "size(e." + associationMeta.getName() + ") > 0"); - return data; + return dbEditorService.iterateOnEntities(tableMeta, "size(e." + associationMeta.getName() + ") > 0"); } }; } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java index 2d30111..0f388dc 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java @@ -78,8 +78,7 @@ public class ExportQueryService extends EchoBaseServiceSupport { public boolean isQueryNameValid(ExportQuery exportQuery) { String queryName = exportQuery.getName(); - boolean result = ExportQueries.isQueryNameValid(queryName); - return result; + return ExportQueries.isQueryNameValid(queryName); } public boolean isQueryNameAvailable(ExportQuery exportQuery) { @@ -157,8 +156,7 @@ public class ExportQueryService extends EchoBaseServiceSupport { ExportQuery exportQuery = getExportQuery(queryId); - String result = getSafeSql(exportQuery.getSqlQuery()); - return result; + return getSafeSql(exportQuery.getSqlQuery()); } public <E extends TopiaEntity> Map<String, String> loadSortAndDecorate(Class<E> beanType) { @@ -178,8 +176,7 @@ public class ExportQueryService extends EchoBaseServiceSupport { sqls.put(sql, sql); } - String result = sqls.getProperty(sql); - return result; + return sqls.getProperty(sql); } public void testSql(String sql) throws TopiaException { @@ -219,8 +216,7 @@ public class ExportQueryService extends EchoBaseServiceSupport { // from the meta data of the result set GenericSQLQuery sqlQuery = new GenericSQLQuery(limitSql, null); persistenceService.findSingleResult(sqlQuery); - String[] result = sqlQuery.getColumnNames(); - return result; + return sqlQuery.getColumnNames(); } catch (TopiaException eee) { throw new EchoBaseTechnicalException( "Could not execute query " + limitSql + " for reason " + eee.getCause().getMessage(), eee); @@ -246,8 +242,7 @@ public class ExportQueryService extends EchoBaseServiceSupport { ExportQueryCsvModel csvModel = sqlQuery.generateCsvModel(csvSeparator); Export<Map<String, Object>> exporter = Export.newExport(csvModel, rows); try { - String content = exporter.toString(Charsets.UTF_8); - return content; + return exporter.toString(Charsets.UTF_8); } catch (Exception eee) { throw new EchoBaseTechnicalException("Could not export sql", eee); } @@ -263,8 +258,7 @@ public class ExportQueryService extends EchoBaseServiceSupport { public String processLibreOfficeSqlQuery(String libreOfficeQuery) { - String result = libreOfficeQuery.replaceAll("\\\"", ""); - return result; + return libreOfficeQuery.replaceAll("\\\"", ""); } protected ExportQueryTopiaDao getDao() { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/GenericSQLQuery.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/GenericSQLQuery.java index ec10082..921ec52 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/GenericSQLQuery.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/GenericSQLQuery.java @@ -63,17 +63,14 @@ public class GenericSQLQuery extends TopiaSqlQuery<Map<String, Object>> { } public ExportQueryCsvModel generateCsvModel(char charSeparator) { - ExportQueryCsvModel model = new ExportQueryCsvModel( + return new ExportQueryCsvModel( charSeparator, columnNames ); - return model; } public List<Map<String, Object>> getResult(TopiaSqlSupport tx) throws TopiaException { - List<Map<String, Object>> rows = - tx.findMultipleResult(this); - return rows; + return tx.findMultipleResult(this); } public void testQuery(TopiaSqlSupport tx) throws TopiaException { @@ -153,8 +150,7 @@ public class GenericSQLQuery extends TopiaSqlQuery<Map<String, Object>> { } } - Map<String, Object> result = getRowAsMap(columnNames, set); - return result; + return getRowAsMap(columnNames, set); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java index d8d0384..3c313f5 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java @@ -223,8 +223,7 @@ public abstract class AbstractImportDataService<M extends AbstractImportConfigur protected final String getImportLabel(M configuration) { Locale locale = getLocale(); - String result = l(locale, configuration.getImportType().getI18nKey()); - return result; + return l(locale, configuration.getImportType().getI18nKey()); } protected abstract void startImport(M configuration, @@ -232,9 +231,8 @@ public abstract class AbstractImportDataService<M extends AbstractImportConfigur protected Reader getInputFileReader(InputFile inputFile) throws EchoBaseTechnicalException { try { - Reader reader = new BufferedReader(new InputStreamReader( + return new BufferedReader(new InputStreamReader( new FileInputStream(inputFile.getFile()), Charsets.UTF_8)); - return reader; } catch (FileNotFoundException e) { throw new EchoBaseTechnicalException( "Could not find import file " + inputFile.getFile(), e); @@ -253,9 +251,8 @@ public abstract class AbstractImportDataService<M extends AbstractImportConfigur } protected String getImportMessage(M configuration, InputFile inputFile) { - String message = l(getLocale(), "echobase.importLabel.withFile", - getImportLabel(configuration), inputFile.getFileName()); - return message; + return l(getLocale(), "echobase.importLabel.withFile", + getImportLabel(configuration), inputFile.getFileName()); } protected final void doFlushTransaction(int rowNumber, @@ -332,10 +329,9 @@ public abstract class AbstractImportDataService<M extends AbstractImportConfigur null, importResult); - Category category = getResultCategory(echotype, - speciesCategory, - importResult); - return category; + return getResultCategory(echotype, + speciesCategory, + importResult); } protected Category getResultCategory( diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java index 0f96316..8d3addd 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java @@ -120,7 +120,6 @@ public class MapCellImportModel extends AbstractImportModel<MapCellImportRow> { @Override public MapCellImportRow newEmptyInstance() { - MapCellImportRow row = new MapCellImportRow(cellType); - return row; + return new MapCellImportRow(cellType); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java index 487e73c..bb13862 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java @@ -53,7 +53,6 @@ public class RegionCellImportModel extends AbstractImportModel<RegionCellImportR @Override public RegionCellImportRow newEmptyInstance() { - RegionCellImportRow row = new RegionCellImportRow(); - return row; + return new RegionCellImportRow(); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java index 311ae55..a33d326 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/EchoBaseImportModelFactory.java @@ -89,12 +89,10 @@ public class EchoBaseImportModelFactory implements ImportModelFactory<EchoBaseUs @Override public ImportModel<Map<String, Object>> buildForImport(AssociationMeta<EchoBaseUserEntityEnum> meta) { - ImportModel<Map<String, Object>> model = - EntityAssociationImportModel.newImportModel( - csvSeparator, - meta - ); - return model; + return EntityAssociationImportModel.newImportModel( + csvSeparator, + meta + ); } @Override diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java index e5895f4..49d12d3 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/EchoBaseImportStrategy.java @@ -87,9 +87,8 @@ public class EchoBaseImportStrategy implements ImportStrategy<EchoBaseUserEntity CsvImportResult<EchoBaseUserEntityEnum> csvResult) throws TopiaException { TopiaDao<E> dao = (TopiaDao<E>) persistenceContext.getDao(meta.getSource().getContract()); - Iterable<E> result = TopiaCsvImports.importAllEntitiesAndReturnThem( + return TopiaCsvImports.importAllEntitiesAndReturnThem( dao, meta, importer, csvResult); - return result; } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java index da58e38..803bb49 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java @@ -123,11 +123,10 @@ public class AcousticRemoveDataStrategy extends AbstractRemoveDataStrategy { @Override public Set<ImportType> getPossibleSubImportType() { - Set<ImportType> result = Sets.newHashSet(ImportType.RESULT_VOYAGE, - ImportType.RESULT_ESDU, - ImportType.RESULT_MAP_FISH, - ImportType.RESULT_MAP_OTHER, - ImportType.RESULT_REGION); - return result; + return Sets.newHashSet(ImportType.RESULT_VOYAGE, + ImportType.RESULT_ESDU, + ImportType.RESULT_MAP_FISH, + ImportType.RESULT_MAP_OTHER, + ImportType.RESULT_REGION); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java index e8c3bf7..0e4d1b7 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CatchesRemoveDataStrategy.java @@ -49,8 +49,7 @@ public class CatchesRemoveDataStrategy extends AbstractRemoveDataStrategy { @Override public long computeNbSteps(Voyage voyage, ImportLog importLog) { - long result = importLog.sizeImportId(); - return result; + return (long) importLog.sizeImportId(); } @Override @@ -77,7 +76,6 @@ public class CatchesRemoveDataStrategy extends AbstractRemoveDataStrategy { @Override public Set<ImportType> getPossibleSubImportType() { - Set<ImportType> result = Collections.emptySet(); - return result; + return Collections.emptySet(); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java index 8f3c9bd..51caa6c 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonAllRemoveDataStrategy.java @@ -86,16 +86,15 @@ public class CommonAllRemoveDataStrategy extends AbstractRemoveDataStrategy { @Override public Set<ImportType> getPossibleSubImportType() { - Set<ImportType> result = Sets.newHashSet(ImportType.COMMON_TRANSIT, - ImportType.COMMON_TRANSECT, - ImportType.OPERATION, - ImportType.CATCHES, - ImportType.ACOUSTIC, - ImportType.RESULT_VOYAGE, - ImportType.RESULT_ESDU, - ImportType.RESULT_MAP_FISH, - ImportType.RESULT_MAP_OTHER, - ImportType.RESULT_REGION); - return result; + return Sets.newHashSet(ImportType.COMMON_TRANSIT, + ImportType.COMMON_TRANSECT, + ImportType.OPERATION, + ImportType.CATCHES, + ImportType.ACOUSTIC, + ImportType.RESULT_VOYAGE, + ImportType.RESULT_ESDU, + ImportType.RESULT_MAP_FISH, + ImportType.RESULT_MAP_OTHER, + ImportType.RESULT_REGION); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java index deddcb1..fc656f3 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransectRemoveDataStrategy.java @@ -106,13 +106,12 @@ public class CommonTransectRemoveDataStrategy extends AbstractRemoveDataStrategy @Override public Set<ImportType> getPossibleSubImportType() { - Set<ImportType> result = Sets.newHashSet(ImportType.OPERATION, - ImportType.CATCHES, - ImportType.ACOUSTIC, - ImportType.RESULT_ESDU, - ImportType.RESULT_MAP_FISH, - ImportType.RESULT_MAP_OTHER, - ImportType.RESULT_REGION); - return result; + return Sets.newHashSet(ImportType.OPERATION, + ImportType.CATCHES, + ImportType.ACOUSTIC, + ImportType.RESULT_ESDU, + ImportType.RESULT_MAP_FISH, + ImportType.RESULT_MAP_OTHER, + ImportType.RESULT_REGION); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java index 4a3a47c..d1fd6ee 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonTransitRemoveDataStrategy.java @@ -106,14 +106,13 @@ public class CommonTransitRemoveDataStrategy extends AbstractRemoveDataStrategy @Override public Set<ImportType> getPossibleSubImportType() { - Set<ImportType> result = Sets.newHashSet(ImportType.COMMON_TRANSECT, - ImportType.OPERATION, - ImportType.CATCHES, - ImportType.ACOUSTIC, - ImportType.RESULT_ESDU, - ImportType.RESULT_MAP_FISH, - ImportType.RESULT_MAP_OTHER, - ImportType.RESULT_REGION); - return result; + return Sets.newHashSet(ImportType.COMMON_TRANSECT, + ImportType.OPERATION, + ImportType.CATCHES, + ImportType.ACOUSTIC, + ImportType.RESULT_ESDU, + ImportType.RESULT_MAP_FISH, + ImportType.RESULT_MAP_OTHER, + ImportType.RESULT_REGION); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java index 6979cec..734554f 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/CommonVoyageRemoveDataStrategy.java @@ -87,16 +87,15 @@ public class CommonVoyageRemoveDataStrategy extends AbstractRemoveDataStrategy { @Override public Set<ImportType> getPossibleSubImportType() { - Set<ImportType> result = Sets.newHashSet(ImportType.COMMON_TRANSIT, - ImportType.COMMON_TRANSECT, - ImportType.OPERATION, - ImportType.CATCHES, - ImportType.ACOUSTIC, - ImportType.RESULT_VOYAGE, - ImportType.RESULT_ESDU, - ImportType.RESULT_MAP_FISH, - ImportType.RESULT_MAP_OTHER, - ImportType.RESULT_REGION); - return result; + return Sets.newHashSet(ImportType.COMMON_TRANSIT, + ImportType.COMMON_TRANSECT, + ImportType.OPERATION, + ImportType.CATCHES, + ImportType.ACOUSTIC, + ImportType.RESULT_VOYAGE, + ImportType.RESULT_ESDU, + ImportType.RESULT_MAP_FISH, + ImportType.RESULT_MAP_OTHER, + ImportType.RESULT_REGION); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java index c57fd6a..eaf7178 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/LegacyVoyageRemoveDataStrategy.java @@ -86,17 +86,16 @@ public class LegacyVoyageRemoveDataStrategy extends AbstractRemoveDataStrategy { @Override public Set<ImportType> getPossibleSubImportType() { - Set<ImportType> result = Sets.newHashSet(ImportType.COMMON_TRANSIT, - ImportType.COMMON_TRANSECT, - ImportType.OPERATION, - ImportType.CATCHES, - ImportType.ACOUSTIC, - ImportType.RESULT_VOYAGE, - ImportType.RESULT_ESDU, - ImportType.RESULT_MAP_FISH, - ImportType.RESULT_MAP_OTHER, - ImportType.RESULT_REGION); - return result; + return Sets.newHashSet(ImportType.COMMON_TRANSIT, + ImportType.COMMON_TRANSECT, + ImportType.OPERATION, + ImportType.CATCHES, + ImportType.ACOUSTIC, + ImportType.RESULT_VOYAGE, + ImportType.RESULT_ESDU, + ImportType.RESULT_MAP_FISH, + ImportType.RESULT_MAP_OTHER, + ImportType.RESULT_REGION); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java index 8c7783a..d12ddc4 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/OperationRemoveDataStrategy.java @@ -50,8 +50,7 @@ public class OperationRemoveDataStrategy extends AbstractRemoveDataStrategy { @Override public long computeNbSteps(Voyage voyage, ImportLog importLog) { - long result = importLog.sizeImportId(); - return result; + return (long) importLog.sizeImportId(); } @Override @@ -78,7 +77,6 @@ public class OperationRemoveDataStrategy extends AbstractRemoveDataStrategy { @Override public Set<ImportType> getPossibleSubImportType() { - Set<ImportType> result = Sets.newHashSet(ImportType.CATCHES); - return result; + return Sets.newHashSet(ImportType.CATCHES); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java index 4ba822d..bf78ecf 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultEsduRemoveDataStrategy.java @@ -50,8 +50,7 @@ public class ResultEsduRemoveDataStrategy extends AbstractRemoveDataStrategy { @Override public long computeNbSteps(Voyage voyage, ImportLog importLog) { - long result = importLog.sizeImportId(); - return result; + return (long) importLog.sizeImportId(); } @Override @@ -78,7 +77,6 @@ public class ResultEsduRemoveDataStrategy extends AbstractRemoveDataStrategy { @Override public Set<ImportType> getPossibleSubImportType() { - Set<ImportType> result = Collections.emptySet(); - return result; + return Collections.emptySet(); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java index e248fb7..01d9b37 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapFishRemoveDataStrategy.java @@ -49,8 +49,7 @@ public class ResultMapFishRemoveDataStrategy extends AbstractRemoveDataStrategy @Override public long computeNbSteps(Voyage voyage, ImportLog importLog) { - long result = importLog.sizeImportId(); - return result; + return (long) importLog.sizeImportId(); } @Override @@ -79,7 +78,6 @@ public class ResultMapFishRemoveDataStrategy extends AbstractRemoveDataStrategy @Override public Set<ImportType> getPossibleSubImportType() { - Set<ImportType> result = Collections.emptySet(); - return result; + return Collections.emptySet(); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java index 716f9f0..d241a23 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultMapOtherRemoveDataStrategy.java @@ -49,8 +49,7 @@ public class ResultMapOtherRemoveDataStrategy extends AbstractRemoveDataStrategy @Override public long computeNbSteps(Voyage voyage, ImportLog importLog) { - long result = importLog.sizeImportId(); - return result; + return (long) importLog.sizeImportId(); } @Override @@ -79,7 +78,6 @@ public class ResultMapOtherRemoveDataStrategy extends AbstractRemoveDataStrategy @Override public Set<ImportType> getPossibleSubImportType() { - Set<ImportType> result = Collections.emptySet(); - return result; + return Collections.emptySet(); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java index d745229..ac3747e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultRegionRemoveDataStrategy.java @@ -49,8 +49,7 @@ public class ResultRegionRemoveDataStrategy extends AbstractRemoveDataStrategy { @Override public long computeNbSteps(Voyage voyage, ImportLog importLog) { - long result = importLog.sizeImportId(); - return result; + return (long) importLog.sizeImportId(); } @Override @@ -79,7 +78,6 @@ public class ResultRegionRemoveDataStrategy extends AbstractRemoveDataStrategy { @Override public Set<ImportType> getPossibleSubImportType() { - Set<ImportType> result = Collections.emptySet(); - return result; + return Collections.emptySet(); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java index 2fbba49..8b12a06 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/ResultVoyageRemoveDataStrategy.java @@ -139,10 +139,9 @@ public class ResultVoyageRemoveDataStrategy extends AbstractRemoveDataStrategy { @Override public Set<ImportType> getPossibleSubImportType() { - Set<ImportType> result = Sets.newHashSet(ImportType.RESULT_ESDU, - ImportType.RESULT_MAP_FISH, - ImportType.RESULT_MAP_OTHER, - ImportType.RESULT_REGION); - return result; + return Sets.newHashSet(ImportType.RESULT_ESDU, + ImportType.RESULT_MAP_FISH, + ImportType.RESULT_MAP_OTHER, + ImportType.RESULT_REGION); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java index 53105cb..e0651e1 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java @@ -128,8 +128,7 @@ public class GisService extends EchoBaseServiceSupport { public String getVoyageMapUrl(JdbcConfiguration conf, Voyage voyage) { LizmapRepository lizmapRepository = newLizmapRepository(conf); - String repositoryUrl = lizmapRepository.getVoyageMapUrl(voyage); - return repositoryUrl; + return lizmapRepository.getVoyageMapUrl(voyage); } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/LizmapRepository.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/LizmapRepository.java index aaede6f..b07733a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/LizmapRepository.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/LizmapRepository.java @@ -123,8 +123,7 @@ public class LizmapRepository { throw new EchoBaseTechnicalException("Map target (" + lizmapTarget.getAbsolutePath() + ") is not directory"); } - LizmapRepository result = new LizmapRepository(lizmapRepositoryConfiguration); - return result; + return new LizmapRepository(lizmapRepositoryConfiguration); } @@ -171,8 +170,7 @@ public class LizmapRepository { public String getVoyageMapUrl(Voyage voyage) { String repoName = getRepositoryName(); - String repositoryUrl = configuration.getLizmapApplicationUrl() + "?" + "repository=" + repoName + "&project=" + voyage.getName(); - return repositoryUrl; + return configuration.getLizmapApplicationUrl() + "?" + "repository=" + repoName + "&project=" + voyage.getName(); } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java index 79f5a84..fe0bb6e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/workingDb/WorkingDbConfigurationService.java @@ -59,8 +59,7 @@ public class WorkingDbConfigurationService extends EchoBaseServiceSupport { public List<WorkingDbConfiguration> getWorkingDbConfigurations() { try { - List<WorkingDbConfiguration> result = getDao().findAll(); - return result; + return getDao().findAll(); } catch (TopiaException eee) { throw new EchoBaseTechnicalException(eee); } @@ -182,9 +181,7 @@ public class WorkingDbConfigurationService extends EchoBaseServiceSupport { public WorkingDbConfiguration getWorkingDbConfigurationByUrl(String url) { - WorkingDbConfiguration configuration = getDao().forUrlEquals(url).findUnique(); - - return configuration; + return getDao().forUrlEquals(url).findUnique(); } protected WorkingDbConfiguration getExistingConf(String id) throws WorkingDbConfigurationNotFoundException { diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java index 7b8a3e0..0cc107d 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java @@ -104,8 +104,7 @@ public class FakeEchoBaseServiceContext extends TestWatcher implements EchoBaseS + description.getMethodName()// a sub-directory with the method name + '_' + TIMESTAMP; // and a timestamp - File databaseFile = new File(tempDirFile, dataBasePath); - return databaseFile; + return new File(tempDirFile, dataBasePath); } @Override @@ -197,8 +196,7 @@ public class FakeEchoBaseServiceContext extends TestWatcher implements EchoBaseS @Override public String getUserDbUrl() { - String result = echoBaseTopiaApplicationContext.getConfiguration().get(TopiaConfigurationConstants.CONFIG_URL); - return result; + return echoBaseTopiaApplicationContext.getConfiguration().get(TopiaConfigurationConstants.CONFIG_URL); } @Override diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java index 521a368..bf26bbc 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java @@ -371,8 +371,7 @@ public abstract class AbstractRemoveDataServiceTest extends EchoBaseTestServiceS TopiaIdFactory topiaIdFactory = persistenceContext.getTopiaIdFactory(); Class entityType = topiaIdFactory.getClassName(id); TopiaDao<E> dao = persistenceContext.getDao(entityType); - E entity = dao.forTopiaIdEquals(id).findAnyOrNull(); - return entity; + return dao.forTopiaIdEquals(id).findAnyOrNull(); } private void createCommonVoyageImportV1() { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java index e9c293a..30f86ea 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java @@ -100,17 +100,13 @@ public class EchoBaseApplicationContext { public static EchoBaseApplicationContext getApplicationContext(ActionContext actionContext) { Map<String, Object> application = actionContext.getApplication(); - EchoBaseApplicationContext result = - (EchoBaseApplicationContext) application.get( - APPLICATION_CONTEXT_PARAMETER); - return result; + return (EchoBaseApplicationContext) application.get( + APPLICATION_CONTEXT_PARAMETER); } public static EchoBaseApplicationContext getApplicationContext(ServletContext servletContext) { - EchoBaseApplicationContext result = - (EchoBaseApplicationContext) servletContext.getAttribute( - APPLICATION_CONTEXT_PARAMETER); - return result; + return (EchoBaseApplicationContext) servletContext.getAttribute( + APPLICATION_CONTEXT_PARAMETER); } public static void setApplicationContext(ServletContext servletContext, diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java index c25192b..8ffc201 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java @@ -309,8 +309,7 @@ public class EchoBaseSession implements Closeable, Serializable { * {@code false} otherwise */ protected boolean contains(String key) { - boolean result = store.containsKey(key); - return result; + return store.containsKey(key); } /** @@ -389,17 +388,14 @@ public class EchoBaseSession implements Closeable, Serializable { } public Collection<String> getFlashMessages() { - Collection<String> result = consumeDynamicSetData(EchoBaseSession.SESSION_TOKEN_MESSAGES); - return result; + return consumeDynamicSetData(EchoBaseSession.SESSION_TOKEN_MESSAGES); } public Collection<String> getFlashErrors() { - Collection<String> result = consumeDynamicSetData(EchoBaseSession.SESSION_TOKEN_ERRORS); - return result; + return consumeDynamicSetData(EchoBaseSession.SESSION_TOKEN_ERRORS); } public Collection<String> getFlashWarnings() { - Collection<String> result = consumeDynamicSetData(EchoBaseSession.SESSION_TOKEN_WARNINGS); - return result; + return consumeDynamicSetData(EchoBaseSession.SESSION_TOKEN_WARNINGS); } } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java index 4f5ca3f..dc1aae9 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java @@ -50,18 +50,15 @@ public class EchoBaseActionSupport extends BaseAction { new SimpleDateFormat("mm-yyyy"); protected <E extends EchoBaseService> E newService(Class<E> serviceClass) { - E service = getServiceContext().newService(serviceClass); - return service; + return getServiceContext().newService(serviceClass); } public String formatDate(Date date) { - String result = dateFormat.format(date); - return result; + return dateFormat.format(date); } public String formatMonth(Date date) { - String result = monthFormat.format(date); - return result; + return monthFormat.format(date); } public void addFlashMessage(String message) { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java index 5ce6984..6284c45 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java @@ -56,9 +56,8 @@ public class Build extends AbstractWaitAndExecAction<EmbeddedApplicationConfigur @Override protected String getResultMessage(EmbeddedApplicationConfiguration model) { - String result = t("echobase.message.createEmbedded.result", - model.getActionTime()); - return result; + return t("echobase.message.createEmbedded.result", + model.getActionTime()); } @Override diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java index 0c5e25e..2ca802f 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java @@ -68,8 +68,7 @@ public abstract class AbstractCheckInterceptor extends AbstractInterceptor { return null; } - String result = invocation.invoke(); - return result; + return invocation.invoke(); } protected String getRedirectUrl() { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java index ee8eca1..e6415fd 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java @@ -97,11 +97,10 @@ public class CheckLogguedInterceptor extends AbstractCheckInterceptor { @Override protected String getRedirectUrl() { - String url = String.format(URL_PATTERN, - loginAction, - redirectAction + return String.format(URL_PATTERN, + loginAction, + redirectAction ); - return url; } } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseInjectInterceptor.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseInjectInterceptor.java index f530fe9..267ee48 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseInjectInterceptor.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/EchoBaseInjectInterceptor.java @@ -76,11 +76,9 @@ public class EchoBaseInjectInterceptor implements Interceptor { protected EchoBaseSession getEchoBaseSession(ActionInvocation invocation) { - EchoBaseSession session = EchoBaseSession.getEchoBaseSession( + return EchoBaseSession.getEchoBaseSession( invocation.getInvocationContext()); - return session; - } protected EchoBaseApplicationContext getEchoBaseApplicationContext(ActionInvocation invocation) { @@ -115,13 +113,11 @@ public class EchoBaseInjectInterceptor implements Interceptor { EchoBaseSession echoBaseSession = getEchoBaseSession(invocation); EchoBaseUserTopiaApplicationContext workingDbRootContext = echoBaseSession.getUserDbApplicationContext(); - EchoBaseServiceContext serviceContext = - applicationContext.newServiceContext(locale, - topiaInternalContext, - topiaContext, - workingDbRootContext); - return serviceContext; + return applicationContext.newServiceContext(locale, + topiaInternalContext, + topiaContext, + workingDbRootContext); } @@ -163,8 +159,7 @@ public class EchoBaseInjectInterceptor implements Interceptor { } else if (EchoBaseSession.class.isAssignableFrom(propertyType)) { - EchoBaseSession userSession = getEchoBaseSession(invocation); - toInject = userSession; + toInject = getEchoBaseSession(invocation); } else if (EchoBaseApplicationContext.class.isAssignableFrom(propertyType)) { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java index 1081a7d..90a04a2 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/validators/EchoBaseFieldValidatorSupport.java @@ -53,7 +53,6 @@ public abstract class EchoBaseFieldValidatorSupport extends NuitonFieldValidator * @return the translated sentence */ protected String translate(String key, Object... args) { - String text = getValidatorContext().getText(key, Arrays.asList(args)); - return text; + return getValidatorContext().getText(key, Arrays.asList(args)); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.