This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 3c8ac9d84c20fa94d6fc63b12b492cb9d7ded67a Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 26 11:39:06 2015 +0200 Ajout de méthodes utiles pour savoir quelle type de datasource on utilise --- .../configuration/ObserveDataSourceConfigurationTopiaH2.java | 10 ++++++++++ .../configuration/ObserveDataSourceConfigurationTopiaPG.java | 10 ++++++++++ .../ObserveDataSourceConfigurationTopiaSupport.java | 4 ++++ 3 files changed, 24 insertions(+) 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 957bf64..d17e5c6 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 @@ -25,6 +25,16 @@ public class ObserveDataSourceConfigurationTopiaH2 extends ObserveDataSourceConf protected String dbName; @Override + public boolean isH2Database() { + return true; + } + + @Override + public boolean isPostgresDatabase() { + return false; + } + + @Override public boolean datasourceExists() { return new File(directory, dbName + ".h2.db").exists(); } 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 fe5f700..4aa7fc1 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 @@ -24,6 +24,16 @@ public class ObserveDataSourceConfigurationTopiaPG extends ObserveDataSourceConf protected boolean useSsl; @Override + public boolean isH2Database() { + return false; + } + + @Override + public boolean isPostgresDatabase() { + return true; + } + + @Override public boolean datasourceExists() { //FIXME tenter une connection pour voir si la base existe return true; diff --git a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java index 733cc1a..08309c0 100644 --- a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java +++ b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationTopiaSupport.java @@ -44,6 +44,10 @@ public abstract class ObserveDataSourceConfigurationTopiaSupport implements Obse protected boolean autoMigrate; + public abstract boolean isH2Database(); + + public abstract boolean isPostgresDatabase(); + public String getUsername() { return username; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.