Only load SchemaService related beans in aai-common when schema.translator.list=schem...

[aai/aai-common.git] / aai-schema-ingest / src / main / java / org / onap / aai / setup / ConfigTranslator.java

diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java
index 4e6a6bd..50b9dc2 100644 (file)
--- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java
+++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/ConfigTranslator.java
@@ -1,5 +1,4 @@
-/** 
- * ============LICENSE_START=======================================================
+/**  ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-18 AT&T Intellectual Property. All rights reserved.
@@ -16,56 +15,59 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- */
+*/
 
 package org.onap.aai.setup;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import org.apache.commons.io.IOUtils;
-import org.onap.aai.edges.JsonIngestor;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.io.IOUtils;
+import org.onap.aai.edges.JsonIngestor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
 /**
  * Converts the contents of the schema config file
  * (which lists which schema files to be loaded) to
  * the format the Ingestors can work with.
  * 
  */
-public abstract class ConfigTranslator extends Translator{
-       private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(ConfigTranslator.class);
-    
-       protected SchemaLocationsBean bean;
-
-       
-       @Autowired
-       public ConfigTranslator(SchemaLocationsBean schemaLocationbean, SchemaVersions schemaVersions) {
-           super(schemaVersions);
-               this.bean = schemaLocationbean;
-
-       }
-       
-       /**
-        * Translates the contents of the schema config file
-        * into the input for the NodeIngestor
-        * 
-        * @return Map of Version to the list of (string) filenames to be 
-        * ingested for that version
-        */
-       public abstract Map<SchemaVersion, List<String>> getNodeFiles();
+public abstract class ConfigTranslator extends Translator {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConfigTranslator.class);
+
+    protected SchemaLocationsBean schemaLocationsBean;
+
+    @Autowired
+    public ConfigTranslator(SchemaLocationsBean schemaLocationsBean, SchemaConfigVersions schemaConfigVersions) {
+        super(schemaConfigVersions);
+        this.schemaLocationsBean = schemaLocationsBean;
+
+    }
+
+    /**
+     * Translates the contents of the schema config file
+     * into the input for the NodeIngestor
+     * 
+     * @return Map of Version to the list of (string) filenames to be
+     *         ingested for that version
+     */
+    public abstract Map<SchemaVersion, List<String>> getNodeFiles();
 
     public List<InputStream> getVersionNodeStream(SchemaVersion version) {
 
         Map<SchemaVersion, List<String>> filesToIngest = getNodeFiles();
         List<InputStream> streams = new ArrayList<>();
 
-        if(!filesToIngest.containsKey(version)) {
+        if (!filesToIngest.containsKey(version)) {
             return streams;
         }
         List<String> versionFiles = filesToIngest.get(version);
@@ -74,13 +76,13 @@ public abstract class ConfigTranslator extends Translator{
             try {
                 InputStream stream = new FileInputStream(new File(name));
                 String value = IOUtils.toString(stream, Charset.defaultCharset());
-                InputStream bis =(IOUtils.toInputStream(value, Charset.defaultCharset()));
+                InputStream bis = (IOUtils.toInputStream(value, Charset.defaultCharset()));
                 streams.add(bis);
             } catch (FileNotFoundException e) {
-               //TODO This may have to be cascaded
-                LOGGER.warn("File Not Found"+e.getMessage());
+                // TODO This may have to be cascaded
+                LOGGER.warn("File Not Found" + e.getMessage());
             } catch (IOException e) {
-                LOGGER.warn("IOException while reading files"+e.getMessage());
+                LOGGER.warn("IOException while reading files" + e.getMessage());
             }
         }
         return streams;
@@ -90,7 +92,7 @@ public abstract class ConfigTranslator extends Translator{
     public List<String> getJsonPayload(SchemaVersion version) {
         Map<SchemaVersion, List<String>> filesToIngest = getEdgeFiles();
         List<String> jsonPayloads = new ArrayList<>();
-        if(!filesToIngest.containsKey(version)) {
+        if (!filesToIngest.containsKey(version)) {
             return jsonPayloads;
         }
         List<String> versionFiles = filesToIngest.get(version);
@@ -102,14 +104,14 @@ public abstract class ConfigTranslator extends Translator{
 
         return jsonPayloads;
     }
-       
-       /**
-        * Translates the contents of the schema config file
-        * into the input for the EdgeIngestor
-        * 
-        * @return Map of Version to the List of (String) filenames to be 
-        * ingested for that version
-        */
-       public abstract Map<SchemaVersion, List<String>> getEdgeFiles();
+
+    /**
+     * Translates the contents of the schema config file
+     * into the input for the EdgeIngestor
+     * 
+     * @return Map of Version to the List of (String) filenames to be
+     *         ingested for that version
+     */
+    public abstract Map<SchemaVersion, List<String>> getEdgeFiles();
 
 }