From 563d378fa1c13871c865894ec4b00d63c508ddb5 Mon Sep 17 00:00:00 2001 From: seshukm Date: Wed, 25 Jul 2018 20:13:05 +0800 Subject: basic code refactorng of swift module Issue-ID: SO-729 Signed-off-by: seshukm Change-Id: I91a3da3a07e764265de5871f7634ed3be3c92a6b --- .../com/woorea/openstack/swift/model/Account.java | 100 +++++------ .../woorea/openstack/swift/model/Container.java | 108 +++++------ .../com/woorea/openstack/swift/model/Object.java | 198 ++++++++++----------- .../openstack/swift/model/ObjectDownload.java | 62 +++---- .../openstack/swift/model/ObjectForUpload.java | 106 +++++------ 5 files changed, 287 insertions(+), 287 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 697b3c1..008574e 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 @@ -20,61 +20,61 @@ import java.io.Serializable; public class Account implements Serializable { - private Integer containerCount; - - private Integer objectCount; - - private Integer bytesUsed; + private Integer containerCount; + + private Integer objectCount; + + private Integer bytesUsed; - /** - * @return the containerCount - */ - public Integer getContainerCount() { - return containerCount; - } + /** + * @return the containerCount + */ + public Integer getContainerCount() { + return containerCount; + } - /** - * @param containerCount the containerCount to set - */ - public void setContainerCount(Integer containerCount) { - this.containerCount = containerCount; - } + /** + * @param containerCount the containerCount to set + */ + public void setContainerCount(Integer containerCount) { + this.containerCount = containerCount; + } - /** - * @return the objectCount - */ - public Integer getObjectCount() { - return objectCount; - } + /** + * @return the objectCount + */ + public Integer getObjectCount() { + return objectCount; + } - /** - * @param objectCount the objectCount to set - */ - public void setObjectCount(Integer objectCount) { - this.objectCount = objectCount; - } + /** + * @param objectCount the objectCount to set + */ + public void setObjectCount(Integer objectCount) { + this.objectCount = objectCount; + } - /** - * @return the bytesUsed - */ - public Integer getBytesUsed() { - return bytesUsed; - } + /** + * @return the bytesUsed + */ + public Integer getBytesUsed() { + return bytesUsed; + } - /** - * @param bytesUsed the bytesUsed to set - */ - public void setBytesUsed(Integer bytesUsed) { - this.bytesUsed = bytesUsed; - } + /** + * @param bytesUsed the bytesUsed to set + */ + public void setBytesUsed(Integer bytesUsed) { + this.bytesUsed = bytesUsed; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Account [containerCount=" + containerCount + ", objectCount=" - + objectCount + ", bytesUsed=" + bytesUsed + "]"; - } - + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + 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 42488f3..eb359f3 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 @@ -21,66 +21,66 @@ import java.io.Serializable; import org.codehaus.jackson.annotate.JsonProperty; public class Container implements Serializable { - - private String name; - - @JsonProperty("count") - private Integer objectCount; - - @JsonProperty("bytes") - private Long bytesUsed; + + private String name; + + @JsonProperty("count") + private Integer objectCount; + + @JsonProperty("bytes") + private Long bytesUsed; - /** - * @return the name - */ - public String getName() { - return name; - } + /** + * @return the name + */ + public String getName() { + return name; + } - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } - /** - * @return the objectCount - */ - public Integer getObjectCount() { - return objectCount; - } + /** + * @return the objectCount + */ + public Integer getObjectCount() { + return objectCount; + } - /** - * @param objectCount the objectCount to set - */ - public void setObjectCount(Integer objectCount) { - this.objectCount = objectCount; - } + /** + * @param objectCount the objectCount to set + */ + public void setObjectCount(Integer objectCount) { + this.objectCount = objectCount; + } - /** - * @return the bytesUsed - */ - public Long getBytesUsed() { - return bytesUsed; - } + /** + * @return the bytesUsed + */ + public Long getBytesUsed() { + return bytesUsed; + } - /** - * @param bytesUsed the bytesUsed to set - */ - public void setBytesUsed(Long bytesUsed) { - this.bytesUsed = bytesUsed; - } + /** + * @param bytesUsed the bytesUsed to set + */ + public void setBytesUsed(Long bytesUsed) { + this.bytesUsed = bytesUsed; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Container [name=" + name + ", objectCount=" + objectCount - + ", bytesUsed=" + bytesUsed + "]"; - } + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + 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 eb36bfe..1c7d1e5 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 @@ -23,103 +23,103 @@ import org.codehaus.jackson.annotate.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; - - /** - * @return the subdir - */ - public String getSubdir() { - return subdir; - } - - /** - * @param subdir the subdir to set - */ - public void setSubdir(String subdir) { - this.subdir = subdir; - } - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return the hash - */ - public String getHash() { - return hash; - } - - /** - * @param hash the hash to set - */ - public void setHash(String hash) { - this.hash = hash; - } - - /** - * @return the bytes - */ - public int getBytes() { - return bytes; - } - - /** - * @param bytes the bytes to set - */ - public void setBytes(int bytes) { - this.bytes = bytes; - } - - /** - * @return the contentType - */ - public String getContentType() { - return contentType; - } - - /** - * @param contentType the contentType to set - */ - public void setContentType(String contentType) { - this.contentType = contentType; - } - - /** - * @return the lastModified - */ - public Calendar getLastModified() { - return lastModified; - } - - /** - * @param lastModified the lastModified to set - */ - public void setLastModified(Calendar lastModified) { - this.lastModified = lastModified; - } - + + private String subdir; + + private String name; + + private String hash; + + private int bytes; + + @JsonProperty("content_type") + private String contentType; + + @JsonProperty("last_modified") + private Calendar lastModified; + + /** + * @return the subdir + */ + public String getSubdir() { + return subdir; + } + + /** + * @param subdir the subdir to set + */ + public void setSubdir(String subdir) { + this.subdir = subdir; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the hash + */ + public String getHash() { + return hash; + } + + /** + * @param hash the hash to set + */ + public void setHash(String hash) { + this.hash = hash; + } + + /** + * @return the bytes + */ + public int getBytes() { + return bytes; + } + + /** + * @param bytes the bytes to set + */ + public void setBytes(int bytes) { + this.bytes = bytes; + } + + /** + * @return the contentType + */ + public String getContentType() { + return contentType; + } + + /** + * @param contentType the contentType to set + */ + public void setContentType(String contentType) { + this.contentType = contentType; + } + + /** + * @return the lastModified + */ + public Calendar getLastModified() { + return lastModified; + } + + /** + * @param lastModified the lastModified to set + */ + 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 a8fd9ef..269532e 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 @@ -22,36 +22,36 @@ import java.io.InputStream; public class ObjectDownload { - private Object object; - - private InputStream inputStream; - - /** - * @return the object - */ - public Object getObject() { - return object; - } - - /** - * @param object the object to set - */ - public void setObject(Object object) { - this.object = object; - } - - /** - * @return the inputStream - */ - public InputStream getInputStream() { - return inputStream; - } - - /** - * @param inputStream the inputStream to set - */ - public void setInputStream(InputStream inputStream) { - this.inputStream = inputStream; - } + private Object object; + + private InputStream inputStream; + + /** + * @return the object + */ + public Object getObject() { + return object; + } + + /** + * @param object the object to set + */ + public void setObject(Object object) { + this.object = object; + } + + /** + * @return the inputStream + */ + public InputStream getInputStream() { + return inputStream; + } + + /** + * @param inputStream the inputStream to set + */ + public void setInputStream(InputStream inputStream) { + this.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 5775f4b..93c8c72 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,67 +22,67 @@ import java.util.Map; public class ObjectForUpload { - - private String container; - - private String name; - - private Map properties; + + private String container; + + private String name; + + private Map properties; - private InputStream inputStream; + private InputStream inputStream; - /** - * @return the container - */ - public String getContainer() { - return container; - } + /** + * @return the container + */ + public String getContainer() { + return container; + } - /** - * @param container the container to set - */ - public void setContainer(String container) { - this.container = container; - } + /** + * @param container the container to set + */ + public void setContainer(String container) { + this.container = container; + } - /** - * @return the name - */ - public String getName() { - return name; - } + /** + * @return the name + */ + public String getName() { + return name; + } - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } - /** - * @return the properties - */ - public Map getProperties() { - if(properties == null) { - properties = new HashMap<>(); - } - return properties; - } + /** + * @return the properties + */ + public Map getProperties() { + if(properties == null) { + properties = new HashMap<>(); + } + return properties; + } - /** - * @return the inputStream - */ - public InputStream getInputStream() { - return inputStream; - } + /** + * @return the inputStream + */ + public InputStream getInputStream() { + return inputStream; + } - /** - * @param inputStream the inputStream to set - */ - public void setInputStream(InputStream inputStream) { - this.inputStream = inputStream; - } + /** + * @param inputStream the inputStream to set + */ + public void setInputStream(InputStream inputStream) { + this.inputStream = inputStream; + } - + } -- cgit 1.2.3-korg