Update published event to include header and body

[aai/gizmo.git] / src / main / java / org / onap / crud / service / CrudAsyncResponseConsumer.java

diff --git a/src/main/java/org/onap/crud/service/CrudAsyncResponseConsumer.java b/src/main/java/org/onap/crud/service/CrudAsyncResponseConsumer.java
index 905fe15..94c1e1b 100644 (file)
--- a/src/main/java/org/onap/crud/service/CrudAsyncResponseConsumer.java
+++ b/src/main/java/org/onap/crud/service/CrudAsyncResponseConsumer.java
@@ -1,16 +1,15 @@
 /**
  * ============LICENSE_START=======================================================
- * Gizmo
+ * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
- * Copyright © 2017 Amdocs
- * All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,8 +17,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.crud.service;
 
@@ -30,9 +27,10 @@ import javax.naming.OperationNotSupportedException;
 import org.onap.aai.cl.api.Logger;
 import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.crud.event.GraphEvent;
+import org.onap.crud.event.envelope.GraphEventEnvelope;
 import org.onap.crud.logging.CrudServiceMsgs;
 
-import com.att.ecomp.event.api.EventConsumer;
+import org.onap.aai.event.api.EventConsumer;
 
 public class CrudAsyncResponseConsumer extends TimerTask {
 
@@ -79,7 +77,8 @@ public class CrudAsyncResponseConsumer extends TimerTask {
     for (String event : events) {
       try {
 
-        GraphEvent graphEvent = GraphEvent.fromJson(event);
+        GraphEventEnvelope graphEventEnvelope = GraphEventEnvelope.fromJson(event);
+        GraphEvent graphEvent = graphEventEnvelope.getBody();
         auditLogger.info(CrudServiceMsgs.ASYNC_RESPONSE_CONSUMER_INFO,
                            "Event received of type: " + graphEvent.getObjectType() + " with key: "
                            + graphEvent.getObjectKey() + " , transaction-id: "
@@ -95,7 +94,7 @@ public class CrudAsyncResponseConsumer extends TimerTask {
 
         if (CrudAsyncGraphEventCache.get(graphEvent.getTransactionId()) != null) {
           CrudAsyncGraphEventCache.get(graphEvent.getTransactionId())
-            .populateGraphEvent(graphEvent);
+            .populateGraphEventEnvelope(graphEventEnvelope);
         } else {
           logger.error(CrudServiceMsgs.ASYNC_DATA_SERVICE_ERROR,
                        "Request timed out. Not sending response for transaction-id: "