summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorLee, Tian (tl5884) <tianl@amdocs.com>2017-08-15 16:18:20 +0100
committerLee, Tian (tl5884) <tianl@amdocs.com>2017-08-15 16:46:34 +0100
commit3e34fda1f814cc7fcc04d704af812f374ff4a7cd (patch)
treefee168a6fd7ccb819c2edfa1ca9a394b788152a0 /src/main/java
parent9bc8490797488b9facf5f1a6a8941c2aac219e54 (diff)
[AAI-170 R1710] Upversion sdc-distribution-client
- from 1.0.0 to 1.1.32-SNAPSHOT Change-Id: Iac775e7ae3378dcaeca717cdafde9a8472c24172 Signed-off-by: Lee, Tian (tl5884) <tianl@amdocs.com>
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java b/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
index 107010d..adc8f0b 100644
--- a/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
+++ b/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
@@ -62,6 +62,8 @@ public class ModelLoaderConfig implements IConfiguration {
protected static final String PROP_ML_DISTRIBUTION_USER = PREFIX_DISTRIBUTION_CLIENT + "USER";
protected static final String PROP_ML_DISTRIBUTION_ARTIFACT_TYPES = PREFIX_DISTRIBUTION_CLIENT
+ "ARTIFACT_TYPES";
+ protected static final String PROP_ML_DISTRIBUTION_HTTPS_WITH_DMAAP =
+ PREFIX_DISTRIBUTION_CLIENT + "USE_HTTPS_WITH_DMAAP";
protected static final String PROP_AAI_BASE_URL = PREFIX_AAI + "BASE_URL";
protected static final String PROP_AAI_KEYSTORE_FILE = PREFIX_AAI + "KEYSTORE_FILE";
@@ -165,6 +167,17 @@ public class ModelLoaderConfig implements IConfiguration {
return modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_USER);
}
+ @Override
+ public boolean isFilterInEmptyResources() {
+ return false;
+ }
+
+ @Override
+ public Boolean isUseHttpsWithDmaap() {
+ String useHTTPS = modelLoaderProperties.getProperty(PROP_ML_DISTRIBUTION_HTTPS_WITH_DMAAP);
+ return useHTTPS == null ? false : Boolean.valueOf(useHTTPS);
+ }
+
public String getAaiKeyStorePath() {
return certLocation + "/" + modelLoaderProperties.getProperty(PROP_AAI_KEYSTORE_FILE);
}
@@ -224,9 +237,5 @@ public class ModelLoaderConfig implements IConfiguration {
return false;
}
-
- public boolean isFilterInEmptyResources() {
- return false;
- }
-
+
}