This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 30f644dd5f773a9a7a0932babf5817b1361e5906 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 31 13:34:50 2016 +0200 clean some codes... --- .../swing/ui/actions/ReloadApplicationAction.java | 3 -- .../swing/ui/admin/validate/ValidateUIHandler.java | 2 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 5 +-- .../actions/ChangeActivityRouteActionListener.java | 2 +- .../actions/ChangeActivityTripActionListener.java | 2 +- .../actions/ChangeRouteTripActionListener.java | 2 +- .../actions/ChangeTripProgramActionListener.java | 2 +- .../ui/tree/actions/NodeChangeActionListener.java | 5 --- .../web/request/ObserveWebRequestContext.java | 47 +++++++++++----------- .../services/ObserveServiceInitializer.java | 26 ++++++------ .../reference/ReferenceBinderEngineSupplier.java | 2 +- 11 files changed, 42 insertions(+), 56 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadApplicationAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadApplicationAction.java index 9450300..a52a0a6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadApplicationAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ReloadApplicationAction.java @@ -47,12 +47,9 @@ public class ReloadApplicationAction extends AbstractAction { /** Logger. */ private static final Log log = LogFactory.getLog(ReloadApplicationAction.class); - private final ObserveMainUI ui; - public ReloadApplicationAction(ObserveMainUI ui) { super(t("observe.action.restart.application"), SwingUtil.getUIManagerActionIcon("application-reload")); - this.ui = ui; putValue(SHORT_DESCRIPTION, t("observe.action.restart.application.tip")); putValue(MNEMONIC_KEY, (int) 'X'); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java index a3c298f..756072c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java @@ -383,7 +383,7 @@ public class ValidateUIHandler extends AdminTabUIHandler { // des validateurs ont été trouvés for (ValidatorDto v : validators) { - String label = t(DecoratorService.getEntityLabel(v.getDtoType())); + String label = t(DecoratorService.getEntityLabel(v.getType())); sendMessage(t("observe.actions.validate.message.detected", label)); } } else { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java index 03d09f4..f58ec32 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java @@ -84,8 +84,6 @@ public class ObserveNavigationTreeShowPopupAction { private final ObserveTreeHelper treeHelper; - private final JScrollPane pane; - private final JPopupMenu popup; private final JTree tree; @@ -98,10 +96,9 @@ public class ObserveNavigationTreeShowPopupAction { private final ImmutableMap<String, MoveNodeMenuPopulator> moveNodeDataByNodeType; - public ObserveNavigationTreeShowPopupAction(final ObserveTreeHelper treeHelper, JScrollPane pane, JPopupMenu popup) { + public ObserveNavigationTreeShowPopupAction(ObserveTreeHelper treeHelper, JScrollPane pane, JPopupMenu popup) { this.treeHelper = treeHelper; - this.pane = pane; this.popup = popup; this.tree = treeHelper.getUI(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java index 6a02617..c942df4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java @@ -49,7 +49,7 @@ public class ChangeActivityRouteActionListener extends NodeChangeActionListener ObserveSwingDataSource dataSource, String activityId, String routeId) { - super(treeHelper, dataSource, activityId, routeId); + super(treeHelper, activityId, routeId); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java index 578c67b..4154422 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityTripActionListener.java @@ -49,7 +49,7 @@ public class ChangeActivityTripActionListener extends NodeChangeActionListener { ObserveSwingDataSource dataSource, String activityId, String tripLonglineId) { - super(treeHelper, dataSource, activityId, tripLonglineId); + super(treeHelper, activityId, tripLonglineId); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java index a6c4b32..c4dc257 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeRouteTripActionListener.java @@ -49,7 +49,7 @@ public class ChangeRouteTripActionListener extends NodeChangeActionListener { ObserveSwingDataSource dataSource, String routeId, String tripId) { - super(treeHelper, dataSource, routeId, tripId); + super(treeHelper, routeId, tripId); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java index 512c60e..d64c83c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeTripProgramActionListener.java @@ -50,7 +50,7 @@ public class ChangeTripProgramActionListener extends NodeChangeActionListener { ObserveSwingDataSource dataSource, String tripId, String programId) { - super(treeHelper, dataSource, tripId, programId); + super(treeHelper, tripId, programId); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java index fadde27..f1d593e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/NodeChangeActionListener.java @@ -23,7 +23,6 @@ package fr.ird.observe.application.swing.ui.tree.actions; */ -import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.ui.tree.ObserveNode; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; import org.apache.commons.logging.Log; @@ -49,16 +48,12 @@ public abstract class NodeChangeActionListener implements ActionListener { private final ObserveTreeHelper treeHelper; - private final ObserveSwingDataSource dataSource; - public NodeChangeActionListener(ObserveTreeHelper treeHelper, - ObserveSwingDataSource dataSource, String nodeId, String parentNodeId) { this.nodeId = nodeId; this.parentNodeId = parentNodeId; this.treeHelper = treeHelper; - this.dataSource = dataSource; } @Override diff --git a/application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java b/application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java index faebcda..494a619 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java @@ -35,7 +35,6 @@ import fr.ird.observe.services.security.InvalidAdminKeyApiException; import org.debux.webmotion.server.call.HttpContext; import java.util.Locale; -import java.util.Optional; /** * Created on 4/25/14. @@ -44,7 +43,7 @@ import java.util.Optional; */ public class ObserveWebRequestContext { - protected static final String REQUEST_OBSERVE_WEB_REQUEST_CONTEXT = ObserveWebRequestContext.class.getName(); + private static final String REQUEST_OBSERVE_WEB_REQUEST_CONTEXT = ObserveWebRequestContext.class.getName(); public static ObserveWebRequestContext getRequestContext(HttpContext httpContext) { @@ -57,17 +56,17 @@ public class ObserveWebRequestContext { httpContext.getRequest().setAttribute(REQUEST_OBSERVE_WEB_REQUEST_CONTEXT, serviceContext); } - protected final ObserveWebApplicationContext applicationContext; + private final ObserveWebApplicationContext applicationContext; - protected final Locale applicationLocale; + private final Locale applicationLocale; - protected final ReferentialLocale referentialLocale; + private final ReferentialLocale referentialLocale; - protected final ObserveSpeciesListConfiguration speciesListConfiguration; + private final ObserveSpeciesListConfiguration speciesListConfiguration; - protected final Optional<String> optionalAdminApiKey; + private final String optionalAdminApiKey; - protected final Optional<String> optionalAuthenticationToken; + private final String optionalAuthenticationToken; public ObserveWebRequestContext(ObserveWebApplicationContext applicationContext, Locale applicationLocale, @@ -79,8 +78,8 @@ public class ObserveWebRequestContext { this.applicationLocale = applicationLocale; this.referentialLocale = referentialLocale; this.speciesListConfiguration = speciesListConfiguration; - this.optionalAdminApiKey = Optional.ofNullable(adminApiKey); - this.optionalAuthenticationToken = Optional.ofNullable(authenticationToken); + this.optionalAdminApiKey = adminApiKey; + this.optionalAuthenticationToken = authenticationToken; } public ObserveWebApplicationContext getApplicationContext() { @@ -111,29 +110,29 @@ public class ObserveWebRequestContext { } - public void checkAdminApiKeyIsPresent() { - if (!optionalAdminApiKey.isPresent()) { - throw new AdminApiKeyNotFoundException(); - } - } - public void checkAdminApiKeyIsValid() { checkAdminApiKeyIsPresent(); String configurationAdminKey = applicationContext.getApplicationConfiguration().getAdminApiKey(); - if (!configurationAdminKey.equals(optionalAdminApiKey.get())) { - throw new InvalidAdminKeyApiException(optionalAdminApiKey.get()); + if (!configurationAdminKey.equals(optionalAdminApiKey)) { + throw new InvalidAdminKeyApiException(optionalAdminApiKey); } } - public void checkAuthenticationTokenIsPresent() { - if (!optionalAuthenticationToken.isPresent()) { - throw new AuthenticationTokenNotFoundException(); + public String getAuthenticationToken() { + checkAuthenticationTokenIsPresent(); + return optionalAuthenticationToken; + } + + private void checkAdminApiKeyIsPresent() { + if (optionalAdminApiKey == null) { + throw new AdminApiKeyNotFoundException(); } } - public String getAuthenticationToken() { - checkAuthenticationTokenIsPresent(); - return optionalAuthenticationToken.get(); + private void checkAuthenticationTokenIsPresent() { + if (optionalAuthenticationToken == null) { + throw new AuthenticationTokenNotFoundException(); + } } } diff --git a/services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java b/services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java index 2c00b65..8583fff 100644 --- a/services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java +++ b/services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java @@ -29,7 +29,6 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import java.io.File; import java.util.Locale; -import java.util.Optional; /** * Objet contentant les informations nécessaire pour créer un nouveau service. @@ -120,34 +119,33 @@ public class ObserveServiceInitializer { /** * La locale à utiliser pour faire des traductions. */ - protected Locale applicationLocale; + private Locale applicationLocale; /** * La locale à utiliser pour la source de données. */ - protected ReferentialLocale referentialLocale; + private ReferentialLocale referentialLocale; /** * La connexion à la source de données (peut être null si on a pas encore de connexion). */ - protected Optional<ObserveDataSourceConnection> dataSourceConnection; + private ObserveDataSourceConnection dataSourceConnection; /** * La configuration à la source de données quand on a pas encore de connexion. */ - protected Optional<ObserveDataSourceConfiguration> dataSourceConfiguration; + private ObserveDataSourceConfiguration dataSourceConfiguration; /** * Le répertoire où créer les répertoires temporaires. * FIXME A revoir car dans le cadre d'un appel distant cela n'a pas de sens. */ - protected File temporaryDirectoryRoot; + private File temporaryDirectoryRoot; /** * La configuration des listes d'espèces (utilisé pour filtrer les listes d'espèces). */ - protected ObserveSpeciesListConfiguration speciesListConfiguration; - + private ObserveSpeciesListConfiguration speciesListConfiguration; public Locale getApplicationLocale() { return applicationLocale; @@ -158,11 +156,11 @@ public class ObserveServiceInitializer { } public ObserveDataSourceConnection getDataSourceConnection() { - return dataSourceConnection.get(); + return dataSourceConnection; } public ObserveDataSourceConfiguration getDataSourceConfiguration() { - return dataSourceConfiguration.get(); + return dataSourceConfiguration; } public File getTemporaryDirectoryRoot() { @@ -174,11 +172,11 @@ public class ObserveServiceInitializer { } public boolean withDataSourceConnection() { - return dataSourceConnection.isPresent(); + return dataSourceConnection != null; } public boolean withDataSourceConfiguration() { - return dataSourceConfiguration.isPresent(); + return dataSourceConfiguration != null; } protected void setApplicationLocale(Locale applicationLocale) { @@ -190,11 +188,11 @@ public class ObserveServiceInitializer { } public void setDataSourceConnection(ObserveDataSourceConnection dataSourceConnection) { - this.dataSourceConnection = Optional.ofNullable(dataSourceConnection); + this.dataSourceConnection = dataSourceConnection; } public void setDataSourceConfiguration(ObserveDataSourceConfiguration dataSourceConfiguration) { - this.dataSourceConfiguration = Optional.ofNullable(dataSourceConfiguration); + this.dataSourceConfiguration = dataSourceConfiguration; } protected void setTemporaryDirectoryRoot(File temporaryDirectoryRoot) { diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java b/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java index 00e3ec9..7bfe7f9 100644 --- a/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java +++ b/services-model/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java @@ -22,11 +22,11 @@ package fr.ird.observe.services.dto.reference; * #L% */ -import com.google.common.base.Supplier; import org.reflections.Reflections; import java.util.Optional; import java.util.Set; +import java.util.function.Supplier; /** * Pour récupérer une instance d'un {@link ReferenceBinderEngine}. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.