X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fdatarouter%2Fpolicy%2FEntityEventPolicy.java;h=152baf33f285c0709ca43b9907240ba456020077;hb=06576aee86306e15f01796b50f323939a6d1b531;hp=6276abd778083c68c51a1f5168a29f3d30b3c49c;hpb=0f03ce7eea220df68d84a7f0f088a38ebb088039;p=aai%2Fdata-router.git

diff --git a/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java b/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java
index 6276abd..152baf3 100644
--- a/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java
+++ b/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java
@@ -56,6 +56,7 @@ import org.onap.aai.util.CrossEntityReference;
 import org.onap.aai.util.EntityOxmReferenceHelper;
 import org.onap.aai.util.ExternalOxmModelProcessor;
 import org.onap.aai.schema.OxmModelLoader;
+import org.onap.aai.setup.SchemaVersions;
 import org.onap.aai.util.Version;
 import org.onap.aai.util.VersionedOxmEntities;
 import org.onap.aai.cl.api.Logger;
@@ -143,7 +144,7 @@ public class EntityEventPolicy implements Processor {
     this.externalOxmModelProcessors = new ArrayList<>();
     this.externalOxmModelProcessors.add(EntityOxmReferenceHelper.getInstance());
     OxmModelLoader.registerExternalOxmModelProcessors(externalOxmModelProcessors);
-    OxmModelLoader.loadModels();
+    OxmModelLoader.loadModels(config.getSchemaVersions(), config.getSchemaLocationsBean());
     oxmVersionContextMap = OxmModelLoader.getVersionContextMap();
     parseLatestOxmVersion();
   }
@@ -215,7 +216,7 @@ public class EntityEventPolicy implements Processor {
 
     String uebPayload = exchange.getIn().getBody().toString();
 
-    JsonNode uebAsJson =null;
+    JsonNode uebAsJson = null;
     ObjectMapper mapper = new ObjectMapper();
     try{
       uebAsJson = mapper.readTree(uebPayload);
@@ -906,7 +907,7 @@ public class EntityEventPolicy implements Processor {
         if (!sourceObject.isEmpty()) {
           JsonNode node = sourceObject.get(0);
           final String sourceCer = NodeUtils.extractFieldValueFromObject(node, 
-              "crossEntityReferenceValues");
+              "crossReferenceEntityValues");
           String newCer = aaiEventEntity.getCrossReferenceEntityValues();
           boolean hasNewCer = true;
           if (sourceCer != null && sourceCer.length() > 0){ // already has CER
@@ -919,7 +920,7 @@ public class EntityEventPolicy implements Processor {
           
           if (hasNewCer){
             // Do the PUT with new CER
-            ((ObjectNode)node).put("crossEntityReferenceValues", newCer);
+            ((ObjectNode)node).put("crossReferenceEntityValues", newCer);
             jsonPayload = NodeUtils.convertObjectToJson(node, false);
             searchAgent.putDocument(entitySearchIndex, entityId, jsonPayload, headers);
           }