This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git commit b9bf71e4e49538918a1305f81e54bdf7d93f70cc Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Sep 6 11:06:27 2015 +0200 Ajout du jeton d'authentification sur le DataSourceConnection --- .../java/fr/ird/observe/services/ObserveServiceInitializer.java | 4 ++++ .../services/configuration/ObserveDataSourceConnection.java | 5 +++++ .../configuration/ObserveDataSourceConnectionSupport.java | 8 ++------ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java index 8ea0674..779ed81 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceInitializer.java @@ -120,6 +120,10 @@ public class ObserveServiceInitializer { return dataSourceConnection.isPresent(); } + public boolean withDataSourceConfiguration() { + return dataSourceConfiguration.isPresent(); + } + protected void setApplicationLocale(Locale applicationLocale) { this.applicationLocale = applicationLocale; } diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java index 2871e9e..6484d53 100644 --- a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java +++ b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java @@ -10,6 +10,11 @@ package fr.ird.observe.services.configuration; public interface ObserveDataSourceConnection { /** + * @return le jeton qui identifie cette connexion + */ + String getAuthenticationToken(); + + /** * @return {@code true} si on peut lire les référentiels, {@code false} sinon. */ boolean canReadReferential(); diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java index 37272d5..a803d10 100644 --- a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java +++ b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java @@ -62,16 +62,12 @@ public abstract class ObserveDataSourceConnectionSupport implements ObserveDataS if (this == o) return true; if (!(o instanceof ObserveDataSourceConnectionSupport)) return false; ObserveDataSourceConnectionSupport that = (ObserveDataSourceConnectionSupport) o; - return Objects.equals(readReferential, that.readReferential) && - Objects.equals(writeReferential, that.writeReferential) && - Objects.equals(readData, that.readData) && - Objects.equals(writeData, that.writeData) && - Objects.equals(authenticationToken, that.authenticationToken); + return Objects.equals(authenticationToken, that.authenticationToken); } @Override public int hashCode() { - return Objects.hash(authenticationToken, readReferential, writeReferential, readData, writeData); + return Objects.hash(authenticationToken); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.