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 69296b99cded0ad358f8564815cd4fc97e0ed641 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 7 23:47:12 2015 +0200 On ne soumet dans le header que le jeton de securite --- .../ObserveDataSourceConfigurationRest.java | 12 ++++++++++ ...bserveDataSourceConfigurationRestConstants.java | 6 ----- .../services/ObserveServiceFactoryRest.java | 15 +----------- .../fr/ird/observe/services/TestClassResource.java | 11 +++++++++ .../service/seine/TripSeineServiceTest.java | 27 +++++++++++++++++++++- 5 files changed, 50 insertions(+), 21 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 89ace31..01c5e8c 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 @@ -1,5 +1,6 @@ package fr.ird.observe.services.configuration; +import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import java.net.URL; @@ -89,4 +90,15 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf public ObserveDataSourceConfigurationRest clone() throws CloneNotSupportedException { return (ObserveDataSourceConfigurationRest) super.clone(); } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("label", label) + .add("serverUrl", serverUrl) + .add("login", login) + .add("password", "***") + .add("optionalDatabaseName", optionalDatabaseName) + .toString(); + } } diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java index 8bb72a4..7e0888e 100644 --- a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRestConstants.java @@ -19,12 +19,6 @@ public interface ObserveDataSourceConfigurationRestConstants { String REQUEST_AUTHENTICATION_TOKEN = "authenticationToken"; - String REQUEST_USER_LOGIN = "userLogin"; - - String REQUEST_USER_PASSWORD = "userPassword"; - - String REQUEST_USER_DATABASE_NAME = "userDatabaseName"; - String REQUEST_ADMIN_API_KEY = "adminApiKey"; } diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java index 966f40d..cb40777 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java @@ -315,21 +315,8 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl requestBuilder.addHeader(REQUEST_AUTHENTICATION_TOKEN, dataSourceConnection.getAuthenticationToken()); - } else { - - ObserveDataSourceConfigurationRest dataSourceConfiguration = getDataSourceConfiguration(); - Preconditions.checkState(dataSourceConfiguration != null, "Must have at least a connection or a configuration"); - - requestBuilder.addHeader(REQUEST_USER_LOGIN, dataSourceConfiguration.getLogin()); - requestBuilder.addHeader(REQUEST_USER_PASSWORD, new String(dataSourceConfiguration.getPassword())); - if (dataSourceConfiguration.withDatabaseName()) { - - requestBuilder.addHeader(REQUEST_USER_DATABASE_NAME, dataSourceConfiguration.getOptionalDatabaseName().get()); - - } - } - + if (!Strings.isNullOrEmpty(applicationLocale)) { requestBuilder.addHeader(REQUEST_APPLICATION_LOCALE, applicationLocale); } 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 ad79060..4f9c6ae 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 @@ -2,6 +2,7 @@ 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.ObserveDataSourceConnection; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.test.TestHelper; import org.apache.commons.logging.Log; @@ -65,6 +66,16 @@ public class TestClassResource implements TestRule { return serviceFactory.newService(observeServiceInitializer, serviceType); } + public <S extends ObserveService> S newService(ObserveDataSourceConnection dataSourceConnection, Class<S> serviceType) { + ObserveServiceInitializer observeServiceInitializer = ObserveServiceInitializer.create( + Locale.FRANCE, + ReferentialLocale.FR, + temporaryDirectoryRoot.toFile(), + dataSourceConnection + ); + return serviceFactory.newService(observeServiceInitializer, serviceType); + } + public void closeServiceFactory() { serviceFactory.close(); } 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 631c413..5786ae0 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 @@ -5,6 +5,7 @@ import com.google.common.collect.Iterables; import fr.ird.observe.services.TestClassResource; import fr.ird.observe.services.TestMethodResource; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.ReferenceSetDto; @@ -16,9 +17,12 @@ import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; +import fr.ird.observe.services.service.DataSourceService; +import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.nuiton.util.DateUtil; @@ -33,7 +37,9 @@ import java.util.List; public class TripSeineServiceTest { public static final String TRIP_SEINE_ID_1 = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; + public static final String TRIP_SEINE_ID_2 = "fr.ird.observe.entities.seine.TripSeine#1359280279156#0.41771067982188215"; + public static final String TRIP_SEINE_ID_3 = "fr.ird.observe.entities.seine.TripSeine#1360156698296#0.6097793743126777"; public static final String PROGRAM_ID = "fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234"; @@ -46,11 +52,28 @@ public class TripSeineServiceTest { protected TripSeineService service; + private ObserveDataSourceConnection dataSourceConnection; + + private DataSourceService dataSourceService; + @Before public void setUp() throws Exception { ObserveDataSourceConfigurationRest dataSourceConfiguration = testMethodResource.getDataSourceConfiguration(); - service = testClassResource.newService(dataSourceConfiguration, TripSeineService.class); + + dataSourceService = testClassResource.newService(dataSourceConfiguration, DataSourceService.class); + dataSourceConnection = dataSourceService.open(dataSourceConfiguration); + + service = testClassResource.newService(dataSourceConnection, TripSeineService.class); + + } + + @After + public void tearDown() throws Exception { + + if (dataSourceConnection != null) { + dataSourceService.close(); + } } @@ -221,6 +244,8 @@ public class TripSeineServiceTest { } + //FIXME Ce test modifie la base, il faut trouver un moyen d'utiliser une autre base + @Ignore @Test public void saveUpdateTest() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.