Convert Sparky to Spring-Boot

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

diff --git a/src/main/java/org/onap/aai/sparky/sync/ElasticSearchSchemaFactory.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/ElasticSearchSchemaFactory.java
similarity index 64%
rename from src/main/java/org/onap/aai/sparky/sync/ElasticSearchSchemaFactory.java
rename to sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/ElasticSearchSchemaFactory.java
index fde2fef..a2ff6cf 100644 (file)
--- a/src/main/java/org/onap/aai/sparky/sync/ElasticSearchSchemaFactory.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/sync/ElasticSearchSchemaFactory.java
@@ -1,31 +1,34 @@
 /**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 Amdocs
- * ================================================================================
+ * ============LICENSE_START===================================================
+ * SPARKY (AAI UI service)
+ * ============================================================================
+ * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 Amdocs
+ * All rights reserved.
+ * ============================================================================
  * 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.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ============LICENSE_END=========================================================
+ * ============LICENSE_END=====================================================
+ *
+ * ECOMP and OpenECOMP are trademarks
+ * and service marks of AT&T Intellectual Property.
  */
 package org.onap.aai.sparky.sync;
 
 import java.io.IOException;
 
+import org.onap.aai.sparky.config.SparkyResourceLoader;
 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.SparkyConstants;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -36,45 +39,26 @@ public class ElasticSearchSchemaFactory {
 
   private static final String SETTINGS = "settings";
   private static final String MAPPINGS = "mappings";
-
-  private static ObjectMapper mapper = new ObjectMapper();
-
-  protected static String getConfigAsString(String configItem, String configFileName)
-      throws ElasticSearchOperationException {
-    String indexConfig = null;
-
-    try {
-      indexConfig = ConfigHelper.getFileContents(configFileName);
-    } catch (IOException exc) {
-      throw new ElasticSearchOperationException(
-          "Failed to read index " + configItem + " from file = " + configFileName + ".", exc);
-    }
-
-    if (indexConfig == null) {
-      throw new ElasticSearchOperationException(
-          "Failed to load index " + configItem + " with filename = " + configFileName + ".");
-    }
-    return indexConfig;
-  }
-
-  
   
-  public static String getIndexSchema(ElasticSearchSchemaConfig schemaConfig)
+  private static ObjectMapper mapper = new ObjectMapper();
+  private SparkyResourceLoader resourceLoader;
+    
+  public String getIndexSchema(ElasticSearchSchemaConfig schemaConfig)
       throws ElasticSearchOperationException {
 
     JsonNode esSettingsNode = null;
     JsonNode esMappingsNodes = null;
 
     try {
-
+      
       if (schemaConfig.getIndexSettingsFileName() != null) {
-        esSettingsNode = mapper.readTree(getConfigAsString(SETTINGS,
-            SparkyConstants.getConfigPath(schemaConfig.getIndexSettingsFileName())));
+        esSettingsNode = mapper
+            .readTree(resourceLoader.getResourceAsString(schemaConfig.getIndexSettingsFileName(),true));
       }
 
       if (schemaConfig.getIndexMappingsFileName() != null) {
-        esMappingsNodes = mapper.readTree(getConfigAsString(MAPPINGS,
-            SparkyConstants.getConfigPath(schemaConfig.getIndexMappingsFileName())));
+        esMappingsNodes = mapper
+            .readTree(resourceLoader.getResourceAsString(schemaConfig.getIndexMappingsFileName(),true));
       }
 
     } catch (IOException e1) {
@@ -102,5 +86,12 @@ public class ElasticSearchSchemaFactory {
 
   }
 
+  public SparkyResourceLoader getResourceLoader() {
+    return resourceLoader;
+  }
+
+  public void setResourceLoader(SparkyResourceLoader resourceLoader) {
+    this.resourceLoader = resourceLoader;
+  }
 
 }