diff options
author | seshukm <seshu.kumar.m@huawei.com> | 2018-07-25 18:17:10 +0800 |
---|---|---|
committer | seshukm <seshu.kumar.m@huawei.com> | 2018-07-25 18:17:10 +0800 |
commit | 0244e4d12a571f9fb6134284d10867908da59632 (patch) | |
tree | 46584de8bda5c8db91fe51d75eed5ab3b6dc2b4b | |
parent | efdf50410fd3d341c0bbb6550ac758549d2bf3f4 (diff) |
code issues fix in model keystone
Issue-ID: SO-729
Change-Id: I39f5fbeaf0fdae0581f468ab0748a5042246d5c5
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
10 files changed, 592 insertions, 592 deletions
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java index f9ed517..b55ef65 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Access.java @@ -27,242 +27,242 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("access") public class Access implements Serializable { - public static final class Service { - - @JsonIgnoreProperties(ignoreUnknown=true) - public static final class Endpoint { - - private String region; - - private String publicURL; - - private String internalURL; - - private String adminURL; + public static final class Service { + + @JsonIgnoreProperties(ignoreUnknown=true) + public static final class Endpoint { + + private String region; + + private String publicURL; + + private String internalURL; + + private String adminURL; - /** - * @return the region - */ - public String getRegion() { - return region; - } + /** + * @return the region + */ + public String getRegion() { + return region; + } - /** - * @return the publicURL - */ - public String getPublicURL() { - return publicURL; - } + /** + * @return the publicURL + */ + public String getPublicURL() { + return publicURL; + } - /** - * @return the internalURL - */ - public String getInternalURL() { - return internalURL; - } + /** + * @return the internalURL + */ + public String getInternalURL() { + return internalURL; + } - /** - * @return the adminURL - */ - public String getAdminURL() { - return adminURL; - } + /** + * @return the adminURL + */ + public String getAdminURL() { + return adminURL; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Endpoint [region=" + region + ", publicURL=" - + publicURL + ", internalURL=" + internalURL - + ", adminURL=" + adminURL + "]"; - } - - } - - private String type; - - private String name; - - private List<Endpoint> endpoints; - - @JsonProperty("endpoints_links") - private List<Link> endpointsLinks; + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Endpoint [region=" + region + ", publicURL=" + + publicURL + ", internalURL=" + internalURL + + ", adminURL=" + adminURL + "]"; + } + + } + + private String type; + + private String name; + + private List<Endpoint> endpoints; + + @JsonProperty("endpoints_links") + private List<Link> endpointsLinks; - /** - * @return the type - */ - public String getType() { - return type; - } + /** + * @return the type + */ + public String getType() { + return type; + } - /** - * @return the name - */ - public String getName() { - return name; - } + /** + * @return the name + */ + public String getName() { + return name; + } - /** - * @return the endpoints - */ - public List<Endpoint> getEndpoints() { - return endpoints; - } + /** + * @return the endpoints + */ + public List<Endpoint> getEndpoints() { + return endpoints; + } - /** - * @return the endpointsLinks - */ - public List<Link> getEndpointsLinks() { - return endpointsLinks; - } + /** + * @return the endpointsLinks + */ + public List<Link> getEndpointsLinks() { + return endpointsLinks; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Service [type=" + type + ", name=" + name + ", endpoints=" - + endpoints + ", endpointsLinks=" + endpointsLinks + "]"; - } - - } - - @JsonIgnoreProperties(ignoreUnknown=true) - public static final class User { - - @JsonIgnoreProperties(ignoreUnknown=true) - public static final class Role { - - private String id; - - private String name; + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Service [type=" + type + ", name=" + name + ", endpoints=" + + endpoints + ", endpointsLinks=" + endpointsLinks + "]"; + } + + } + + @JsonIgnoreProperties(ignoreUnknown=true) + public static final class User { + + @JsonIgnoreProperties(ignoreUnknown=true) + public static final class Role { + + private String id; + + private String name; - /** - * @return the id - */ - public String getId() { - return id; - } + /** + * @return the id + */ + public String getId() { + return id; + } - /** - * @return the name - */ - public String getName() { - return name; - } + /** + * @return the name + */ + public String getName() { + return name; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Role [id=" + id + ", name=" + name + "]"; - } - - } - - private String id; - - private String name; - - private String username; - - private List<Role> roles; - - @JsonProperty("roles_links") - private List<Link> rolesLinks; + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Role [id=" + id + ", name=" + name + "]"; + } + + } + + private String id; + + private String name; + + private String username; + + private List<Role> roles; + + @JsonProperty("roles_links") + private List<Link> rolesLinks; - /** - * @return the id - */ - public String getId() { - return id; - } + /** + * @return the id + */ + public String getId() { + return id; + } - /** - * @return the name - */ - public String getName() { - return name; - } + /** + * @return the name + */ + public String getName() { + return name; + } - /** - * @return the username - */ - public String getUsername() { - return username; - } + /** + * @return the username + */ + public String getUsername() { + return username; + } - /** - * @return the roles - */ - public List<Role> getRoles() { - return roles; - } + /** + * @return the roles + */ + public List<Role> getRoles() { + return roles; + } - /** - * @return the rolesLinks - */ - public List<Link> getRolesLinks() { - return rolesLinks; - } + /** + * @return the rolesLinks + */ + public List<Link> getRolesLinks() { + return rolesLinks; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "User [id=" + id + ", name=" + name + ", username=" - + username + ", roles=" + roles + ", rolesLinks=" - + rolesLinks + "]"; - } - - } - - private Token token; - - private List<Service> serviceCatalog; - - private User user; - - private Map<String, Object> metadata; + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "User [id=" + id + ", name=" + name + ", username=" + + username + ", roles=" + roles + ", rolesLinks=" + + rolesLinks + "]"; + } + + } + + private Token token; + + private List<Service> serviceCatalog; + + private User user; + + private Map<String, Object> metadata; - /** - * @return the token - */ - public Token getToken() { - return token; - } + /** + * @return the token + */ + public Token getToken() { + return token; + } - /** - * @return the serviceCatalog - */ - public List<Service> getServiceCatalog() { - return serviceCatalog; - } + /** + * @return the serviceCatalog + */ + public List<Service> getServiceCatalog() { + return serviceCatalog; + } - /** - * @return the user - */ - public User getUser() { - return user; - } + /** + * @return the user + */ + public User getUser() { + return user; + } - /** - * @return the metadata - */ - public Map<String, Object> getMetadata() { - return metadata; - } + /** + * @return the metadata + */ + public Map<String, Object> getMetadata() { + return metadata; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Access [token=" + token + ", serviceCatalog=" + serviceCatalog - + ", user=" + user + ", metadata=" + metadata + "]"; - } - + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Access [token=" + token + ", serviceCatalog=" + serviceCatalog + + ", user=" + user + ", metadata=" + metadata + "]"; + } + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java index 330eb01..1f1bf2f 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Authentication.java @@ -22,36 +22,36 @@ import org.codehaus.jackson.map.annotate.JsonRootName; public abstract class Authentication implements Serializable { - private String tenantId; - - private String tenantName; - - /** - * @return the tenantId - */ - public String getTenantId() { - return tenantId; - } - - /** - * @param tenantId the tenantId to set - */ - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - - /** - * @return the tenantName - */ - public String getTenantName() { - return tenantName; - } - - /** - * @param tenantName the tenantName to set - */ - public void setTenantName(String tenantName) { - this.tenantName = tenantName; - } - + private String tenantId; + + private String tenantName; + + /** + * @return the tenantId + */ + public String getTenantId() { + return tenantId; + } + + /** + * @param tenantId the tenantId to set + */ + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + /** + * @return the tenantName + */ + public String getTenantName() { + return tenantName; + } + + /** + * @param tenantName the tenantName to set + */ + public void setTenantName(String tenantName) { + this.tenantName = tenantName; + } + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java index 506f1f1..019b3df 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoint.java @@ -24,114 +24,114 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("endpoint") public class Endpoint implements Serializable { - private String id; - - @JsonProperty("service_id") - private String serviceId; - - private String region; - - @JsonProperty("publicurl") - private String publicURL; - - @JsonProperty("internalurl") - private String internalURL; - - @JsonProperty("adminurl") - private String adminURL; - - /** - * @return the id - */ - public String getId() { - return id; - } - - /** - * @param id the id to set - */ - public void setId(String id) { - this.id = id; - } - - /** - * @return the serviceId - */ - public String getServiceId() { - return serviceId; - } - - /** - * @param serviceId the serviceId to set - */ - public void setServiceId(String serviceId) { - this.serviceId = serviceId; - } - - /** - * @return the region - */ - public String getRegion() { - return region; - } - - /** - * @param region the region to set - */ - public void setRegion(String region) { - this.region = region; - } - - /** - * @return the publicURL - */ - public String getPublicURL() { - return publicURL; - } - - /** - * @param publicURL the publicURL to set - */ - public void setPublicURL(String publicURL) { - this.publicURL = publicURL; - } - - /** - * @return the internalURL - */ - public String getInternalURL() { - return internalURL; - } - - /** - * @param internalURL the internalURL to set - */ - public void setInternalURL(String internalURL) { - this.internalURL = internalURL; - } - - /** - * @return the adminURL - */ - public String getAdminURL() { - return adminURL; - } - - /** - * @param adminURL the adminURL to set - */ - public void setAdminURL(String adminURL) { - this.adminURL = adminURL; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Endpoint [id=" + id + ", serviceId=" + serviceId + ", region=" - + region + ", publicURL=" + publicURL + ", internalURL=" - + internalURL + ", adminURL=" + adminURL + "]"; - } - + private String id; + + @JsonProperty("service_id") + private String serviceId; + + private String region; + + @JsonProperty("publicurl") + private String publicURL; + + @JsonProperty("internalurl") + private String internalURL; + + @JsonProperty("adminurl") + private String adminURL; + + /** + * @return the id + */ + public String getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(String id) { + this.id = id; + } + + /** + * @return the serviceId + */ + public String getServiceId() { + return serviceId; + } + + /** + * @param serviceId the serviceId to set + */ + public void setServiceId(String serviceId) { + this.serviceId = serviceId; + } + + /** + * @return the region + */ + public String getRegion() { + return region; + } + + /** + * @param region the region to set + */ + public void setRegion(String region) { + this.region = region; + } + + /** + * @return the publicURL + */ + public String getPublicURL() { + return publicURL; + } + + /** + * @param publicURL the publicURL to set + */ + public void setPublicURL(String publicURL) { + this.publicURL = publicURL; + } + + /** + * @return the internalURL + */ + public String getInternalURL() { + return internalURL; + } + + /** + * @param internalURL the internalURL to set + */ + public void setInternalURL(String internalURL) { + this.internalURL = internalURL; + } + + /** + * @return the adminURL + */ + public String getAdminURL() { + return adminURL; + } + + /** + * @param adminURL the adminURL to set + */ + public void setAdminURL(String adminURL) { + this.adminURL = adminURL; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Endpoint [id=" + id + ", serviceId=" + serviceId + ", region=" + + region + ", publicURL=" + publicURL + ", internalURL=" + + internalURL + ", adminURL=" + adminURL + "]"; + } + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java index 7e77b12..b4e4a16 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Endpoints.java @@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty; public class Endpoints implements Iterable<Endpoint>, Serializable { - @JsonProperty("endpoints") - private List<Endpoint> list; + @JsonProperty("endpoints") + private List<Endpoint> list; - /** - * @return the list - */ - public List<Endpoint> getList() { - return list; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Endpoints [list=" + list + "]"; - } + /** + * @return the list + */ + public List<Endpoint> getList() { + return list; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Endpoints [list=" + list + "]"; + } - @Override - public Iterator<Endpoint> iterator() { - return list.iterator(); - } - + @Override + public Iterator<Endpoint> iterator() { + return list.iterator(); + } + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java index 3de01be..ba49b11 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Error.java @@ -23,40 +23,40 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("error") public class Error implements Serializable { - private Integer code; - - private String title; - - private String message; - - /** - * @return the code - */ - public Integer getCode() { - return code; - } - - /** - * @return the title - */ - public String getTitle() { - return title; - } - - /** - * @return the message - */ - public String getMessage() { - return message; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Error [code=" + code + ", title=" + title + ", message=" - + message + "]"; - } - + private Integer code; + + private String title; + + private String message; + + /** + * @return the code + */ + public Integer getCode() { + return code; + } + + /** + * @return the title + */ + public String getTitle() { + return title; + } + + /** + * @return the message + */ + public String getMessage() { + return message; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Error [code=" + code + ", title=" + title + ", message=" + + message + "]"; + } + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Link.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Link.java index 37dcc3d..4b94558 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Link.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Link.java @@ -20,39 +20,39 @@ import java.io.Serializable; public class Link implements Serializable { - private String rel; - - private String href; - - private String type; - - /** - * @return the rel - */ - public String getRel() { - return rel; - } - - /** - * @return the href - */ - public String getHref() { - return href; - } - - /** - * @return the type - */ - public String getType() { - return type; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Link [rel=" + rel + ", href=" + href + ", type=" + type + "]"; - } - + private String rel; + + private String href; + + private String type; + + /** + * @return the rel + */ + public String getRel() { + return rel; + } + + /** + * @return the href + */ + public String getHref() { + return href; + } + + /** + * @return the type + */ + public String getType() { + return type; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Link [rel=" + rel + ", href=" + href + ", type=" + type + "]"; + } + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Metadata.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Metadata.java index 97cf7f8..7afde63 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Metadata.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Metadata.java @@ -48,23 +48,23 @@ import java.util.Map; */ public class Metadata { - private Map<String, String> metadata; + private Map<String, String> metadata; - /** - * @return the metadata - */ - public Map<String, String> getMetadata() { - return metadata; - } + /** + * @return the metadata + */ + public Map<String, String> getMetadata() { + return metadata; + } - /** - * Set the metadata - * @param metadata - */ - public void setMetadata(Map<String, String> metadata) { - this.metadata = metadata; - } - + /** + * Set the metadata + * @param metadata + */ + public void setMetadata(Map<String, String> metadata) { + this.metadata = metadata; + } + - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java index c0d8f5d..7ae36de 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Role.java @@ -23,61 +23,61 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("role") public class Role implements Serializable { - private String id; - - private String name; - - private String description; - - private String enabled; + private String id; + + private String name; + + private String description; + + private String enabled; - /** - * @return the id - */ - public String getId() { - return id; - } + /** + * @return the id + */ + public String getId() { + return 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 String getEnabled() { - return enabled; - } + /** + * @return the enabled + */ + public String getEnabled() { + return enabled; + } - /** - * @param enabled the enabled to set - */ - public void setEnabled(String enabled) { - this.enabled = enabled; - } + /** + * @param enabled the enabled to set + */ + public void setEnabled(String enabled) { + this.enabled = enabled; + } } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java index bfdb788..79fe04c 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Roles.java @@ -24,27 +24,27 @@ import org.codehaus.jackson.annotate.JsonProperty; public class Roles implements Iterable<Role>, Serializable { - @JsonProperty("roles") - private List<Role> list; + @JsonProperty("roles") + private List<Role> list; - /** - * @return the list - */ - public List<Role> getList() { - return list; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Roles [list=" + list + "]"; - } + /** + * @return the list + */ + public List<Role> getList() { + return list; + } + + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Roles [list=" + list + "]"; + } - @Override - public Iterator<Role> iterator() { - return list.iterator(); - } - + @Override + public Iterator<Role> iterator() { + return list.iterator(); + } + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java index 9c40e24..c5a1650 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/model/Service.java @@ -23,70 +23,70 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("OS-KSADM:service") public class Service implements Serializable { - private String id; - - private String type; - - private String name; - - private String description; + private String id; + + private String type; + + private String name; + + private String description; - /** - * @return the id - */ - public String getId() { - return id; - } + /** + * @return the id + */ + public String getId() { + return id; + } - /** - * @return the type - */ - public String getType() { - return type; - } + /** + * @return the type + */ + public String getType() { + return type; + } - /** - * @param type the type to set - */ - public void setType(String type) { - this.type = type; - } + /** + * @param type the type to set + */ + public void setType(String type) { + this.type = type; + } - /** - * @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; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "Service [id=" + id + ", type=" + type + ", name=" + name - + ", description=" + description + "]"; - } - + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + return "Service [id=" + id + ", type=" + type + ", name=" + name + + ", description=" + description + "]"; + } + } |