Enhance Openstack Client

Update Openstack Client to support additional fields
Updat all formatting issues

Issue-ID: SO-1844

Change-Id: I1369e0c18cc25274db8df7e12855a020b8da38da
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

4 files changed, 45 insertions, 54 deletions

diff --git a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Meter.java b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Meter.java
index 6faafc0..7041a78 100644
--- a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Meter.java
+++ b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Meter.java
@@ -22,18 +22,18 @@ public class Meter {
 
     @JsonProperty("user_id")
     private String user;
-    
-    
+
+
     private String name;
-    
+
     @JsonProperty("resource_id")
     private String resource;
-    
+
     @JsonProperty("project_id")
     private String project;
-    
+
     private String type;
-    
+
     private String unit;
 
     public String getUser() {
@@ -62,9 +62,8 @@ public class Meter {
 
     @Override
     public String toString() {
-        return "Meter [user=" + user + ", name=" + name + ", resource="
-                + resource + ", project=" + project + ", type=" + type
-                + ", unit=" + unit + "]";
+        return "Meter [user=" + user + ", name=" + name + ", resource=" + resource + ", project=" + project + ", type="
+                + type + ", unit=" + unit + "]";
     }
 
 }
diff --git a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java
index 2a2c0de..6b8988b 100644
--- a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java
+++ b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Resource.java
@@ -17,22 +17,21 @@
 package com.woorea.openstack.ceilometer.v2.model;
 
 import java.util.Map;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Resource {
-    
+
     @JsonProperty("resource_id")
     private String resource;
-    
+
     private String timestamp;
-    
+
     @JsonProperty("project_id")
     private String project;
-    
+
     @JsonProperty("user_id")
     private String user;
-    
+
     private Map<String, Object> metadata;
 
     public String getResource() {
@@ -57,9 +56,8 @@ public class Resource {
 
     @Override
     public String toString() {
-        return "Resource [resource=" + resource + ", timestamp=" + timestamp
-                + ", project=" + project + ", user=" + user + ", metadata="
-                + metadata + "]";
+        return "Resource [resource=" + resource + ", timestamp=" + timestamp + ", project=" + project + ", user=" + user
+                + ", metadata=" + metadata + "]";
     }
-    
+
 }
diff --git a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Sample.java b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Sample.java
index 2808113..aad3359 100644
--- a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Sample.java
+++ b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Sample.java
@@ -17,7 +17,6 @@
 package com.woorea.openstack.ceilometer.v2.model;
 
 import java.util.Map;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Sample {
@@ -27,29 +26,29 @@ public class Sample {
 
     @JsonProperty("counter_name")
     private String counterName;
-    
+
     @JsonProperty("counter_unit")
     private String counterUnit;
-    
+
     @JsonProperty("counter_volume")
     private String counterVolume;
-    
+
     private String source;
-    
+
     @JsonProperty("project_id")
     private String project;
-    
+
     @JsonProperty("user_id")
     private String user;
-    
+
     @JsonProperty("resource_id")
     private String resource;
-    
+
     private String timestamp;
-    
+
     @JsonProperty("message_id")
     private String message;
-    
+
     @JsonProperty("resource_metadata")
     private Map<String, Object> metadata;
 
@@ -99,12 +98,10 @@ public class Sample {
 
     @Override
     public String toString() {
-        return "Sample [counterType=" + counterType + ", counterName="
-                + counterName + ", counterUnit=" + counterUnit
-                + ", counterVolume=" + counterVolume + ", source=" + source
-                + ", project=" + project + ", user=" + user + ", resource="
-                + resource + ", timestamp=" + timestamp + ", message="
-                + message + ", metadata=" + metadata + "]";
+        return "Sample [counterType=" + counterType + ", counterName=" + counterName + ", counterUnit=" + counterUnit
+                + ", counterVolume=" + counterVolume + ", source=" + source + ", project=" + project + ", user=" + user
+                + ", resource=" + resource + ", timestamp=" + timestamp + ", message=" + message + ", metadata="
+                + metadata + "]";
     }
-    
+
 }
diff --git a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Statistics.java b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Statistics.java
index 747c9f0..2fd7b3e 100644
--- a/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Statistics.java
+++ b/ceilometer-model/src/main/java/com/woorea/openstack/ceilometer/v2/model/Statistics.java
@@ -17,35 +17,34 @@
 package com.woorea.openstack.ceilometer.v2.model;
 
 import java.math.BigDecimal;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Statistics {
-    
+
     private BigDecimal avg;
-    
+
     private BigDecimal count;
-    
+
     private BigDecimal duration;
-    
+
     @JsonProperty("duration_start")
     private String durationStart;
-    
+
     @JsonProperty("duration_end")
     private String durationEnd;
-    
+
     private BigDecimal max;
-    
+
     private BigDecimal min;
-    
+
     private BigDecimal period;
-    
+
     @JsonProperty("period_start")
     private String periodStart;
-    
+
     @JsonProperty("period_end")
     private String periodEnd;
-    
+
     private BigDecimal sum;
 
     public BigDecimal getAvg() {
@@ -94,11 +93,9 @@ public class Statistics {
 
     @Override
     public String toString() {
-        return "Statistics [avg=" + avg + ", count=" + count + ", duration="
-                + duration + ", durationStart=" + durationStart
-                + ", durationEnd=" + durationEnd + ", max=" + max + ", min="
-                + min + ", period=" + period + ", periodStart=" + periodStart
-                + ", periodEnd=" + periodEnd + ", sum=" + sum + "]";
+        return "Statistics [avg=" + avg + ", count=" + count + ", duration=" + duration + ", durationStart="
+                + durationStart + ", durationEnd=" + durationEnd + ", max=" + max + ", min=" + min + ", period="
+                + period + ", periodStart=" + periodStart + ", periodEnd=" + periodEnd + ", sum=" + sum + "]";
     }
-    
+
 }