Fixed a typo in a name

Issue-ID: AAI-1999
Change-Id: I40bcb53eeb9738b4d395cb0202a921c7d75791bb
Signed-off-by: Francis Paquette <francis.paquette@amdocs.com>

diff --git a/src/main/java/org/onap/aai/datarouter/entity/AaiEventEntity.java b/src/main/java/org/onap/aai/datarouter/entity/AaiEventEntity.java
index 70fd6e4..04dc065 100644 (file)
--- a/src/main/java/org/onap/aai/datarouter/entity/AaiEventEntity.java
+++ b/src/main/java/org/onap/aai/datarouter/entity/AaiEventEntity.java
@@ -125,7 +125,7 @@ public class AaiEventEntity implements DocumentStoreDataEntity, Serializable {
 
     JsonObject obj = Json.createObjectBuilder().add("entityType", entityType)
         .add("entityPrimaryKeyValue", entityPrimaryKeyValue).add("searchTagIDs", searchTagIds)
-        .add("searchTags", searchTags).add("crossEntityReferenceValues", crossReferenceEntityValues)
+        .add("searchTags", searchTags).add("crossReferenceEntityValues", crossReferenceEntityValues)
         .add("lastmodTimestamp", lastmodTimestamp).add("link", link).build();
 
     return obj.toString();

diff --git a/src/main/java/org/onap/aai/datarouter/entity/SpikeEventEntity.java b/src/main/java/org/onap/aai/datarouter/entity/SpikeEventEntity.java
index 9bfd8a0..163f819 100644 (file)
--- a/src/main/java/org/onap/aai/datarouter/entity/SpikeEventEntity.java
+++ b/src/main/java/org/onap/aai/datarouter/entity/SpikeEventEntity.java
@@ -118,7 +118,7 @@ public class SpikeEventEntity implements DocumentStoreDataEntity, Serializable {
 
     JsonObject obj = Json.createObjectBuilder().add("entityType", entityType)
         .add("entityPrimaryKeyValue", entityPrimaryKeyValue).add("searchTagIDs", searchTagIds)
-        .add("searchTags", searchTags).add("crossEntityReferenceValues", crossReferenceEntityValues)
+        .add("searchTags", searchTags).add("crossReferenceEntityValues", crossReferenceEntityValues)
         .add("lastmodTimestamp", lastmodTimestamp).add("link", link).build();
 
     return obj.toString();

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 6660a79..152baf3 100644 (file)
--- a/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java
+++ b/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java
@@ -907,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
@@ -920,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);
           }

diff --git a/src/main/java/org/onap/aai/datarouter/policy/SpikeEntitySearchProcessor.java b/src/main/java/org/onap/aai/datarouter/policy/SpikeEntitySearchProcessor.java
index 8b43b1b..98d93d1 100644 (file)
--- a/src/main/java/org/onap/aai/datarouter/policy/SpikeEntitySearchProcessor.java
+++ b/src/main/java/org/onap/aai/datarouter/policy/SpikeEntitySearchProcessor.java
@@ -115,13 +115,13 @@ public class SpikeEntitySearchProcessor extends AbstractSpikeEntityEventProcesso
    * "content", sourceObject);
    * 
    * if (!sourceObject.isEmpty()) { JsonNode node = sourceObject.get(0); final String sourceCer =
-   * NodeUtils.extractFieldValueFromObject(node, "crossEntityReferenceValues"); String newCer =
+   * NodeUtils.extractFieldValueFromObject(node, "crossReferenceEntityValues"); String newCer =
    * spikeEventEntity.getCrossReferenceEntityValues(); boolean hasNewCer = true; if (sourceCer !=
    * null && sourceCer.length() > 0) { // already has CER if (!sourceCer.contains(newCer)) {// don't
    * re-add newCer = sourceCer + ";" + newCer; } else { hasNewCer = false; } }
    * 
    * if (hasNewCer) { // Do the PUT with new CER ((ObjectNode)
-   * node).put("crossEntityReferenceValues", newCer); jsonPayload =
+   * node).put("crossReferenceEntityValues", newCer); jsonPayload =
    * NodeUtils.convertObjectToJson(node, false); searchAgent.putDocument(entitySearchIndex,
    * entityId, jsonPayload, headers); } } } else {
    * 

diff --git a/src/main/resources/entitysearch_schema.json b/src/main/resources/entitysearch_schema.json
index 5ff7625..a5cab03 100644 (file)
--- a/src/main/resources/entitysearch_schema.json
+++ b/src/main/resources/entitysearch_schema.json
@@ -22,7 +22,7 @@
            "index-analyzer": "ngram_analyzer"
       },
       {
-           "name": "crossEntityReferenceValues", 
+           "name": "crossReferenceEntityValues",
            "data-type": "string", 
            "index-analyzer": "ngram_analyzer"
       },