Process multi-OXM files

Gizmo service uses common OXM consumer to process multi-OXM files

Issue-ID: AAI-1196

Change-Id: If6dd50413a914984948272cd6bd98e2eeeaecedb
Signed-off-by: Sotiropoulos, Ioannis (is948x) <Ioannis.Sotiropoulos@amdocs.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/src/main/java/org/onap/schema/RelationshipSchemaLoader.java b/src/main/java/org/onap/schema/RelationshipSchemaLoader.java
index 0e10fc3..9a9a37c 100644
--- a/src/main/java/org/onap/schema/RelationshipSchemaLoader.java
+++ b/src/main/java/org/onap/schema/RelationshipSchemaLoader.java
@@ -41,9 +41,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
 import javax.ws.rs.core.Response.Status;
-
 import org.apache.commons.io.IOUtils;
 import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.crud.exception.CrudException;
@@ -125,8 +123,8 @@ public class RelationshipSchemaLoader {
         rulesFiles.add(file);
         existingFiles.add(filename(file));
       }
-      
-      // Get DBEdgeRules from the jar on the classpath.  Don't include any that conflict with files which 
+
+      // Get DBEdgeRules from the jar on the classpath.  Don't include any that conflict with files which
       // were dropped manually.
       Resource[] rawResourceList = rulesResolver.getResources("classpath*:/dbedgerules/DbEdgeRules*" + fileExt);
       List<Resource> prunedResourceList = new ArrayList<Resource>();
@@ -135,10 +133,10 @@ public class RelationshipSchemaLoader {
           prunedResourceList.add(resource);
         }
       }
-      
+
       rulesFiles.addAll(Arrays.stream(prunedResourceList.toArray(new Resource[prunedResourceList.size()]))
           .filter(r -> !myMatcher(rulesPattern, r.getFilename()).isEmpty()).collect(Collectors.toList()));
-      
+
       // This gets all the objects of type "File" from external directory (not
       // on the classpath)
       // 1. From an external directory (one not on the classpath) we get all the
@@ -271,4 +269,4 @@ public class RelationshipSchemaLoader {
     Matcher m = p.matcher(s);
     return m.matches() ? m.group(1) : "";
   }
-}
+}
\ No newline at end of file