changed the header license to new license

[aai/sparky-be.git] / src / main / java / org / onap / aai / sparky / sync / ElasticSearchSchemaFactory.java

diff --git a/src/main/java/org/onap/aai/sparky/sync/ElasticSearchSchemaFactory.java b/src/main/java/org/onap/aai/sparky/sync/ElasticSearchSchemaFactory.java
index 9013600..fde2fef 100644 (file)
--- a/src/main/java/org/onap/aai/sparky/sync/ElasticSearchSchemaFactory.java
+++ b/src/main/java/org/onap/aai/sparky/sync/ElasticSearchSchemaFactory.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 Amdocs
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.sparky.sync;
 
@@ -27,7 +25,7 @@ import java.io.IOException;
 import org.onap.aai.sparky.dal.exception.ElasticSearchOperationException;
 import org.onap.aai.sparky.sync.config.ElasticSearchSchemaConfig;
 import org.onap.aai.sparky.util.ConfigHelper;
-import org.onap.aai.sparky.viewandinspect.config.TierSupportUiConstants;
+import org.onap.aai.sparky.viewandinspect.config.SparkyConstants;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -59,8 +57,8 @@ public class ElasticSearchSchemaFactory {
     return indexConfig;
   }
 
-
-
+  
+  
   public static String getIndexSchema(ElasticSearchSchemaConfig schemaConfig)
       throws ElasticSearchOperationException {
 
@@ -71,18 +69,17 @@ public class ElasticSearchSchemaFactory {
 
       if (schemaConfig.getIndexSettingsFileName() != null) {
         esSettingsNode = mapper.readTree(getConfigAsString(SETTINGS,
-            TierSupportUiConstants.getConfigPath(schemaConfig.getIndexSettingsFileName())));
+            SparkyConstants.getConfigPath(schemaConfig.getIndexSettingsFileName())));
       }
 
       if (schemaConfig.getIndexMappingsFileName() != null) {
         esMappingsNodes = mapper.readTree(getConfigAsString(MAPPINGS,
-            TierSupportUiConstants.getConfigPath(schemaConfig.getIndexMappingsFileName())));
+            SparkyConstants.getConfigPath(schemaConfig.getIndexMappingsFileName())));
       }
 
     } catch (IOException e1) {
-
-      throw new ElasticSearchOperationException(
-          "Caught an exception building initial ES index. Error: " + e1.getMessage());
+      
+      throw new ElasticSearchOperationException("Caught an exception building initial ES index. Error: " + e1.getMessage());
     }
 
     ObjectNode esConfig = null;