[Git][ultreiaio/ird-observe][develop] 2 commits: Fix rest-client baseurl
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e655bdcc by Tony CHEMIT at 2017-07-25T14:54:31+02:00 Fix rest-client baseurl - - - - - b796bae4 by Tony CHEMIT at 2017-07-25T14:55:41+02:00 Back to 7.0-RC-2 - - - - - 23 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-rest/pom.xml - services-rest/src/main/java/fr/ird/observe/services/rest/ObserveRequestBuilder.java - services-rest/src/main/java/fr/ird/observe/services/rest/ObserveRequestBuilderFactory.java - services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientSupport.java - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-rest/src/main/java/fr/ird/observe/services/rest/ObserveRequestBuilder.java ===================================== --- a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveRequestBuilder.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveRequestBuilder.java @@ -39,12 +39,7 @@ import static fr.ird.observe.services.configuration.rest.ObserveDataSourceConfig */ public class ObserveRequestBuilder extends HRequestBuilder { - private ObserveServiceRestClientContext serviceContext; - - ObserveRequestBuilder setServiceContext(ObserveServiceRestClientContext serviceContext) { - this.serviceContext = serviceContext; - return this; - } + private final ObserveServiceRestClientContext serviceContext; @Override protected void setAuthTokenInRequest() { @@ -70,7 +65,8 @@ public class ObserveRequestBuilder extends HRequestBuilder { addHeader(REQUEST_SPECIES_LIST_CONFIGURATION, serviceContext.getSpeciesListConfigurationAsString()); } - ObserveRequestBuilder(String baseUrl) { - super(baseUrl); + ObserveRequestBuilder(ObserveServiceRestClientContext serviceContext, String baseUrl) { + super(serviceContext.getServiceUrl()+baseUrl); + this.serviceContext=serviceContext; } } ===================================== services-rest/src/main/java/fr/ird/observe/services/rest/ObserveRequestBuilderFactory.java ===================================== --- a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveRequestBuilderFactory.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveRequestBuilderFactory.java @@ -23,6 +23,7 @@ package fr.ird.observe.services.rest; */ import io.ultreia.java4all.http.HRequestBuilderFactory; +import org.apache.commons.lang3.NotImplementedException; /** * Created by tchemit on 17/07/17. @@ -33,7 +34,11 @@ public class ObserveRequestBuilderFactory implements HRequestBuilderFactory { @Override public ObserveRequestBuilder create(String baseUrl) { - return new ObserveRequestBuilder(baseUrl); + throw new NotImplementedException("create"); + } + + public ObserveRequestBuilder create(ObserveServiceRestClientContext serviceContext,String baseUrl) { + return new ObserveRequestBuilder(serviceContext, baseUrl); } } ===================================== services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientSupport.java ===================================== --- a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientSupport.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientSupport.java @@ -53,7 +53,7 @@ public class ObserveServiceRestClientSupport implements HRestClientService, Obse @Override public HRequestBuilder create(String baseUrl) { - return getRequestBuilderFactory().create(baseUrl).setServiceContext(serviceContext); + return getRequestBuilderFactory().create(serviceContext, baseUrl); } @Override ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-3-SNAPSHOT</version> + <version>7.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9c93309a4897f2bc93f78c4ae21... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9c93309a4897f2bc93f78c4ae21... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT