HAWKULAR-455 Migrate gson library with jackson on hawkular/modules

hawkular · Jul 20, 2015 · e8e5ee7 · e8e5ee7
1 parent 8ffd185
commit e8e5ee7
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 31 deletions.
diff --git a/modules/avail-creator/pom.xml b/modules/avail-creator/pom.xml
@@ -49,6 +49,11 @@
       <version>1.1-rev-1</version> <!-- TODO move to parent -->
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-jackson2-provider</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
@@ -59,11 +64,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.2.4</version> <!-- TODO move to parent -->
-    </dependency>
 
     <dependency>
       <groupId>org.hawkular.bus</groupId>
@@ -99,11 +99,6 @@
             </goals>
             <configuration>
               <artifactItems>
-                <artifactItem>
-                  <groupId>com.google.code.gson</groupId>
-                  <artifactId>gson</artifactId>
-                  <version>2.2.4</version>
-                </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.httpcomponents</groupId>
                   <artifactId>httpclient</artifactId>

diff --git a/modules/avail-creator/src/main/java/org/hawkular/component/availcreator/AvailPublisher.java b/modules/avail-creator/src/main/java/org/hawkular/component/availcreator/AvailPublisher.java
@@ -39,7 +39,8 @@
 import org.hawkular.bus.common.ObjectMessage;
 import org.hawkular.bus.common.producer.ProducerConnectionContext;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * Publish Avail data
@@ -77,7 +78,12 @@ public void sendToMetricsViaRest(List<SingleAvail> availabilities) {
             Availability availability = new Availability(avr.timestamp, avr.avail.toLowerCase());
             List<Availability> list = new ArrayList<>(1);
             list.add(availability);
-            String payload = new Gson().toJson(list);
+            String payload = null;
+            try {
+                payload = new ObjectMapper().writeValueAsString(list);
+            } catch (JsonProcessingException e) {
+                Log.LOG.eCouldNotParseMessage(e);
+            }
             request.setEntity(new StringEntity(payload, ContentType.APPLICATION_JSON));
 
             try {

diff --git a/modules/avail-creator/src/main/java/org/hawkular/component/availcreator/Log.java b/modules/avail-creator/src/main/java/org/hawkular/component/availcreator/Log.java
@@ -49,4 +49,7 @@ public interface Log extends BasicLogger {
     @Message(id = 5103, value = "Could not handle a message from Hawkular Bus")
     void eCouldNotHandleBusMessage(@Cause Exception e);
 
+    @LogMessage(level = Logger.Level.ERROR)
+    @Message(id = 5104, value = "Could not parse a message to json format")
+    void eCouldNotParseMessage(@Cause Throwable e);
 }
diff --git a/modules/avail-creator/src/main/java/org/hawkular/component/availcreator/MetricReceiver.java b/modules/avail-creator/src/main/java/org/hawkular/component/availcreator/MetricReceiver.java
@@ -28,7 +28,7 @@
 import javax.jms.MessageListener;
 import javax.jms.TextMessage;
 
-import com.google.gson.GsonBuilder;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * Receiver that listens on JMS Topic and checks for metrics *.status.code
@@ -67,16 +67,14 @@ public void onMessage(Message message) {
 
         try {
             String payload = ((TextMessage) message).getText();
-            Map map = new GsonBuilder().create().fromJson(payload, Map.class);
+            Map map = new ObjectMapper().readValue(payload, Map.class);
 
             Map metricDataMap = (Map) map.get("metricData");
             // Get <rid>.status.code  metrics
             String tenant = (String) metricDataMap.get("tenantId");
             List<Map<String, Object>> inputList = (List<Map<String, Object>>) metricDataMap.get("data");
             List<SingleAvail> outer = new ArrayList<>();
 
-            List<Availability> availabilityList = new ArrayList<>();
-
             for (Map<String, Object> item : inputList) {
 
                 String source = (String) item.get("source");
@@ -85,8 +83,7 @@ public void onMessage(Message message) {
                     int code = (int) codeD;
 
                     String id = source.substring(0, source.indexOf("."));
-                    double timestampD = (double) item.get("timestamp");
-                    long timestamp = (long) timestampD;
+                    long timestamp = (long) item.get("timestamp");
 
                     String avail = computeAvail(code);
 

diff --git a/modules/pinger/pom.xml b/modules/pinger/pom.xml
@@ -77,6 +77,12 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-jackson2-provider</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
@@ -110,12 +116,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>${version.com.google.code.gson}</version> <!-- TODO move to parent -->
-    </dependency>
-
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -158,11 +158,6 @@
             </goals>
             <configuration>
               <artifactItems>
-                <artifactItem>
-                  <groupId>com.google.code.gson</groupId>
-                  <artifactId>gson</artifactId>
-                  <version>${version.com.google.code.gson}</version>
-                </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.httpcomponents</groupId>
                   <artifactId>httpclient</artifactId>

diff --git a/modules/pinger/src/main/java/org/hawkular/component/pinger/Log.java b/modules/pinger/src/main/java/org/hawkular/component/pinger/Log.java
@@ -73,4 +73,7 @@ public interface Log extends BasicLogger {
     @Message(id = 5008, value = "IOException accessing Hawkular Metrics")
     void eMetricsIoException(@Cause IOException e);
 
+    @LogMessage(level = Logger.Level.ERROR)
+    @Message(id = 5009, value = "Could not parse a message to json format")
+    void eCouldNotParseMessage(@Cause Throwable e);
 }
diff --git a/modules/pinger/src/main/java/org/hawkular/component/pinger/MetricPublisher.java b/modules/pinger/src/main/java/org/hawkular/component/pinger/MetricPublisher.java
@@ -16,7 +16,8 @@
  */
 package org.hawkular.component.pinger;
 
-import com.google.gson.Gson;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
@@ -89,7 +90,12 @@ public void sendToMetricsViaRest(PingStatus status) {
         addDataItem(mMetrics, resourceId, timestamp, status.getCode(), "code");
 
         // Send it to metrics via rest
-        String payload = new Gson().toJson(mMetrics);
+        String payload = null;
+        try {
+            payload = new ObjectMapper().writeValueAsString(mMetrics);
+        } catch (JsonProcessingException e) {
+            Log.LOG.eCouldNotParseMessage(e);
+        }
         HttpClient client = HttpClientBuilder.create().build();
 
         HttpPost request = new HttpPost(configuration.getMetricsBaseUri() + "/gauges/data");