This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-2 in repository observe. See http://git.codelutin.com/observe.git commit 19a15174deb3cf7e5a933137cdc2c97f089ac99f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 4 07:21:16 2015 +0200 Ajout de configuration de sources de données différentes si on est ou pas authentifié au serveur (See #7463) --- ...eDataSourceConfigurationRestAuthenticated.java} | 38 +++--------- ...ataSourceConfigurationRestNotAuthenticated.java | 69 ++++++++++++++++++++++ ...ObserveDataSourceConfigurationRestSupport.java} | 16 +---- .../ObserveDataSourceConfigurationMainFactory.java | 26 ++++++-- 4 files changed, 100 insertions(+), 49 deletions(-) diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestAuthenticated.java similarity index 52% copy from observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java copy to observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestAuthenticated.java index c9625bd..3d0d14d 100644 --- a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestAuthenticated.java @@ -1,48 +1,21 @@ package fr.ird.observe.services.configuration; -import java.net.URL; - /** + * La configuration d'une source de données connectée. + * * Created on 19/08/15. * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConfiguration { +public class ObserveDataSourceConfigurationRestAuthenticated extends ObserveDataSourceConfigurationRestSupport { private static final long serialVersionUID = 1L; /** - * Le libellé de la data source. - */ - protected String label; - - /** - * L'url du serveur à utiliser. - */ - protected URL serverUrl; - - /** * Le jeton d'authentification. */ protected String authenticationToken; - @Override - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public URL getServerUrl() { - return serverUrl; - } - - public void setServerUrl(URL serverUrl) { - this.serverUrl = serverUrl; - } - public String getAuthenticationToken() { return authenticationToken; } @@ -52,6 +25,11 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf } @Override + public boolean isAuthenticated() { + return true; + } + + @Override public boolean datasourceExists() { //TODO return false; diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestNotAuthenticated.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestNotAuthenticated.java new file mode 100644 index 0000000..489773f --- /dev/null +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestNotAuthenticated.java @@ -0,0 +1,69 @@ +package fr.ird.observe.services.configuration; + +import com.google.common.base.Optional; + +/** + * Configuration d'une source de données Rest non connectée. + * + * Created on 19/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ObserveDataSourceConfigurationRestNotAuthenticated extends ObserveDataSourceConfigurationRestSupport { + + private static final long serialVersionUID = 1L; + + /** + * Le login de l'utilisateur. + */ + protected String login; + + /** + * Le mot de passe de l'utilisateur. + */ + protected char[] password; + + /** + * Un nom optionel de base à utiliser, si rien n'est préciser, on utilisera la base par défaut du serveur. + */ + protected Optional<String> optionalDatabaseName; + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public char[] getPassword() { + return password; + } + + public void setPassword(char... password) { + this.password = password; + } + + public boolean withDatabaseName() { + return optionalDatabaseName.isPresent(); + } + public Optional<String> getOptionalDatabaseName() { + return optionalDatabaseName; + } + + public void setOptionalDatabaseName(Optional<String> optionalDatabaseName) { + this.optionalDatabaseName = optionalDatabaseName; + } + + @Override + public boolean isAuthenticated() { + return false; + } + + @Override + public boolean datasourceExists() { + //TODO + return false; + } + +} diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestSupport.java similarity index 65% rename from observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java rename to observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestSupport.java index c9625bd..199b821 100644 --- a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestSupport.java @@ -7,7 +7,7 @@ import java.net.URL; * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConfiguration { +public abstract class ObserveDataSourceConfigurationRestSupport implements ObserveDataSourceConfiguration { private static final long serialVersionUID = 1L; @@ -21,11 +21,7 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf */ protected URL serverUrl; - /** - * Le jeton d'authentification. - */ - protected String authenticationToken; - + public abstract boolean isAuthenticated(); @Override public String getLabel() { return label; @@ -43,14 +39,6 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf this.serverUrl = serverUrl; } - public String getAuthenticationToken() { - return authenticationToken; - } - - public void setAuthenticationToken(String authenticationToken) { - this.authenticationToken = authenticationToken; - } - @Override public boolean datasourceExists() { //TODO diff --git a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java index e9e18cb..d7e7453 100644 --- a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java +++ b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java @@ -1,7 +1,8 @@ package fr.ird.observe.services; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestAuthenticated; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestNotAuthenticated; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; @@ -57,11 +58,26 @@ public class ObserveDataSourceConfigurationMainFactory { } - public ObserveDataSourceConfiguration createObserveDataSourceConfigurationRest(String label, - URL serverUrl, - String authenticationToken) { + public ObserveDataSourceConfiguration createObserveDataSourceConfigurationRestNotAuthenticated(String label, + URL serverUrl, + String login, + char... password) { - ObserveDataSourceConfigurationRest result = new ObserveDataSourceConfigurationRest(); + ObserveDataSourceConfigurationRestNotAuthenticated result = new ObserveDataSourceConfigurationRestNotAuthenticated(); + result.setLabel(label); + result.setServerUrl(serverUrl); + result.setLogin(login); + result.setPassword(password); + + return result; + + } + + public ObserveDataSourceConfiguration createObserveDataSourceConfigurationRestAuthenticated(String label, + URL serverUrl, + String authenticationToken) { + + ObserveDataSourceConfigurationRestAuthenticated result = new ObserveDataSourceConfigurationRestAuthenticated(); result.setLabel(label); result.setServerUrl(serverUrl); result.setAuthenticationToken(authenticationToken); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.