This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-3 in repository observe. See http://git.codelutin.com/observe.git commit 5a2d955b0bb3e54597b17abc690f5e29c28388ad Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:30:54 2015 +0200 Rendre les configuration clonable --- .../configuration/ObserveDataSourceConfigurationRest.java | 14 +++++++++----- .../ObserveDataSourceConfigurationTopiaH2.java | 8 +++++++- .../ObserveDataSourceConfigurationTopiaPG.java | 8 +++++++- 3 files changed, 23 insertions(+), 7 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/ObserveDataSourceConfigurationRest.java index d173079..89ace31 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/ObserveDataSourceConfigurationRest.java @@ -11,7 +11,7 @@ import java.net.URL; * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConfiguration { +public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConfiguration, Cloneable { private static final long serialVersionUID = 1L; @@ -38,7 +38,7 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf /** * 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; + protected String optionalDatabaseName; @Override public String getLabel() { @@ -74,15 +74,19 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf } public boolean withDatabaseName() { - return optionalDatabaseName.isPresent(); + return optionalDatabaseName != null; } public Optional<String> getOptionalDatabaseName() { - return optionalDatabaseName; + return Optional.fromNullable(optionalDatabaseName); } - public void setOptionalDatabaseName(Optional<String> optionalDatabaseName) { + public void setOptionalDatabaseName(String optionalDatabaseName) { this.optionalDatabaseName = optionalDatabaseName; } + @Override + public ObserveDataSourceConfigurationRest clone() throws CloneNotSupportedException { + return (ObserveDataSourceConfigurationRest) super.clone(); + } } diff --git a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java index 881f201..49cedfd 100644 --- a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java +++ b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaH2.java @@ -10,7 +10,7 @@ import java.util.Objects; * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveDataSourceConfigurationTopiaH2 extends ObserveDataSourceConfigurationTopiaSupport { +public class ObserveDataSourceConfigurationTopiaH2 extends ObserveDataSourceConfigurationTopiaSupport implements Cloneable { private static final long serialVersionUID = 1L; @@ -83,4 +83,10 @@ public class ObserveDataSourceConfigurationTopiaH2 extends ObserveDataSourceConf .add("password", "***") .toString(); } + + @Override + public ObserveDataSourceConfigurationTopiaH2 clone() throws CloneNotSupportedException { + return (ObserveDataSourceConfigurationTopiaH2) super.clone(); + } + } diff --git a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java index 8cec035..1f7bc08 100644 --- a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java +++ b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaPG.java @@ -9,7 +9,7 @@ import java.util.Objects; * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveDataSourceConfigurationTopiaPG extends ObserveDataSourceConfigurationTopiaSupport { +public class ObserveDataSourceConfigurationTopiaPG extends ObserveDataSourceConfigurationTopiaSupport implements Cloneable { private static final long serialVersionUID = 1L; @@ -75,4 +75,10 @@ public class ObserveDataSourceConfigurationTopiaPG extends ObserveDataSourceConf .add("useSsl", useSsl) .toString(); } + + @Override + public ObserveDataSourceConfigurationTopiaPG clone() throws CloneNotSupportedException { + return (ObserveDataSourceConfigurationTopiaPG) super.clone(); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.