Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 699b0511 by tchemit at 2019-08-04T14:48:45Z [SERVEUR] observe-server.conf / observeweb.host - Closes #1369 - - - - - 2 changed files: - server-configuration/src/main/config/Server.ini - server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java Changes: ===================================== server-configuration/src/main/config/Server.ini ===================================== @@ -28,20 +28,6 @@ type = string defaultValue = changeme final = true -[option host] -description = observeweb.host.description -key = observeweb.host -type = url -defaultValue = http://localhost:8080 -final = true - -[option apiUrl] -description = observeweb.apiUrl.description -key = observeweb.apiUrl -type = url -defaultValue = ${observeweb.host}/${observeweb.contextPath}/api/v1 -final = true - [option modelVersion] description = observe.model.version key = observeweb.model.version ===================================== server-core/src/main/java/fr/ird/observe/server/controller/v1/DataSourceServiceRestApi.java ===================================== @@ -44,6 +44,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import java.io.File; +import java.net.URL; import java.util.LinkedHashSet; import java.util.Optional; import java.util.Set; @@ -71,7 +72,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).create(dataSourceConfigurationTopia, dataSourceCreateConfiguration); String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection); - return createDataSourceConnection(observeDataSourceConnection, authenticationToken); + return createDataSourceConnection(((ObserveDataSourceConnectionRest)dataSourceConfiguration).getServerUrl(), observeDataSourceConnection, authenticationToken); } @@ -83,7 +84,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).open(dataSourceConfigurationTopia); String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection); - return createDataSourceConnection(observeDataSourceConnection, authenticationToken); + return createDataSourceConnection(((ObserveDataSourceConfigurationRest)dataSourceConfiguration).getServerUrl(),observeDataSourceConnection, authenticationToken); } @@ -155,10 +156,10 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi } - protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) { + protected ObserveDataSourceConnectionRest createDataSourceConnection(URL serverUrl, ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) { return new ObserveDataSourceConnectionRest( - getApplicationConfiguration().getApiUrl(), + serverUrl, authenticationToken, observeDataSourceConnection.canReadReferential(), observeDataSourceConnection.canWriteReferential(), View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/699b0511028de38f9ccd78bd8da9... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/699b0511028de38f9ccd78bd8da9... You're receiving this email because of your account on gitlab.com.