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

[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / AbstractConfigTranslator.java

diff --git a/aai-core/src/test/java/org/onap/aai/AbstractConfigTranslator.java b/aai-core/src/test/java/org/onap/aai/AbstractConfigTranslator.java
index fb91e31..3df799b 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/AbstractConfigTranslator.java
+++ b/aai-core/src/test/java/org/onap/aai/AbstractConfigTranslator.java
@@ -17,10 +17,10 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai;
 
 import java.io.File;
-import java.net.URL;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -38,36 +38,35 @@ public abstract class AbstractConfigTranslator extends ConfigTranslator {
         super(bean, schemaVersions);
     }
 
-    
-
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.onap.aai.setup.ConfigTranslator#getNodeFiles()
      */
     @Override
     public Map<SchemaVersion, List<String>> getNodeFiles() {
-        String prefix = bean.getNodeDirectory() + AAIConstants.AAI_FILESEP ;
-        
+        String prefix = schemaLocationsBean.getNodeDirectory() + AAIConstants.AAI_FILESEP;
+
         String suffix = ".xml";
-        
+
         Map<SchemaVersion, List<String>> files = new TreeMap<>();
         for (SchemaVersion v : schemaVersions.getVersions()) {
-            
+
             List<String> container = getVersionNodeFiles(v);
-            
-            
+
             files.put(v, container);
         }
-        
+
         return files;
     }
-    
 
     public List<String> getVersionNodeFiles(SchemaVersion v) {
-        Pattern p = Pattern.compile("aai(.*)"+"_oxm_(.*).xml" );
-        
+        Pattern p = Pattern.compile("aai(.*)" + "_oxm_(.*).xml");
+
         List<String> container = new ArrayList<>();
-        String directoryName = bean.getNodeDirectory() + AAIConstants.AAI_FILESEP  + v.toString() + AAIConstants.AAI_FILESEP ;
-        
+        String directoryName =
+                schemaLocationsBean.getNodeDirectory() + AAIConstants.AAI_FILESEP + v.toString() + AAIConstants.AAI_FILESEP;
+
         File[] files = new File(directoryName).listFiles();
         for (File f : files) {
             String fileName = f.getName();
@@ -76,10 +75,10 @@ public abstract class AbstractConfigTranslator extends ConfigTranslator {
                 String file = directoryName + m.group();
                 container.add(file.toString());
             }
-            
+
         }
         return container;
-        
+
     }
 
 }