Remove OpenECOMP from license file

[aai/model-loader.git] / src / main / java / org / openecomp / modelloader / config / ModelLoaderConfig.java

diff --git a/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java b/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
index 107010d..cb4719e 100644 (file)
--- a/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
+++ b/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java
@@ -1,6 +1,6 @@
 /**
  * ============LICENSE_START=======================================================
- * Model Loader
+ * org.onap.aai
  * ================================================================================
  * Copyright © 2017 AT&T Intellectual Property.
  * Copyright © 2017 Amdocs
@@ -9,7 +9,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +19,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.modelloader.config;
 
@@ -62,6 +63,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 +168,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 +238,5 @@ public class ModelLoaderConfig implements IConfiguration {
 
     return false;
   }
-
-  public boolean isFilterInEmptyResources() {
-         return false;
-  }
-
+  
 }