From d5ab4c1ed47aa5f1170024cb1ac8cf3df15781d4 Mon Sep 17 00:00:00 2001 From: seshukm Date: Wed, 25 Jul 2018 18:18:16 +0800 Subject: basic code Issues fix keystone model Issue-ID: SO-729 Change-Id: I46faf848370e69e0b637f62f1ed5f38ed89b89c1 Signed-off-by: seshukm --- .../woorea/openstack/keystone/model/Services.java | 42 ++-- .../woorea/openstack/keystone/model/Tenant.java | 162 +++++++------- .../woorea/openstack/keystone/model/Tenants.java | 66 +++--- .../com/woorea/openstack/keystone/model/Token.java | 70 +++--- .../com/woorea/openstack/keystone/model/User.java | 248 ++++++++++----------- .../com/woorea/openstack/keystone/model/Users.java | 42 ++-- 6 files changed, 315 insertions(+), 315 deletions(-) (limited to 'keystone-model/src/main') diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java index febb9bb..99be776 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Services.java @@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty; public class Services implements Iterable, Serializable { - @JsonProperty("OS-KSADM:services") - private List list; + @JsonProperty("OS-KSADM:services") + private List list; - /** - * @return the list - */ - public List getList() { - return list; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Services [list=" + list + "]"; - } + /** + * @return the list + */ + public List getList() { + return list; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Services [list=" + list + "]"; + } - @Override - public Iterator iterator() { - return list.iterator(); - } - + @Override + public Iterator iterator() { + return list.iterator(); + } + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java index 88b04d5..840d507 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenant.java @@ -25,94 +25,94 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonIgnoreProperties(ignoreUnknown=true) public class Tenant implements Serializable { - private String id; - - private String name; - - private String description; - - private Boolean enabled; - - public Tenant(String name, String description, Boolean enabled) { - this.name = name; - this.description = description; - this.enabled = enabled; - } - - public Tenant(String name, String description) { - this(name, description, Boolean.TRUE); - } - - public Tenant(String name) { - this(name, null); - } - - public Tenant() { - } + private String id; + + private String name; + + private String description; + + private Boolean enabled; + + public Tenant(String name, String description, Boolean enabled) { + this.name = name; + this.description = description; + this.enabled = enabled; + } + + public Tenant(String name, String description) { + this(name, description, Boolean.TRUE); + } + + public Tenant(String name) { + this(name, null); + } + + public Tenant() { + } - /** - * @return the id - */ - public String getId() { - return id; - } + /** + * @return the id + */ + public String getId() { + return id; + } - /** - * @param id the id to set - */ - public void setId(String id) { - this.id = id; - } + /** + * @param id the id to set + */ + public void setId(String id) { + this.id = id; + } - /** - * @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 description - */ - public String getDescription() { - return description; - } + /** + * @return the description + */ + public String getDescription() { + return description; + } - /** - * @param description the description to set - */ - public void setDescription(String description) { - this.description = description; - } + /** + * @param description the description to set + */ + public void setDescription(String description) { + this.description = description; + } - /** - * @return the enabled - */ - public Boolean getEnabled() { - return enabled; - } + /** + * @return the enabled + */ + public Boolean getEnabled() { + return enabled; + } - /** - * @param enabled the enabled to set - */ - public void setEnabled(Boolean enabled) { - this.enabled = enabled; - } + /** + * @param enabled the enabled to set + */ + public void setEnabled(Boolean enabled) { + this.enabled = enabled; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Tenant [id=" + id + ", name=" + name + ", description=" - + description + ", enabled=" + enabled + "]"; - } - + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Tenant [id=" + id + ", name=" + name + ", description=" + + description + ", enabled=" + enabled + "]"; + } + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java index b230498..c7958f3 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Tenants.java @@ -24,37 +24,37 @@ import org.codehaus.jackson.annotate.JsonProperty; public class Tenants implements Iterable, Serializable { - @JsonProperty("tenants") - private List list; - - @JsonProperty("tenants_links") - private List links; - - /** - * @return the list - */ - public List getList() { - return list; - } - - /** - * @return the links - */ - public List getLinks() { - return links; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Tenants [list=" + list + ", links=" + links + "]"; - } - - @Override - public Iterator iterator() { - return list.iterator(); - } - + @JsonProperty("tenants") + private List list; + + @JsonProperty("tenants_links") + private List links; + + /** + * @return the list + */ + public List getList() { + return list; + } + + /** + * @return the links + */ + public List getLinks() { + return links; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Tenants [list=" + list + ", links=" + links + "]"; + } + + @Override + public Iterator iterator() { + return list.iterator(); + } + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Token.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Token.java index 41c8247..73d92fa 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Token.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Token.java @@ -20,49 +20,49 @@ import java.util.Calendar; public final class Token { - private String id; + private String id; - private Calendar issued_at; + private Calendar issued_at; - private Calendar expires; + private Calendar expires; - private Tenant tenant; + private Tenant tenant; - /** - * @return the id - */ - public String getId() { - return id; - } + /** + * @return the id + */ + public String getId() { + return id; + } - /** - * @return the issued_at - */ - public Calendar getIssued_at() { - return issued_at; - } + /** + * @return the issued_at + */ + public Calendar getIssued_at() { + return issued_at; + } - /** - * @return the expires - */ - public Calendar getExpires() { - return expires; - } + /** + * @return the expires + */ + public Calendar getExpires() { + return expires; + } - /** - * @return the tenant - */ - public Tenant getTenant() { - return tenant; - } + /** + * @return the tenant + */ + public Tenant getTenant() { + return tenant; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Token [id=" + id + ", Issued_at=" + issued_at + ", expires=" + expires + ", tenant=" + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Token [id=" + id + ", Issued_at=" + issued_at + ", expires=" + expires + ", tenant=" + tenant + "]"; - } + } } \ No newline at end of file diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java index 54b5f65..830d3fa 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/User.java @@ -28,128 +28,128 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("user") public class User implements Serializable { - private String id; - - private String username; - -// @JsonProperty("OS-KSADM:password") -// @JsonProperty("OS_KSADM_password") - private String password; - - private String tenantId; - - private String name; - - private String email; - - private Boolean enabled; - - /** - * @return the id - */ - public String getId() { - return id; - } - - /** - * @param id the id to set - */ - public void setId(String id) { - this.id = id; - } - - /** - * @return the username - */ - public String getUsername() { - return username; - } - - /** - * @param username the username to set - */ - public void setUsername(String username) { - this.username = username; - } - - /** - * @return the password - */ - public String getPassword() { - return password; - } - - /** - * @param password the password to set - */ - public void setPassword(String password) { - this.password = password; - } - - /** - * @return the tenantId - */ - public String getTenantId() { - return tenantId; - } - - /** - * @param tenantId the tenantId to set - */ - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return the email - */ - public String getEmail() { - return email; - } - - /** - * @param email the email to set - */ - public void setEmail(String email) { - this.email = email; - } - - /** - * @return the enabled - */ - public Boolean getEnabled() { - return enabled; - } - - /** - * @param enabled the enabled to set - */ - public void setEnabled(Boolean enabled) { - this.enabled = enabled; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "User [id=" + id + ", username=" + username + ", password=" - + password + ", tenantId=" + tenantId + ", name=" + name - + ", email=" + email + ", enabled=" + enabled + "]"; - } - + private String id; + + private String username; + +// @JsonProperty("OS-KSADM:password") +// @JsonProperty("OS_KSADM_password") + private String password; + + private String tenantId; + + private String name; + + private String email; + + private Boolean enabled; + + /** + * @return the id + */ + public String getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(String id) { + this.id = id; + } + + /** + * @return the username + */ + public String getUsername() { + return username; + } + + /** + * @param username the username to set + */ + public void setUsername(String username) { + this.username = username; + } + + /** + * @return the password + */ + public String getPassword() { + return password; + } + + /** + * @param password the password to set + */ + public void setPassword(String password) { + this.password = password; + } + + /** + * @return the tenantId + */ + public String getTenantId() { + return tenantId; + } + + /** + * @param tenantId the tenantId to set + */ + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the email + */ + public String getEmail() { + return email; + } + + /** + * @param email the email to set + */ + public void setEmail(String email) { + this.email = email; + } + + /** + * @return the enabled + */ + public Boolean getEnabled() { + return enabled; + } + + /** + * @param enabled the enabled to set + */ + public void setEnabled(Boolean enabled) { + this.enabled = enabled; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "User [id=" + id + ", username=" + username + ", password=" + + password + ", tenantId=" + tenantId + ", name=" + name + + ", email=" + email + ", enabled=" + enabled + "]"; + } + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java index ff5ad15..b3013bf 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Users.java @@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty; public class Users implements Iterable, Serializable { - @JsonProperty("users") - private List list; + @JsonProperty("users") + private List list; - /** - * @return the list - */ - public List getList() { - return list; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Users [list=" + list + "]"; - } + /** + * @return the list + */ + public List getList() { + return list; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Users [list=" + list + "]"; + } - @Override - public Iterator iterator() { - return list.iterator(); - } - + @Override + public Iterator iterator() { + return list.iterator(); + } + } -- cgit 1.2.3-korg