Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

2 changed files:

Changes:

  • server-configuration/src/main/config/Server.ini
    ... ... @@ -28,20 +28,6 @@ type = string
    28 28 
     defaultValue = changeme
    29 29 
     final = true
    30 30
    31 
    -[option host]
    32 
    -description = observeweb.host.description
    33 
    -key = observeweb.host
    34 
    -type = url
    35 
    -defaultValue = http://localhost:8080
    36 
    -final = true
    37 
    -
    38 
    -[option apiUrl]
    39 
    -description = observeweb.apiUrl.description
    40 
    -key = observeweb.apiUrl
    41 
    -type = url
    42 
    -defaultValue = ${observeweb.host}/${observeweb.contextPath}/api/v1
    43 
    -final = true
    44 
    -
    45 31 
     [option modelVersion]
    46 32 
     description = observe.model.version
    47 33 
     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;
    44 44 
     import org.apache.logging.log4j.LogManager;
    45 45
    46 46 
     import java.io.File;
    47 
    +import java.net.URL;
    47 48 
     import java.util.LinkedHashSet;
    48 49 
     import java.util.Optional;
    49 50 
     import java.util.Set;
    ... ... @@ -71,7 +72,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi
    71 72 
             ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).create(dataSourceConfigurationTopia, dataSourceCreateConfiguration);
    72 73
    73 74 
             String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection);
    74 
    -        return createDataSourceConnection(observeDataSourceConnection, authenticationToken);
    75 
    +        return createDataSourceConnection(((ObserveDataSourceConnectionRest)dataSourceConfiguration).getServerUrl(), observeDataSourceConnection, authenticationToken);
    75 76
    76 77 
         }
    77 78
    ... ... @@ -83,7 +84,7 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi
    83 84 
             ObserveDataSourceConnection observeDataSourceConnection = getAnonymousService(dataSourceConfigurationTopia).open(dataSourceConfigurationTopia);
    84 85
    85 86 
             String authenticationToken = registerDataSourceConfiguration(dataSourceConfigurationTopia, observeDataSourceConnection);
    86 
    -        return createDataSourceConnection(observeDataSourceConnection, authenticationToken);
    87 
    +        return createDataSourceConnection(((ObserveDataSourceConfigurationRest)dataSourceConfiguration).getServerUrl(),observeDataSourceConnection, authenticationToken);
    87 88
    88 89 
         }
    89 90
    ... ... @@ -155,10 +156,10 @@ public class DataSourceServiceRestApi extends GeneratedDataSourceServiceRestApi
    155 156
    156 157 
         }
    157 158
    158 
    -    protected ObserveDataSourceConnectionRest createDataSourceConnection(ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) {
    159 
    +    protected ObserveDataSourceConnectionRest createDataSourceConnection(URL serverUrl, ObserveDataSourceConnection observeDataSourceConnection, String authenticationToken) {
    159 160
    160 161 
             return new ObserveDataSourceConnectionRest(
    161 
    -                getApplicationConfiguration().getApiUrl(),
    162 
    +                serverUrl,
    162 163 
                     authenticationToken,
    163 164 
                     observeDataSourceConnection.canReadReferential(),
    164 165 
                     observeDataSourceConnection.canWriteReferential(),

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.