branch feature/7463-3 updated (14cfd0e -> a5b8877)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7463-3 in repository observe. See http://git.codelutin.com/observe.git from 14cfd0e Ajout d'injecteurs pour récuperer les paramètres dans les controlleurs new 5a2d955 Rendre les configuration clonable new 6e2d4dc Suppression d'un converter non utilisé new 19a0e0b Ajout d'un test pour le service de Ping new 3d07598 Vérifier si le host existe bien new b5a742e L'injecteur de configuration de sources de données utilise le parametre de la requete new 3679a6a Revue injecteurs de configuration new f4864bb revue des configuration de test (j'ai remis les valeurs par defaut new f3c489c Changement d'api new a5b8877 Changement d'api The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a5b88778a43a231298ce742670a4e4bd903c69dc Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:55:09 2015 +0200 Changement d'api commit f3c489c5f25e84cb978e249208c6c4b7e32c3c54 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:54:51 2015 +0200 Changement d'api commit f4864bb68f1e134118afbe3001eb34148fca3ad9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:54:39 2015 +0200 revue des configuration de test (j'ai remis les valeurs par defaut commit 3679a6a1e9eef947aeaa89152b6598714ac82f50 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:54:19 2015 +0200 Revue injecteurs de configuration commit b5a742e3051128acef2e069c2929220c70368d0f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:45:38 2015 +0200 L'injecteur de configuration de sources de données utilise le parametre de la requete commit 3d075989e7fa68740db1c18fad155f23eade73c6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:42:54 2015 +0200 Vérifier si le host existe bien commit 19a0e0beb5365166b596bc4a39d7edbe4406afdc Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:31:22 2015 +0200 Ajout d'un test pour le service de Ping commit 6e2d4dc92ca4a2d71849590be4339ce63c20292b Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:31:04 2015 +0200 Suppression d'un converter non utilisé commit 5a2d955b0bb3e54597b17abc690f5e29c28388ad Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:30:54 2015 +0200 Rendre les configuration clonable Summary of changes: .../ObserveDataSourceConfigurationConverter.java | 47 -------------------- .../ObserveDataSourceConfigurationRest.java | 14 +++--- .../ObserveDataSourceConfigurationTopiaH2.java | 8 +++- .../ObserveDataSourceConfigurationTopiaPG.java | 8 +++- .../services/http/ObserveResponseBuilder.java | 3 +- .../fr/ird/observe/services/TestClassResource.java | 5 +-- .../ird/observe/services/TestMethodResource.java | 2 +- .../services/service/PingServiceRestTest.java | 51 ++++++++++++++++++++++ .../service/seine/TripSeineServiceTest.java | 2 +- .../ObserveDataSourceConfigurationMainFactory.java | 3 +- 10 files changed, 81 insertions(+), 62 deletions(-) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveDataSourceConfigurationConverter.java create mode 100644 observe-services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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>.
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 6e2d4dc92ca4a2d71849590be4339ce63c20292b Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:31:04 2015 +0200 Suppression d'un converter non utilisé --- .../ObserveDataSourceConfigurationConverter.java | 47 ---------------------- 1 file changed, 47 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveDataSourceConfigurationConverter.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveDataSourceConfigurationConverter.java deleted file mode 100644 index 0e688ae..0000000 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveDataSourceConfigurationConverter.java +++ /dev/null @@ -1,47 +0,0 @@ -package fr.ird.observe.application.web; - -import com.google.gson.Gson; -import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; -import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; -import org.apache.commons.beanutils.converters.AbstractConverter; - -/** - * Created on 05/09/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ObserveDataSourceConfigurationConverter extends AbstractConverter { - - protected final Gson gson; - - public ObserveDataSourceConfigurationConverter(boolean devMode) { - gson = new ObserveDtoGsonSupplier(devMode).get(); - } - - @Override - protected <T> T convertToType(Class<T> type, Object value) throws Throwable { - - String stringValue; - - if (value instanceof String) { - - stringValue = (String) value; - - } else { - - stringValue = ((String[]) value)[0]; - - } - - T result = (T) gson.fromJson(stringValue, ObserveDataSourceConfigurationTopiaPG.class); - - return result; - - } - - @Override - protected Class<?> getDefaultType() { - return ObserveDataSourceConfiguration.class; - } -} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 19a0e0beb5365166b596bc4a39d7edbe4406afdc Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:31:22 2015 +0200 Ajout d'un test pour le service de Ping --- .../services/service/PingServiceRestTest.java | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java new file mode 100644 index 0000000..a338309 --- /dev/null +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/PingServiceRestTest.java @@ -0,0 +1,51 @@ +package fr.ird.observe.services.service; + +import fr.ird.observe.services.ObserveServiceRestNotAvailableException; +import fr.ird.observe.services.TestClassResource; +import fr.ird.observe.services.TestMethodResource; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; + +import java.net.MalformedURLException; +import java.net.URL; + +/** + * Created on 07/09/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class PingServiceRestTest { + + @ClassRule + public static final TestClassResource testClassResource = new TestClassResource(); + + @Rule + public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource); + + @Test(expected = ObserveServiceRestNotAvailableException.class) + public void testPingWithBadServerUrl() throws MalformedURLException, CloneNotSupportedException { + + ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration().clone(); + + dataSourceConfiguration.setServerUrl(new URL("http://fake_" + System.nanoTime())); + PingService service = testClassResource.newService(dataSourceConfiguration, PingService.class); + + service.ping(); + + } + + @Test + public void testPingWithBadUserName() throws CloneNotSupportedException { + + ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration().clone(); + + dataSourceConfiguration.setLogin("fake_" + System.nanoTime()); + PingService service = testClassResource.newService(dataSourceConfiguration, PingService.class); + + service.ping(); + + } + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 3d075989e7fa68740db1c18fad155f23eade73c6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:42:54 2015 +0200 Vérifier si le host existe bien --- .../main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java index a132f24..2d4eca8 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java @@ -44,6 +44,7 @@ import java.io.StringWriter; import java.io.UnsupportedEncodingException; import java.lang.reflect.Type; import java.net.ConnectException; +import java.net.UnknownHostException; import java.nio.charset.Charset; import java.util.List; import java.util.Map; @@ -280,7 +281,7 @@ public class ObserveResponseBuilder { try { HttpResponse response = client.execute(request); return response; - } catch (ConnectException e) { + } catch (UnknownHostException | ConnectException e) { // Le service n'est pas accessible throw new ObserveServiceRestNotAvailableException(request.getURI().toURL()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 b5a742e3051128acef2e069c2929220c70368d0f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:45:38 2015 +0200 L'injecteur de configuration de sources de données utilise le parametre de la requete --- .../application/web/ObserveWebApplicationListener.java | 2 +- .../ObserveDataSourceConfigurationInjector.java | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java index eedbd98..d6b357d 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java @@ -35,7 +35,7 @@ public class ObserveWebApplicationListener implements WebMotionServerListener { Gson gson = applicationContext.getGsonSupplier().get(); - context.addInjector(new ObserveDataSourceConfigurationInjector()); + context.addInjector(new ObserveDataSourceConfigurationInjector(gson)); context.addInjector(new IdDtoInjector(gson)); context.addInjector(new FormDtoInjector(gson)); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java index 19fcbb9..683b7b0 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java @@ -1,7 +1,8 @@ package fr.ird.observe.application.web.injector; -import fr.ird.observe.application.web.request.ObserveWebRequestContext; +import com.google.gson.Gson; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.debux.webmotion.server.call.Call; @@ -20,16 +21,24 @@ public class ObserveDataSourceConfigurationInjector implements ExecutorParameter /** Logger. */ private static final Log log = LogFactory.getLog(ObserveDataSourceConfigurationInjector.class); + protected final Gson gson; + + public ObserveDataSourceConfigurationInjector(Gson gson) { + this.gson = gson; + } + @Override public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { ObserveDataSourceConfiguration dataSourceConfiguration = null; if (type.equals(ObserveDataSourceConfiguration.class)) { - // on recupère la configuration de source de données depuis le requestContext - ObserveWebRequestContext requestContext = ObserveWebRequestContext.getRequestContext(call.getContext()); + Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); + + String gsonContent = ((String[]) parameterTree.getValue())[0]; - dataSourceConfiguration = requestContext.getDataSourceConfiguration(); + // On récupère obligatoirement une configuration de type rest + dataSourceConfiguration = gson.fromJson(gsonContent, ObserveDataSourceConfigurationRest.class); if (log.isInfoEnabled()) { log.info("Inject dataSourceConfiguration: " + dataSourceConfiguration); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 3679a6a1e9eef947aeaa89152b6598714ac82f50 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:54:19 2015 +0200 Revue injecteurs de configuration --- .../application/web/ObserveWebApplicationListener.java | 2 +- .../ObserveDataSourceConfigurationInjector.java | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java index d6b357d..eedbd98 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java @@ -35,7 +35,7 @@ public class ObserveWebApplicationListener implements WebMotionServerListener { Gson gson = applicationContext.getGsonSupplier().get(); - context.addInjector(new ObserveDataSourceConfigurationInjector(gson)); + context.addInjector(new ObserveDataSourceConfigurationInjector()); context.addInjector(new IdDtoInjector(gson)); context.addInjector(new FormDtoInjector(gson)); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java index 683b7b0..19fcbb9 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDataSourceConfigurationInjector.java @@ -1,8 +1,7 @@ package fr.ird.observe.application.web.injector; -import com.google.gson.Gson; +import fr.ird.observe.application.web.request.ObserveWebRequestContext; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.debux.webmotion.server.call.Call; @@ -21,24 +20,16 @@ public class ObserveDataSourceConfigurationInjector implements ExecutorParameter /** Logger. */ private static final Log log = LogFactory.getLog(ObserveDataSourceConfigurationInjector.class); - protected final Gson gson; - - public ObserveDataSourceConfigurationInjector(Gson gson) { - this.gson = gson; - } - @Override public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { ObserveDataSourceConfiguration dataSourceConfiguration = null; if (type.equals(ObserveDataSourceConfiguration.class)) { - Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); - - String gsonContent = ((String[]) parameterTree.getValue())[0]; + // on recupère la configuration de source de données depuis le requestContext + ObserveWebRequestContext requestContext = ObserveWebRequestContext.getRequestContext(call.getContext()); - // On récupère obligatoirement une configuration de type rest - dataSourceConfiguration = gson.fromJson(gsonContent, ObserveDataSourceConfigurationRest.class); + dataSourceConfiguration = requestContext.getDataSourceConfiguration(); if (log.isInfoEnabled()) { log.info("Inject dataSourceConfiguration: " + dataSourceConfiguration); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 f4864bb68f1e134118afbe3001eb34148fca3ad9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:54:39 2015 +0200 revue des configuration de test (j'ai remis les valeurs par defaut --- .../src/test/java/fr/ird/observe/services/TestClassResource.java | 5 ++--- .../src/test/java/fr/ird/observe/services/TestMethodResource.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java b/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java index a7f4de9..ad79060 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java @@ -1,6 +1,5 @@ package fr.ird.observe.services; -import com.google.common.base.Optional; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.dto.constants.ReferentialLocale; @@ -131,7 +130,7 @@ public class TestClassResource implements TestRule { configurationRest.setServerUrl(serverUrl); configurationRest.setLogin(login); configurationRest.setPassword(password); - configurationRest.setOptionalDatabaseName(Optional.fromNullable(databaseName)); + configurationRest.setOptionalDatabaseName(databaseName); return configurationRest; @@ -146,7 +145,7 @@ public class TestClassResource implements TestRule { configurationRest.setServerUrl(serverUrl); configurationRest.setLogin(login); configurationRest.setPassword(password); - configurationRest.setOptionalDatabaseName(Optional.<String>absent()); + configurationRest.setOptionalDatabaseName(null); return configurationRest; diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java b/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java index e53eed9..45ded1f 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java @@ -39,7 +39,7 @@ public class TestMethodResource implements TestRule { } public TestMethodResource(TestClassResource testClassResource, String databaseName) { - this(testClassResource, databaseName, "userTest", "password3".toCharArray()); + this(testClassResource, databaseName, "admin", 'a'); } public TestMethodResource(TestClassResource testClassResource, String databaseName, String login, char... password) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 f3c489c5f25e84cb978e249208c6c4b7e32c3c54 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:54:51 2015 +0200 Changement d'api --- .../observe/services/ObserveDataSourceConfigurationMainFactory.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 5331b72..eed962b 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,6 +1,5 @@ package fr.ird.observe.services; -import com.google.common.base.Optional; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; @@ -68,7 +67,7 @@ public class ObserveDataSourceConfigurationMainFactory { result.setServerUrl(serverUrl); result.setLogin(login); result.setPassword(password); - result.setOptionalDatabaseName(Optional.fromNullable(databaseName)); + result.setOptionalDatabaseName(databaseName); return result; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 a5b88778a43a231298ce742670a4e4bd903c69dc Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 14:55:09 2015 +0200 Changement d'api --- .../fr/ird/observe/services/service/seine/TripSeineServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java index 65fda18..631c413 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTest.java @@ -42,7 +42,7 @@ public class TripSeineServiceTest { public static final TestClassResource testClassResource = new TestClassResource(); @Rule - public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource, "testSeine"); + public final TestMethodResource testMethodResource = new TestMethodResource(testClassResource); protected TripSeineService service; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm