[HWKMETRICS-185] Add Jackson 1.9 annotations to the REST common classes.

hawkular · Aug 13, 2015 · df8481f · df8481f
1 parent 82ed6db
commit df8481f
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 6 deletions.
diff --git a/api/metrics-api-common/pom.xml b/api/metrics-api-common/pom.xml
@@ -85,6 +85,12 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>1.9.13</version>
+    </dependency>
+
     <!-- test -->
 
     <dependency>

diff --git a/...-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/AvailabilityDataPoint.java b/...-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/AvailabilityDataPoint.java
@@ -35,12 +35,21 @@
 public class AvailabilityDataPoint {
 
     @JsonProperty
+    @org.codehaus.jackson.annotate.JsonProperty
+    @org.codehaus.jackson.map.annotate.JsonSerialize(
+            include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
     private long timestamp;
 
     @JsonProperty
+    @org.codehaus.jackson.annotate.JsonProperty
+    @org.codehaus.jackson.map.annotate.JsonSerialize(
+            include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
     private String value;
 
     @JsonProperty
+    @org.codehaus.jackson.annotate.JsonProperty
+    @org.codehaus.jackson.map.annotate.JsonSerialize(
+            include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
     private Map<String, String> tags = emptyMap();
 
     /**

diff --git a/api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/Counter.java b/api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/Counter.java
@@ -28,12 +28,18 @@
  *
  * @author jsanda
  */
+@org.codehaus.jackson.map.annotate.JsonSerialize(
+        include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
 public class Counter {
 
     @JsonProperty
+    @org.codehaus.jackson.map.annotate.JsonSerialize(
+            include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
     private String id;
 
     @JsonProperty
+    @org.codehaus.jackson.map.annotate.JsonSerialize(
+            include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
     private List<CounterDataPoint> data;
 
     public String getId() {

diff --git a/...trics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/CounterDataPoint.java b/...trics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/CounterDataPoint.java
@@ -32,12 +32,21 @@
 public class CounterDataPoint {
 
     @JsonProperty
+    @org.codehaus.jackson.annotate.JsonProperty
+    @org.codehaus.jackson.map.annotate.JsonSerialize(
+            include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
     private long timestamp;
 
     @JsonProperty
+    @org.codehaus.jackson.annotate.JsonProperty
+    @org.codehaus.jackson.map.annotate.JsonSerialize(
+            include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
     private Long value;
 
     @JsonProperty
+    @org.codehaus.jackson.annotate.JsonProperty
+    @org.codehaus.jackson.map.annotate.JsonSerialize(
+            include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
     private Map<String, String> tags = Collections.emptyMap();
 
     /**

diff --git a/...metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/GaugeDataPoint.java b/...metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/model/GaugeDataPoint.java
@@ -22,6 +22,8 @@
 
 import org.hawkular.metrics.core.api.DataPoint;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
 import com.wordnik.swagger.annotations.ApiModel;
@@ -33,14 +35,21 @@
 public class GaugeDataPoint {
 
     @JsonProperty
+    @org.codehaus.jackson.annotate.JsonProperty
     private long timestamp;
 
     @JsonProperty
+    @org.codehaus.jackson.annotate.JsonProperty
     private Double value;
 
     @JsonProperty
+    @JsonInclude(Include.NON_EMPTY)
+    @org.codehaus.jackson.annotate.JsonProperty
+    @org.codehaus.jackson.map.annotate.JsonSerialize(
+            include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
     private Map<String, String> tags = Collections.emptyMap();
 
+
     /**
      * Used by JAX-RS/Jackson to deserialize HTTP request data
      */

diff --git a/api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/param/Tags.java b/api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/param/Tags.java
@@ -29,6 +29,8 @@
  * @author Thomas Segismont
  * @see TagsConverter
  */
+@org.codehaus.jackson.map.annotate.JsonSerialize(
+        include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
 public class Tags {
     public static final String LIST_DELIMITER = ",";
     public static final String TAG_DELIMITER = ":";

diff --git a/...ics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/request/MetricDefinition.java b/...ics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/request/MetricDefinition.java
@@ -31,19 +31,33 @@
  * @author jsanda
  */
 @ApiModel(description = "The definition of a metric to create")
+@org.codehaus.jackson.map.annotate.JsonSerialize(
+        include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
 public class MetricDefinition {
 
     // TODO Do we need this?
     @JsonProperty
+    @org.codehaus.jackson.annotate.JsonProperty
+    @org.codehaus.jackson.map.annotate.JsonSerialize(
+            include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
     private String tenantId;
 
     @JsonProperty
+    @org.codehaus.jackson.annotate.JsonProperty
+    @org.codehaus.jackson.map.annotate.JsonSerialize(
+            include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
     private String id;
 
     @JsonProperty
+    @org.codehaus.jackson.annotate.JsonProperty
+    @org.codehaus.jackson.map.annotate.JsonSerialize(
+            include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
     private Map<String, String> tags;
 
     @JsonProperty
+    @org.codehaus.jackson.annotate.JsonProperty
+    @org.codehaus.jackson.map.annotate.JsonSerialize(
+            include = org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_EMPTY)
     private Integer dataRetention;
 
     public MetricDefinition() {

diff --git a/api/metrics-api-jaxrs-1.1/pom.xml b/api/metrics-api-jaxrs-1.1/pom.xml
@@ -60,11 +60,19 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
+      <version>2.3.0.redhat-4</version>
     </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
+      <version>2.3.0.redhat-4</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>2.3.0.redhat-4</version>
     </dependency>
 
     <dependency>
@@ -95,12 +103,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.jboss.resteasy</groupId>
-      <artifactId>resteasy-jettison-provider</artifactId>
-      <version>2.3.9.Final-redhat-7</version>
-    </dependency>
-
     <dependency>
       <groupId>io.reactivex</groupId>
       <artifactId>rxjava</artifactId>