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>

5 files changed, 30 insertions, 29 deletions

diff --git a/swift-model/src/main/java/com/woorea/openstack/swift/model/Account.java b/swift-model/src/main/java/com/woorea/openstack/swift/model/Account.java
index 008574e..64bc2bf 100644
--- a/swift-model/src/main/java/com/woorea/openstack/swift/model/Account.java
+++ b/swift-model/src/main/java/com/woorea/openstack/swift/model/Account.java
@@ -21,9 +21,9 @@ import java.io.Serializable;
 public class Account implements Serializable {
 
     private Integer containerCount;
-    
+
     private Integer objectCount;
-    
+
     private Integer bytesUsed;
 
     /**
@@ -68,13 +68,15 @@ public class Account implements Serializable {
         this.bytesUsed = bytesUsed;
     }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see java.lang.Object#toString()
      */
     @Override
     public String toString() {
-        return "Account [containerCount=" + containerCount + ", objectCount="
-                + objectCount + ", bytesUsed=" + bytesUsed + "]";
+        return "Account [containerCount=" + containerCount + ", objectCount=" + objectCount + ", bytesUsed=" + bytesUsed
+                + "]";
     }
-    
+
 }
diff --git a/swift-model/src/main/java/com/woorea/openstack/swift/model/Container.java b/swift-model/src/main/java/com/woorea/openstack/swift/model/Container.java
index 5efe9a7..5299a5f 100644
--- a/swift-model/src/main/java/com/woorea/openstack/swift/model/Container.java
+++ b/swift-model/src/main/java/com/woorea/openstack/swift/model/Container.java
@@ -17,16 +17,15 @@
 package com.woorea.openstack.swift.model;
 
 import java.io.Serializable;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Container implements Serializable {
-    
+
     private String name;
-    
+
     @JsonProperty("count")
     private Integer objectCount;
-    
+
     @JsonProperty("bytes")
     private Long bytesUsed;
 
@@ -72,15 +71,16 @@ public class Container implements Serializable {
         this.bytesUsed = bytesUsed;
     }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see java.lang.Object#toString()
      */
     @Override
     public String toString() {
-        return "Container [name=" + name + ", objectCount=" + objectCount
-                + ", bytesUsed=" + bytesUsed + "]";
+        return "Container [name=" + name + ", objectCount=" + objectCount + ", bytesUsed=" + bytesUsed + "]";
     }
 
-    
-    
+
+
 }
diff --git a/swift-model/src/main/java/com/woorea/openstack/swift/model/Object.java b/swift-model/src/main/java/com/woorea/openstack/swift/model/Object.java
index cfc3eba..36d56fe 100644
--- a/swift-model/src/main/java/com/woorea/openstack/swift/model/Object.java
+++ b/swift-model/src/main/java/com/woorea/openstack/swift/model/Object.java
@@ -18,22 +18,21 @@ package com.woorea.openstack.swift.model;
 
 import java.io.Serializable;
 import java.util.Calendar;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Object implements Serializable {
-    
+
     private String subdir;
-    
+
     private String name;
-    
+
     private String hash;
-    
+
     private int bytes;
-    
+
     @JsonProperty("content_type")
     private String contentType;
-    
+
     @JsonProperty("last_modified")
     private Calendar lastModified;
 
@@ -120,5 +119,5 @@ public class Object implements Serializable {
     public void setLastModified(Calendar lastModified) {
         this.lastModified = lastModified;
     }
-    
+
 }
diff --git a/swift-model/src/main/java/com/woorea/openstack/swift/model/ObjectDownload.java b/swift-model/src/main/java/com/woorea/openstack/swift/model/ObjectDownload.java
index 269532e..f75f27e 100644
--- a/swift-model/src/main/java/com/woorea/openstack/swift/model/ObjectDownload.java
+++ b/swift-model/src/main/java/com/woorea/openstack/swift/model/ObjectDownload.java
@@ -23,7 +23,7 @@ import java.io.InputStream;
 public class ObjectDownload {
 
     private Object object;
-    
+
     private InputStream inputStream;
 
     /**
diff --git a/swift-model/src/main/java/com/woorea/openstack/swift/model/ObjectForUpload.java b/swift-model/src/main/java/com/woorea/openstack/swift/model/ObjectForUpload.java
index 93c8c72..b35d14f 100644
--- a/swift-model/src/main/java/com/woorea/openstack/swift/model/ObjectForUpload.java
+++ b/swift-model/src/main/java/com/woorea/openstack/swift/model/ObjectForUpload.java
@@ -22,11 +22,11 @@ import java.util.Map;
 
 
 public class ObjectForUpload {
-    
+
     private String container;
-    
+
     private String name;
-    
+
     private Map<String, java.lang.Object> properties;
 
     private InputStream inputStream;
@@ -63,7 +63,7 @@ public class ObjectForUpload {
      * @return the properties
      */
     public Map<String, java.lang.Object> getProperties() {
-        if(properties == null) {
+        if (properties == null) {
             properties = new HashMap<>();
         }
         return properties;
@@ -83,6 +83,6 @@ public class ObjectForUpload {
         this.inputStream = inputStream;
     }
 
-    
+
 
 }