Convert Sparky to Spring-Boot

[aai/sparky-be.git] / sparkybe-onap-service / src / test / java / org / onap / aai / sparky / util / OxmModelAndProcessorHelper.java

diff --git a/src/test/java/org/onap/aai/sparky/util/OxmModelAndProcessorHelper.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/util/OxmModelAndProcessorHelper.java
similarity index 84%
rename from src/test/java/org/onap/aai/sparky/util/OxmModelAndProcessorHelper.java
rename to sparkybe-onap-service/src/test/java/org/onap/aai/sparky/util/OxmModelAndProcessorHelper.java
index 48c8290..cebb494 100644 (file)
--- a/src/test/java/org/onap/aai/sparky/util/OxmModelAndProcessorHelper.java
+++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/util/OxmModelAndProcessorHelper.java
@@ -1,8 +1,10 @@
 package org.onap.aai.sparky.util;
 
+import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.onap.aai.sparky.config.SparkyResourceLoader;
 import org.onap.aai.sparky.config.oxm.CrossEntityReferenceLookup;
 import org.onap.aai.sparky.config.oxm.GeoEntityLookup;
 import org.onap.aai.sparky.config.oxm.OxmEntityContainerLookup;
@@ -12,6 +14,7 @@ import org.onap.aai.sparky.config.oxm.OxmModelProcessor;
 import org.onap.aai.sparky.config.oxm.SearchableEntityLookup;
 import org.onap.aai.sparky.config.oxm.SuggestionEntityLookup;
 import org.onap.aai.sparky.search.filters.config.FiltersConfig;
+import org.springframework.core.io.DefaultResourceLoader;
 
 public class OxmModelAndProcessorHelper {
 
@@ -30,10 +33,14 @@ public class OxmModelAndProcessorHelper {
 
        private static OxmModelAndProcessorHelper instance = null;
 
-       private OxmModelAndProcessorHelper() {
+       private OxmModelAndProcessorHelper() throws IOException {
 
-               this.filtersConfig = new FiltersConfig(SparkyTestConstants.FILTERS_JSON_FILE,
-                               SparkyTestConstants.VIEWS_JSON_FILE);
+         SparkyResourceLoader resourceLoader = new SparkyResourceLoader();
+         resourceLoader.setResourceLoader(new DefaultResourceLoader());
+         
+               this.filtersConfig = new FiltersConfig();
+               this.filtersConfig.initializeFiltersDetailsConfig(resourceLoader.getResourceAsFile(SparkyTestConstants.FILTERS_JSON_FILE, false));
+               this.filtersConfig.initializeFiltersForViewsConfig(resourceLoader.getResourceAsFile(SparkyTestConstants.VIEWS_JSON_FILE, false));
 
                this.crossEntityReferenceLookup = new CrossEntityReferenceLookup();
                this.geoEntityLookup = new GeoEntityLookup();
@@ -54,7 +61,7 @@ public class OxmModelAndProcessorHelper {
                modelLoader.loadLatestOxmModel();
        }
 
-       public static OxmModelAndProcessorHelper getInstance() {
+       public static OxmModelAndProcessorHelper getInstance() throws IOException {
                if (instance == null) {
                        instance = new OxmModelAndProcessorHelper();
                }