This is an automated email from the git hooks/post-receive script. New commit to branch feature/8382_Information_serveur_distant in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 4a74f96d64ec4025658e3055fbbe27ee7b129dfe Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Jul 12 16:38:06 2016 +0200 Introduit un typage des sources de donnees (SQL, SERVER) refs #8382 --- .../java/fr/ird/observe/db/ObserveSwingDataSource.java | 6 +++++- .../src/main/resources/ftl/dataSourceInformation_fr.ftl | 14 ++++++++------ .../configuration/ObserveDataSourceConfiguration.java | 2 ++ .../services/configuration/ObserveDataSourceType.java | 11 +++++++++++ .../configuration/ObserveDataSourceConfigurationRest.java | 5 +++++ .../ObserveDataSourceConfigurationTopiaSupport.java | 5 +++++ 6 files changed, 36 insertions(+), 7 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java index 7c23a14..80bdb99 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java @@ -18,6 +18,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopia import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; +import fr.ird.observe.services.configuration.ObserveDataSourceType; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; @@ -88,6 +89,10 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements return configuration.getLabel(); } + public boolean isSqlDataSource() { + return configuration.getType() == ObserveDataSourceType.SQL; + } + // public String getAuthenticationToken() { // String result = null; // if (connection != null) { @@ -124,7 +129,6 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements return result; } - public ObserveDataSourceInformation getInformation() { return new ObserveDataSourceInformation( canReadReferential(), diff --git a/observe-application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl b/observe-application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl index 1eda777..31fc012 100644 --- a/observe-application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl +++ b/observe-application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl @@ -4,12 +4,14 @@ <#if configuration??> <h3>${label}</h3> <ul> - <#if configuration.h2Database??> - <li><strong>Utilisateur : </strong>${configuration.username}</li> - <#elseif configuration.postgresDatabase??> - <li><strong>URL jdbc : </strong>${configuration.jdbcUrl}</li> - <li><strong>Utilisateur : </strong>${configuration.username}</li> - <li><strong>Mode SSL : </strong>${configuration.useSsl?then('Oui', 'Non')}</li> + <#if isSqlDataSource() > + <#if configuration.h2Database??> + <li><strong>Utilisateur : </strong>${configuration.username}</li> + <#elseif configuration.postgresDatabase??> + <li><strong>URL jdbc : </strong>${configuration.jdbcUrl}</li> + <li><strong>Utilisateur : </strong>${configuration.username}</li> + <li><strong>Mode SSL : </strong>${configuration.useSsl?then('Oui', 'Non')}</li> + </#if> <#else> <li><strong>URL du serveur : </strong>${configuration.serverUrl}</li> <li><strong>Utilisateur : </strong>${configuration.login}</li> diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java index 8c94d80..5d144e0 100644 --- a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java +++ b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfiguration.java @@ -35,6 +35,8 @@ public interface ObserveDataSourceConfiguration extends Serializable, Cloneable String getLabel(); + ObserveDataSourceType getType(); + Version getModelVersion(); ObserveDataSourceConfiguration clone() throws CloneNotSupportedException; diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceType.java b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceType.java new file mode 100644 index 0000000..4500a66 --- /dev/null +++ b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceType.java @@ -0,0 +1,11 @@ +package fr.ird.observe.services.configuration; + +/** + * Created on 12/07/16. + * + * @author Samuel Maisonneuve - maisonneuve@codelutin.com + */ +public enum ObserveDataSourceType { + SQL, + SERVER +} 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 00849c6..2cfb98c 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 @@ -75,6 +75,11 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf return label; } + @Override + public ObserveDataSourceType getType() { + return ObserveDataSourceType.SERVER; + } + public void setLabel(String label) { this.label = label; } 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 51e0ad4..444ebb6 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 @@ -144,4 +144,9 @@ public abstract class ObserveDataSourceConfigurationTopiaSupport implements Obse public ObserveDataSourceConfigurationTopiaSupport clone() throws CloneNotSupportedException { return (ObserveDataSourceConfigurationTopiaSupport) super.clone(); } + + @Override + public ObserveDataSourceType getType() { + return ObserveDataSourceType.SQL; + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.