X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fmodelloader%2Fconfig%2FModelLoaderConfig.java;h=adc8f0be50bc0485c83ec5c93873f8fa7e7ab593;hb=refs%2Fchanges%2F19%2F7619%2F1;hp=107010dc790d84665ec09479edaec7e2e083b3ae;hpb=9bc8490797488b9facf5f1a6a8941c2aac219e54;p=aai%2Fmodel-loader.git 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; - } - + }