Merge pull request #72 from lucasponce/HWKALERTS-67

HWKALERTS-67 Migrate gson dependencies with jackson libraries
hawkular · Jul 16, 2015 · ea3db1e · ea3db1e
2 parents 0e2159b + 2872c56
commit ea3db1e
Show file tree

Hide file tree

Showing 29 changed files with 629 additions and 355 deletions.
diff --git a/hawkular-actions-api/pom.xml b/hawkular-actions-api/pom.xml
@@ -47,6 +47,12 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-jackson2-provider</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging</artifactId>

diff --git a/hawkular-actions-api/src/main/java/org/hawkular/actions/api/model/ActionMessage.java b/hawkular-actions-api/src/main/java/org/hawkular/actions/api/model/ActionMessage.java
@@ -18,9 +18,9 @@
 
 import java.util.Map;
 
-import com.google.gson.annotations.Expose;
 import org.hawkular.bus.common.BasicMessage;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 /**
  * A action message generated from the alerts engine through alert-bus subsystem.
  * Action plugins must listen per actionPlugin of message in the filter.
@@ -30,25 +30,25 @@
  */
 public class ActionMessage extends BasicMessage {
 
-    @Expose
+    @JsonInclude
     String tenantId;
 
-    @Expose
+    @JsonInclude
     String actionPlugin;
 
-    @Expose
+    @JsonInclude
     String actionId;
 
-    @Expose
+    @JsonInclude
     String message;
 
-    @Expose
+    @JsonInclude
     String alert;
 
-    @Expose
+    @JsonInclude
     Map<String, String> properties;
 
-    @Expose
+    @JsonInclude
     Map<String, String> defaultProperties;
 
     public ActionMessage() { }

diff --git a/hawkular-actions-api/src/main/java/org/hawkular/actions/api/model/ActionPluginMessage.java b/hawkular-actions-api/src/main/java/org/hawkular/actions/api/model/ActionPluginMessage.java
@@ -21,7 +21,7 @@
 
 import org.hawkular.bus.common.BasicMessage;
 
-import com.google.gson.annotations.Expose;
+import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**
  * An action plugin registration message.
@@ -39,16 +39,16 @@
  */
 public class ActionPluginMessage extends BasicMessage {
 
-    @Expose
+    @JsonInclude
     String op;
 
-    @Expose
+    @JsonInclude
     String actionPlugin;
 
-    @Expose
+    @JsonInclude
     Set<String> properties;
 
-    @Expose
+    @JsonInclude
     Map<String, String> defaultProperties;
 
     public ActionPluginMessage() { }

diff --git a/...tions-aerogear/src/main/java/org/hawkular/actions/aerogear/listener/AerogearListener.java b/...tions-aerogear/src/main/java/org/hawkular/actions/aerogear/listener/AerogearListener.java
@@ -23,7 +23,7 @@
 
 import org.hawkular.actions.api.log.MsgLogger;
 import org.hawkular.actions.api.model.ActionMessage;
-import org.hawkular.alerts.api.json.GsonUtil;
+import org.hawkular.alerts.api.json.JsonUtil;
 import org.hawkular.alerts.api.model.condition.Alert;
 import org.hawkular.bus.common.consumer.BasicMessageListener;
 
@@ -76,7 +76,7 @@ private boolean isBlank(String value) {
     private String prepareMessage(ActionMessage msg) {
         String preparedMsg = null;
         if (msg != null) {
-            Alert alert = msg.getAlert() != null ? GsonUtil.fromJson(msg.getAlert(), Alert.class) : null;
+            Alert alert = msg.getAlert() != null ? JsonUtil.fromJson(msg.getAlert(), Alert.class) : null;
             if (alert != null) {
                 preparedMsg = "Alert : " + alert.getTriggerId() + " at " + alert.getCtime() + " -- Severity: " +
                         alert.getSeverity().toString();

diff --git a/...wkular-actions-email/src/main/java/org/hawkular/actions/email/listener/EmailListener.java b/...wkular-actions-email/src/main/java/org/hawkular/actions/email/listener/EmailListener.java
@@ -37,7 +37,7 @@
 import org.hawkular.actions.api.model.ActionMessage;
 import org.hawkular.actions.email.EmailPlugin;
 import org.hawkular.actions.email.template.EmailTemplate;
-import org.hawkular.alerts.api.json.GsonUtil;
+import org.hawkular.alerts.api.json.JsonUtil;
 import org.hawkular.alerts.api.model.condition.Alert;
 import org.hawkular.bus.common.consumer.BasicMessageListener;
 import org.jboss.logging.Logger;
@@ -79,7 +79,7 @@ protected Message createMimeMessage(ActionMessage msg) throws Exception {
         Map<String, String> props = msg.getProperties();
         Map<String, String> defaultProps = msg.getDefaultProperties();
         String message = msg.getMessage();
-        Alert alert = msg.getAlert() != null ? GsonUtil.fromJson(msg.getAlert(), Alert.class) : null;
+        Alert alert = msg.getAlert() != null ? JsonUtil.fromJson(msg.getAlert(), Alert.class) : null;
         Alert.Status status = alert != null && alert.getStatus() != null ? alert.getStatus() : Alert.Status.OPEN;
 
         String from = getProp(props, defaultProps, EmailPlugin.PROP_FROM + "." + status.name().toLowerCase());

diff --git a/...ar-actions-email/src/test/java/org/hawkular/actions/email/listener/EmailListenerTest.java b/...ar-actions-email/src/test/java/org/hawkular/actions/email/listener/EmailListenerTest.java
@@ -31,7 +31,7 @@
 import java.util.Set;
 import javax.mail.Message;
 import org.hawkular.actions.api.model.ActionMessage;
-import org.hawkular.alerts.api.json.GsonUtil;
+import org.hawkular.alerts.api.json.JsonUtil;
 import org.hawkular.alerts.api.model.condition.Alert;
 import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
 import org.hawkular.alerts.api.model.condition.AvailabilityConditionEval;
@@ -113,15 +113,15 @@ public static void prepareMessages() {
         props.put("template.hawkular.url", "http://www.hawkular.org");
 
         openThresholdMsg = new ActionMessage(tenantId, "email", "email-to-test", "Threshold Alert",
-                GsonUtil.toJson(rtAlert));
+                JsonUtil.toJson(rtAlert));
         openThresholdMsg.setProperties(props);
 
         rtAlert.setStatus(Status.ACKNOWLEDGED);
         rtAlert.setAckBy("Test ACK user");
         rtAlert.setAckTime(System.currentTimeMillis() + 10000);
         rtAlert.setAckNotes("Test ACK notes");
         ackThresholdMsg = new ActionMessage(tenantId, "email", "email-to-test", "Threshold Alert",
-                GsonUtil.toJson(rtAlert));
+                JsonUtil.toJson(rtAlert));
         ackThresholdMsg.setProperties(props);
 
         /*
@@ -136,7 +136,7 @@ public static void prepareMessages() {
         rtAlert.setResolvedEvalSets(getEvalList(rtResolveCondition, rtGoodData));
 
         resolvedThresholdMsg = new ActionMessage(tenantId, "email", "email-to-test", "Threshold Alert",
-                GsonUtil.toJson(rtAlert));
+                JsonUtil.toJson(rtAlert));
         resolvedThresholdMsg.setProperties(props);
 
 
@@ -178,15 +178,15 @@ public static void prepareMessages() {
         props.put("template.hawkular.url", "http://www.hawkular.org");
 
         openAvailMsg = new ActionMessage(tenantId, "email", "email-to-test", "Availability Alert",
-                GsonUtil.toJson(avAlert));
+                JsonUtil.toJson(avAlert));
         openAvailMsg.setProperties(props);
 
         avAlert.setStatus(Status.ACKNOWLEDGED);
         avAlert.setAckBy("Test ACK user");
         avAlert.setAckTime(System.currentTimeMillis() + 10000);
         avAlert.setAckNotes("Test ACK notes");
         ackAvailMsg = new ActionMessage(tenantId, "email", "email-to-test", "Availability Alert",
-                GsonUtil.toJson(avAlert));
+                JsonUtil.toJson(avAlert));
         ackAvailMsg.setProperties(props);
 
         /*
@@ -201,7 +201,7 @@ public static void prepareMessages() {
         avAlert.setResolvedEvalSets(getEvalList(avResolveCondition, avGoodData));
 
         resolvedAvailMsg = new ActionMessage(tenantId, "email", "email-to-test", "Availability Alert",
-                GsonUtil.toJson(avAlert));
+                JsonUtil.toJson(avAlert));
         resolvedAvailMsg.setProperties(props);
 
         /*
@@ -253,15 +253,15 @@ public static void prepareMessages() {
         props.put("template.hawkular.url", "http://www.hawkular.org");
 
         openTwoCondMsg = new ActionMessage(tenantId, "email", "email-to-test", "Response Time and Availability Alert",
-                GsonUtil.toJson(mixAlert));
+                JsonUtil.toJson(mixAlert));
         openTwoCondMsg.setProperties(props);
 
         mixAlert.setStatus(Status.ACKNOWLEDGED);
         mixAlert.setAckBy("Test ACK user");
         mixAlert.setAckTime(System.currentTimeMillis() + 10000);
         mixAlert.setAckNotes("Test ACK notes");
         ackTwoCondMsg = new ActionMessage(tenantId, "email", "email-to-test", "Availability Alert",
-                GsonUtil.toJson(mixAlert));
+                JsonUtil.toJson(mixAlert));
         ackTwoCondMsg.setProperties(props);
 
         /*
@@ -284,7 +284,7 @@ public static void prepareMessages() {
         mixAlert.setResolvedEvalSets(getEvalList(mixResolveConditions, mixGoodData));
 
         resolvedTwoCondMsg = new ActionMessage(tenantId, "email", "email-to-test", "Availability Alert",
-                GsonUtil.toJson(mixAlert));
+                JsonUtil.toJson(mixAlert));
         resolvedTwoCondMsg.setProperties(props);
     }
 

diff --git a/...ns-pagerduty/src/main/java/org/hawkular/actions/pagerduty/listener/PagerDutyListener.java b/...ns-pagerduty/src/main/java/org/hawkular/actions/pagerduty/listener/PagerDutyListener.java
@@ -33,7 +33,7 @@
 
 import org.hawkular.actions.api.log.MsgLogger;
 import org.hawkular.actions.api.model.ActionMessage;
-import org.hawkular.alerts.api.json.GsonUtil;
+import org.hawkular.alerts.api.json.JsonUtil;
 import org.hawkular.alerts.api.model.condition.Alert;
 import org.hawkular.bus.common.consumer.BasicMessageListener;
 
@@ -120,7 +120,7 @@ private boolean isBlank(String value) {
     private String prepareMessage(ActionMessage msg) {
         String preparedMsg = null;
         if (msg != null) {
-            Alert alert = msg.getAlert() != null ? GsonUtil.fromJson(msg.getAlert(), Alert.class) : null;
+            Alert alert = msg.getAlert() != null ? JsonUtil.fromJson(msg.getAlert(), Alert.class) : null;
             if (alert != null) {
                 preparedMsg = "Alert : " + alert.getTriggerId() + " at " + alert.getCtime() + " -- Severity: " +
                         alert.getSeverity().toString();

diff --git a/hawkular-actions-plugins/pom.xml b/hawkular-actions-plugins/pom.xml
@@ -70,9 +70,8 @@
     </dependency>
 
     <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>${version.com.google.code.gson}</version>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-jackson2-provider</artifactId>
       <scope>provided</scope>
     </dependency>
 

diff --git a/hawkular-alerts-api/pom.xml b/hawkular-alerts-api/pom.xml
@@ -56,13 +56,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>${version.com.google.code.gson}</version>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/GsonAdapter.java b/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/GsonAdapter.java