Merge pull request #25 from lucasponce/HAWKULAR-382

HAWKULAR-382 Replace gson library by jackson
hawkular · Jul 6, 2015 · 56eefc6 · 56eefc6
2 parents 55833a1 + c0baf10
commit 56eefc6
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 36 deletions.
diff --git a/hawkular-bus-common/pom.xml b/hawkular-bus-common/pom.xml
@@ -73,13 +73,14 @@
     </dependency>
 
     <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-jackson2-provider</artifactId>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>

diff --git a/hawkular-bus-common/src/main/java/org/hawkular/bus/common/BasicMessage.java b/hawkular-bus-common/src/main/java/org/hawkular/bus/common/BasicMessage.java
@@ -16,12 +16,15 @@
  */
 package org.hawkular.bus.common;
 
+import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * Basic information that is sent over the message bus.
@@ -37,8 +40,11 @@
  */
 public abstract class BasicMessage {
     // these are passed out-of-band of the message body - these attributes will therefore not be JSON encoded
+    @JsonIgnore
     private MessageId _messageId;
+    @JsonIgnore
     private MessageId _correlationId;
+    @JsonIgnore
     private Map<String, String> _headers;
 
     /**
@@ -50,8 +56,12 @@ public abstract class BasicMessage {
      * @return the message object that was represented by the JSON string
      */
     public static <T extends BasicMessage> T fromJSON(String json, Class<T> clazz) {
-        final Gson gson = createGsonBuilder();
-        return gson.fromJson(json, clazz);
+        final ObjectMapper mapper = new ObjectMapper();
+        try {
+            return mapper.readValue(json, clazz);
+        } catch (IOException e) {
+            throw new IllegalStateException("JSON message cannot be converted to object.", e);
+        }
     }
 
     /**
@@ -60,8 +70,17 @@ public static <T extends BasicMessage> T fromJSON(String json, Class<T> clazz) {
      * @return JSON encoded data that represents this message.
      */
     public String toJSON() {
-        final Gson gson = createGsonBuilder();
-        return gson.toJson(this);
+        final ObjectMapper mapper = new ObjectMapper();
+        mapper.setVisibilityChecker(mapper.getSerializationConfig().getDefaultVisibilityChecker()
+                .withFieldVisibility(JsonAutoDetect.Visibility.ANY)
+                .withGetterVisibility(JsonAutoDetect.Visibility.NONE)
+                .withSetterVisibility(JsonAutoDetect.Visibility.NONE)
+                .withCreatorVisibility(JsonAutoDetect.Visibility.NONE));
+        try {
+            return mapper.writeValueAsString(this);
+        } catch (JsonProcessingException e) {
+            throw new IllegalStateException("Object cannot be parsed as JSON.", e);
+        }
     }
 
     protected BasicMessage() {
@@ -149,8 +168,4 @@ public String toString() {
         str.append("]]");
         return str.toString();
     }
-
-    protected static Gson createGsonBuilder() {
-        return new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
-    }
 }
diff --git a/hawkular-bus-common/src/main/java/org/hawkular/bus/common/MessageId.java b/hawkular-bus-common/src/main/java/org/hawkular/bus/common/MessageId.java
@@ -22,6 +22,10 @@
 public class MessageId {
     private final String id;
 
+    public MessageId() {
+        this.id = null;
+    }
+
     public MessageId(String id) {
         if (id == null || id.length() == 0) {
             throw new IllegalArgumentException("ID cannot be null or empty");

diff --git a/hawkular-bus-common/src/main/java/org/hawkular/bus/common/ObjectMessage.java b/hawkular-bus-common/src/main/java/org/hawkular/bus/common/ObjectMessage.java
@@ -16,9 +16,12 @@
  */
 package org.hawkular.bus.common;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.annotations.Expose;
+import java.io.IOException;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * A message that contains a complex object, which gets serialized into JSON.
@@ -29,7 +32,7 @@
  * @author John Mazzitelli
  */
 public class ObjectMessage extends BasicMessage {
-    @Expose
+    @JsonInclude
     private String message; // the object in JSON form
     private Class<?> objectClass; // the ad-hoc class that this object message represents
 
@@ -43,9 +46,19 @@ public ObjectMessage(Object object) {
         }
         setObjectClass(object.getClass());
 
-        final Gson gson = new GsonBuilder().create();
-        final String msg = gson.toJson(object);
-        setMessage(msg);
+        final ObjectMapper mapper = new ObjectMapper();
+        mapper.setVisibilityChecker(mapper.getSerializationConfig().getDefaultVisibilityChecker()
+                .withFieldVisibility(JsonAutoDetect.Visibility.ANY)
+                .withGetterVisibility(JsonAutoDetect.Visibility.NONE)
+                .withSetterVisibility(JsonAutoDetect.Visibility.NONE)
+                .withCreatorVisibility(JsonAutoDetect.Visibility.NONE));
+        final String msg;
+        try {
+            msg = mapper.writeValueAsString(object);
+            setMessage(msg);
+        } catch (JsonProcessingException e) {
+            throw new IllegalStateException("Object cannot be parsed as JSON.", e);
+        }
     }
 
     public ObjectMessage(Class<?> clazz) {
@@ -87,7 +100,11 @@ public Object getObject() {
             throw new IllegalStateException("Do not know what the class is that represents the JSON data");
         }
 
-        final Gson gson = new GsonBuilder().create();
-        return gson.fromJson(getMessage(), clazz);
+        final ObjectMapper mapper = new ObjectMapper();
+        try {
+            return mapper.readValue(getMessage(), clazz);
+        } catch (IOException e) {
+            throw new IllegalStateException("JSON message cannot be converted to object.", e);
+        }
     }
 }
diff --git a/hawkular-bus-common/src/main/java/org/hawkular/bus/common/SimpleBasicMessage.java b/hawkular-bus-common/src/main/java/org/hawkular/bus/common/SimpleBasicMessage.java
@@ -20,18 +20,17 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.google.gson.annotations.Expose;
-
+import com.fasterxml.jackson.annotation.JsonInclude;
 /**
  * A simple message that is sent over the message bus.
  */
 public class SimpleBasicMessage extends BasicMessage {
     // the basic message body - it will be exposed to the JSON output
-    @Expose
+    @JsonInclude
     private String message;
 
     // some optional additional details about the basic message
-    @Expose
+    @JsonInclude
     private Map<String, String> details;
 
     protected SimpleBasicMessage() {

diff --git a/hawkular-bus-common/src/test/java/org/hawkular/bus/common/ObjectMessageTest.java b/hawkular-bus-common/src/test/java/org/hawkular/bus/common/ObjectMessageTest.java
@@ -27,8 +27,10 @@ public void testObjectMessageNoArgConstructor() {
             assert false : "should have failed - didn't tell it the class";
         } catch (IllegalStateException expected) {
         }
-
-        msg.setMessage("foo");
+        /*
+            Jackson library needs quotes for single json string representation
+         */
+        msg.setMessage("\"foo\"");
         msg.setObjectClass(String.class);
         Object o = msg.getObject();
         assert o.getClass() == String.class;

diff --git a/hawkular-bus-samples/hawkular-bus-sample-client/pom.xml b/hawkular-bus-samples/hawkular-bus-sample-client/pom.xml
@@ -35,6 +35,10 @@
       <artifactId>hawkular-bus-common</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-jackson2-provider</artifactId>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/hawkular-bus-samples/hawkular-bus-sample-jsonschema/pom.xml b/hawkular-bus-samples/hawkular-bus-sample-jsonschema/pom.xml
@@ -35,6 +35,10 @@
       <artifactId>hawkular-bus-common</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-jackson2-provider</artifactId>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -51,7 +55,7 @@
         <configuration>
           <sourceDirectory>${basedir}/src/main/resources/schema</sourceDirectory>
           <targetPackage>org.hawkular.bus.sample.msg</targetPackage>
-          <annotationStyle>gson</annotationStyle>
+          <annotationStyle>jackson</annotationStyle>
           <includeToString>false</includeToString>
           <includeHashcodeAndEquals>false</includeHashcodeAndEquals>
           <initializeCollections>true</initializeCollections>

diff --git a/hawkular-bus-test-common/pom.xml b/hawkular-bus-test-common/pom.xml
@@ -45,6 +45,12 @@
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-jackson2-provider</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/hawkular-bus-test-common/src/test/java/org/hawkular/bus/common/test/SpecificMessage.java b/hawkular-bus-test-common/src/test/java/org/hawkular/bus/common/test/SpecificMessage.java
@@ -16,19 +16,21 @@
  */
 package org.hawkular.bus.common.test;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Map;
-
 import org.hawkular.bus.common.SimpleBasicMessage;
 
-import com.google.gson.annotations.Expose;
-
 /**
  * Test subclass of BasicMessage.
  */
 public class SpecificMessage extends SimpleBasicMessage {
-    @Expose
+    @JsonInclude
     private final String specific;
 
+    public SpecificMessage() {
+        this.specific = null;
+    }
+
     public SpecificMessage(String message, Map<String, String> details, String specific) {
         super(message, details);
         if (specific == null) {

diff --git a/hawkular-nest/hawkular-nest-distro/pom.xml b/hawkular-nest/hawkular-nest-distro/pom.xml
@@ -134,7 +134,7 @@
               </includeArtifactIds>
               <stripVersion>true</stripVersion>
               <stripClassifier>true</stripClassifier>
-              <overWriteIfNew>true</overWriteIfNew>
+              <overWriteIfNewer>true</overWriteIfNewer>
               <excludeTransitive>true</excludeTransitive>
             </configuration>
           </execution>

diff --git a/hawkular-nest/hawkular-nest-wf-extension/src/main/resources/module/main/module.xml b/hawkular-nest/hawkular-nest-wf-extension/src/main/resources/module/main/module.xml
@@ -25,7 +25,6 @@
     <resource-root path="${project.build.finalName}.jar" />
     <resource-root path="hawkular-bus-common-${project.version}.jar" />
     <resource-root path="hawkular-bus-mdb-${project.version}.jar" />
-    <resource-root path="gson-${version.com.google.code.gson}.jar" />
   </resources>
 
   <dependencies>