From: Ravi Geda <GRaviK@amdocs.com>
Date: Thu, 5 Jul 2018 10:11:55 +0000 (+0100)
Subject: Fix asynchronous patch requests
X-Git-Tag: 1.3.0~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fchamp.git;a=commitdiff_plain;h=bce8bc8383c3f19b64b360a941ec1b1503791c85

Fix asynchronous patch requests

Async flow uses gson to de-serialize the event to a ChampObject which is
causing inconsistencies for timestamp property values. Fix is to use
jackson which the sync flow also uses.

Change-Id: Ic766d34a8c04b9d076d7cadb53cb9dcb180186b6
Issue-ID: AAI-1363
Signed-off-by: Ravi Geda <GRaviK@amdocs.com>
---

diff --git a/champ-service/src/main/java/org/onap/champ/async/ChampAsyncRequestProcessor.java b/champ-service/src/main/java/org/onap/champ/async/ChampAsyncRequestProcessor.java
index 4966287..a52127e 100644
--- a/champ-service/src/main/java/org/onap/champ/async/ChampAsyncRequestProcessor.java
+++ b/champ-service/src/main/java/org/onap/champ/async/ChampAsyncRequestProcessor.java
@@ -187,7 +187,7 @@ public class ChampAsyncRequestProcessor extends TimerTask {
 
                                 case UPDATE:
                                     event.setVertex(GraphEventVertex.fromChampObject(
-                                            champDataService.replaceObject(event.getVertex().toChampObject(),
+                                            champDataService.replaceObject(event.getVertex().toChampObject(event.getVertex().toJson()),
                                                     event.getVertex().getId(), Optional.ofNullable(transaction)),
                                             event.getVertex().getModelVersion()));
                                     break;
diff --git a/champ-service/src/main/java/org/onap/champ/event/GraphEventVertex.java b/champ-service/src/main/java/org/onap/champ/event/GraphEventVertex.java
index cc4f493..866c8ae 100644
--- a/champ-service/src/main/java/org/onap/champ/event/GraphEventVertex.java
+++ b/champ-service/src/main/java/org/onap/champ/event/GraphEventVertex.java
@@ -20,13 +20,14 @@
  */
 package org.onap.champ.event;
 
+import java.io.IOException;
 import java.util.Map;
-
 import javax.ws.rs.core.Response.Status;
-
 import org.onap.aai.champcore.model.ChampObject;
+import org.onap.champ.entity.ChampObjectDeserializer;
 import org.onap.champ.exception.ChampServiceException;
-
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
@@ -160,7 +161,7 @@ public class GraphEventVertex {
     return graphEventVertex;
 
   }
-  
+
 
   public ChampObject toChampObject() {
     ChampObject.Builder builder = new ChampObject.Builder(this.getType());
@@ -180,4 +181,20 @@ public class GraphEventVertex {
 
   }
 
+  /**
+   * Uses jackson api to convert the json string into a ChampObject.
+   *
+   * @param json
+   * @return
+   * @throws IOException
+   */
+  // Added this method as gson conversion of timestamp properties(create ts and modified ts) differs from the jackson conversion causing failures.
+  public ChampObject toChampObject(String json) throws IOException {
+      ObjectMapper mapper = new ObjectMapper();
+      SimpleModule module = new SimpleModule();
+      module.addDeserializer(ChampObject.class, new ChampObjectDeserializer());
+      mapper.registerModule(module);
+      return mapper.readValue(json, ChampObject.class);
+    }
+
 }
diff --git a/champ-service/src/test/java/org/onap/champ/event/GraphEventVertexTest.java b/champ-service/src/test/java/org/onap/champ/event/GraphEventVertexTest.java
new file mode 100644
index 0000000..b0b7b32
--- /dev/null
+++ b/champ-service/src/test/java/org/onap/champ/event/GraphEventVertexTest.java
@@ -0,0 +1,45 @@
+/**
+ * ============LICENSE_START==========================================
+ * org.onap.aai
+ * ===================================================================
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ */
+package org.onap.champ.event;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Test;
+import org.onap.aai.champcore.model.ChampObject;
+import org.onap.champ.event.GraphEvent.GraphEventOperation;
+
+public class GraphEventVertexTest {
+
+    @Test
+    public void testToChampObject() throws Exception {
+
+        Map<String, Object> properties = new HashMap<>();
+        properties.put("created-ts", new Long("1528470882470"));
+        GraphEvent graphEvent = GraphEvent.builder(GraphEventOperation.CREATE)
+                .vertex(GraphEventVertex.fromChampObject(new ChampObject.Builder("pserver").properties(properties).build(), "v13")).build();
+        GraphEventVertex vertex = graphEvent.getVertex();
+        ChampObject champObject = vertex.toChampObject(vertex.toJson());
+        assertThat(champObject.getProperty("created-ts").get(), is("1528470882470"));
+        assertThat(champObject.getType(), is("pserver"));
+    }
+}