diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-02-01 16:09:23 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-02-01 17:40:01 +0100 |
| commit | aecbb49acfb4dfb3ee5abd0b96a46f38a4b2f568 (patch) | |
| tree | 312cb0d98b88b2ca2c63a7f09fc03fff0f309318 /src/main | |
| parent | e9f8479da16ac6aa4371723835ec72b98c0e6d22 (diff) | |
Allow HTTP with SDC
New version of SDC client allows to either use https or http.
Default version is set to https.
We allow here to configure this.
Issue-ID: OOM-2670
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I22c21573d99ac4e6eecc9ca78215635e52e98449
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java b/src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java index 7523fce..88735d4 100644 --- a/src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java +++ b/src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java @@ -56,6 +56,7 @@ public class ModelLoaderConfig implements IConfiguration { protected static final String PROP_ML_DISTRIBUTION_ASDC_CONNECTION_DISABLED = PREFIX_DISTRIBUTION_CLIENT + "ASDC_CONNECTION_DISABLE"; protected static final String PROP_ML_DISTRIBUTION_ASDC_ADDRESS = PREFIX_DISTRIBUTION_CLIENT + "ASDC_ADDRESS"; + protected static final String PROP_ML_DISTRIBUTION_ASDC_USE_HTTPS = PREFIX_DISTRIBUTION_CLIENT + "ASDC_USE_HTTPS"; protected static final String PROP_ML_DISTRIBUTION_CONSUMER_GROUP = PREFIX_DISTRIBUTION_CLIENT + "CONSUMER_GROUP"; protected static final String PROP_ML_DISTRIBUTION_CONSUMER_ID = PREFIX_DISTRIBUTION_CLIENT + "CONSUMER_ID"; protected static final String PROP_ML_DISTRIBUTION_ENVIRONMENT_NAME = @@ -156,6 +157,16 @@ public class ModelLoaderConfig implements IConfiguration { } @Override + public Boolean isUseHttpsWithSDC() { + /* if PROP_ML_DISTRIBUTION_ASDC_USE_HTTPS is null, https will be used, as before */ + String value = get(PROP_ML_DISTRIBUTION_ASDC_USE_HTTPS); + if (value == null) { + return true; + } + return Boolean.parseBoolean(value); + } + + @Override public String getConsumerGroup() { return get(PROP_ML_DISTRIBUTION_CONSUMER_GROUP); } @@ -320,7 +331,7 @@ public class ModelLoaderConfig implements IConfiguration { /** * Read the value of the property and replace any wildcard OXM version "v*" with the supplied default OXM version - * + * * @param propertyName * the name of the property storing the OXM version (possibly containing v*) * @param version |