diff options
Diffstat (limited to 'keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model')
20 files changed, 193 insertions, 188 deletions
diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java index c92d1da..428b3ed 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Authentication.java @@ -19,14 +19,13 @@ package com.woorea.openstack.keystone.v3.model; import java.io.Serializable; import java.util.ArrayList; import java.util.List; - import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("auth") public class Authentication implements Serializable { - + public static final class Identity { - + public static final Identity password(String userId, String password) { Identity identity = new Identity(); identity.getMethods().add("password"); @@ -36,12 +35,13 @@ public class Authentication implements Serializable { identity.setPassword(method); return identity; } - + public static final Identity password(String domainName, String username, String password) { Identity identity = new Identity(); identity.getMethods().add("password"); Password method = new Password(); - com.woorea.openstack.keystone.v3.model.Authentication.Identity.Password.User.Domain domain = new com.woorea.openstack.keystone.v3.model.Authentication.Identity.Password.User.Domain(); + com.woorea.openstack.keystone.v3.model.Authentication.Identity.Password.User.Domain domain = + new com.woorea.openstack.keystone.v3.model.Authentication.Identity.Password.User.Domain(); domain.setName(domainName); method.getUser().setDomain(domain); method.getUser().setName(username); @@ -49,7 +49,7 @@ public class Authentication implements Serializable { identity.setPassword(method); return identity; } - + public static final Identity token(String token) { Identity identity = new Identity(); identity.getMethods().add("token"); @@ -58,17 +58,17 @@ public class Authentication implements Serializable { identity.setToken(method); return identity; } - + private List<String> methods = new ArrayList<>(); - + public static final class Password { - + public static final class User { - + public static final class Domain { - + private String id; - + private String name; public String getId() { @@ -87,13 +87,13 @@ public class Authentication implements Serializable { this.name = name; } } - + private Domain domain; - + private String id; - + private String name; - + private String password; public Domain getDomain() { @@ -127,9 +127,9 @@ public class Authentication implements Serializable { public void setPassword(String password) { this.password = password; } - + } - + private User user = new User(); public User getUser() { @@ -139,13 +139,13 @@ public class Authentication implements Serializable { public void setUser(User user) { this.user = user; } - + } - + private Password password; - + public static final class Token { - + private String id; public String getId() { @@ -155,9 +155,9 @@ public class Authentication implements Serializable { public void setId(String id) { this.id = id; } - + } - + private Token token; public List<String> getMethods() { @@ -183,13 +183,13 @@ public class Authentication implements Serializable { public void setToken(Token token) { this.token = token; } - + } - + private Identity identity; - + public static final class Scope { - + public static Scope project(String id) { Scope scope = new Scope(); Project project = new Project(); @@ -197,10 +197,11 @@ public class Authentication implements Serializable { scope.setProject(project); return scope; } - + public static Scope project(String domainName, String projectName) { Scope scope = new Scope(); - com.woorea.openstack.keystone.v3.model.Authentication.Scope.Project.Domain domain = new com.woorea.openstack.keystone.v3.model.Authentication.Scope.Project.Domain(); + com.woorea.openstack.keystone.v3.model.Authentication.Scope.Project.Domain domain = + new com.woorea.openstack.keystone.v3.model.Authentication.Scope.Project.Domain(); domain.setName(domainName); Project project = new Project(); project.setDomain(domain); @@ -208,13 +209,13 @@ public class Authentication implements Serializable { scope.setProject(project); return scope; } - + public static final class Project { - + public static final class Domain { - + private String id; - + private String name; public String getId() { @@ -233,13 +234,13 @@ public class Authentication implements Serializable { this.name = name; } } - + private String id; - + private Domain domain; - + private String name; - + public String getId() { return id; @@ -264,9 +265,9 @@ public class Authentication implements Serializable { public void setName(String name) { this.name = name; } - + } - + private Project project; public Project getProject() { @@ -276,9 +277,9 @@ public class Authentication implements Serializable { public void setProject(Project project) { this.project = project; } - + } - + private Scope scope; public Identity getIdentity() { @@ -296,5 +297,5 @@ public class Authentication implements Serializable { public void setScope(Scope scope) { this.scope = scope; } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java index 26d0b89..280b78d 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credential.java @@ -18,20 +18,19 @@ package com.woorea.openstack.keystone.v3.model; import java.util.HashMap; import java.util.Map; - import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("credential") public class Credential { - + private String id; private String projectId; - + private String type; - + private String userId; - + private Map<String, String> blob = new HashMap<>(); public String getId() { @@ -73,5 +72,5 @@ public class Credential { public void setBlob(Map<String, String> blob) { this.blob = blob; } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credentials.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credentials.java index b0e6944..c29b8f6 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credentials.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Credentials.java @@ -19,10 +19,9 @@ package com.woorea.openstack.keystone.v3.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; -public class Credentials implements Iterable<Credential>, Serializable { +public class Credentials implements Iterable<Credential>, Serializable { @JsonProperty("credentials") private List<Credential> list; @@ -33,8 +32,10 @@ public class Credentials implements Iterable<Credential>, Serializable { public List<Credential> getList() { return list; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see java.lang.Object#toString() */ @Override @@ -46,5 +47,5 @@ public class Credentials implements Iterable<Credential>, Serializable { public Iterator<Credential> iterator() { return list.iterator(); } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domain.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domain.java index 6509f79..821bdc2 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domain.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domain.java @@ -22,11 +22,11 @@ import com.fasterxml.jackson.annotation.JsonRootName; public class Domain { private String id; - + private String name; - + private String description; - + private Boolean enabled; public String getId() { @@ -52,7 +52,7 @@ public class Domain { public void setDescription(String description) { this.description = description; } - + public Boolean getEnabled() { return enabled; } @@ -60,5 +60,5 @@ public class Domain { public void setEnabled(Boolean enabled) { this.enabled = enabled; } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domains.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domains.java index 32a5442..4880edc 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domains.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Domains.java @@ -19,10 +19,9 @@ package com.woorea.openstack.keystone.v3.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; -public class Domains implements Iterable<Domain>, Serializable { +public class Domains implements Iterable<Domain>, Serializable { @JsonProperty("domains") private List<Domain> list; @@ -33,8 +32,10 @@ public class Domains implements Iterable<Domain>, Serializable { public List<Domain> getList() { return list; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see java.lang.Object#toString() */ @Override @@ -46,5 +47,5 @@ public class Domains implements Iterable<Domain>, Serializable { public Iterator<Domain> iterator() { return list.iterator(); } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoint.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoint.java index 5a60998..e3c19c3 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoint.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoint.java @@ -23,12 +23,12 @@ import com.fasterxml.jackson.annotation.JsonRootName; public class Endpoint { private String id; - + @JsonProperty("interface") private String iface; - + private String name; - + @JsonProperty("service_id") private String serviceId; @@ -63,5 +63,5 @@ public class Endpoint { public void setServiceId(String serviceId) { this.serviceId = serviceId; } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoints.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoints.java index b8711d6..5383e75 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoints.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Endpoints.java @@ -19,10 +19,9 @@ package com.woorea.openstack.keystone.v3.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; -public class Endpoints implements Iterable<Endpoint>, Serializable { +public class Endpoints implements Iterable<Endpoint>, Serializable { @JsonProperty("endpoints") private List<Endpoint> list; @@ -33,8 +32,10 @@ public class Endpoints implements Iterable<Endpoint>, Serializable { public List<Endpoint> getList() { return list; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see java.lang.Object#toString() */ @Override @@ -46,5 +47,5 @@ public class Endpoints implements Iterable<Endpoint>, Serializable { public Iterator<Endpoint> iterator() { return list.iterator(); } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Group.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Group.java index 7573119..808b7b5 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Group.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Group.java @@ -23,12 +23,12 @@ import com.fasterxml.jackson.annotation.JsonRootName; public class Group { private String id; - + @JsonProperty("domain_id") private String domainId; - + private String name; - + private String description; public String getId() { @@ -62,5 +62,5 @@ public class Group { public void setDescription(String description) { this.description = description; } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Groups.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Groups.java index 2929030..f4b5b62 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Groups.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Groups.java @@ -19,10 +19,9 @@ package com.woorea.openstack.keystone.v3.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; -public class Groups implements Iterable<Group>, Serializable { +public class Groups implements Iterable<Group>, Serializable { @JsonProperty("groups") private List<Group> list; @@ -33,8 +32,10 @@ public class Groups implements Iterable<Group>, Serializable { public List<Group> getList() { return list; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see java.lang.Object#toString() */ @Override @@ -46,5 +47,5 @@ public class Groups implements Iterable<Group>, Serializable { public Iterator<Group> iterator() { return list.iterator(); } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policies.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policies.java index 1d51d64..2064550 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policies.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policies.java @@ -19,10 +19,9 @@ package com.woorea.openstack.keystone.v3.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; -public class Policies implements Iterable<Policy>, Serializable { +public class Policies implements Iterable<Policy>, Serializable { @JsonProperty("policies") private List<Policy> list; @@ -33,8 +32,10 @@ public class Policies implements Iterable<Policy>, Serializable { public List<Policy> getList() { return list; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see java.lang.Object#toString() */ @Override @@ -46,5 +47,5 @@ public class Policies implements Iterable<Policy>, Serializable { public Iterator<Policy> iterator() { return list.iterator(); } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java index 777ff67..466a300 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Policy.java @@ -18,20 +18,19 @@ package com.woorea.openstack.keystone.v3.model; import java.util.HashMap; import java.util.Map; - import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("policy") public class Policy { - + private String id; private String projectId; - + private String type; - + private String userId; - + private Map<String, String> blob = new HashMap<>(); public String getId() { @@ -73,5 +72,5 @@ public class Policy { public void setBlob(Map<String, String> blob) { this.blob = blob; } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java index 5345cb8..2f76faf 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Project.java @@ -23,12 +23,12 @@ import com.fasterxml.jackson.annotation.JsonRootName; public class Project { private String id; - + @JsonProperty("domain_id") private String domainId; - + private String name; - + private Boolean enabled; public String getId() { @@ -54,7 +54,7 @@ public class Project { public void setName(String name) { this.name = name; } - + public Boolean getEnabled() { return enabled; } @@ -62,5 +62,5 @@ public class Project { public void setEnabled(Boolean enabled) { this.enabled = enabled; } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Projects.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Projects.java index bc11b9d..c78df70 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Projects.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Projects.java @@ -19,10 +19,9 @@ package com.woorea.openstack.keystone.v3.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; -public class Projects implements Iterable<Project>, Serializable { +public class Projects implements Iterable<Project>, Serializable { @JsonProperty("projects") private List<Project> list; @@ -33,8 +32,10 @@ public class Projects implements Iterable<Project>, Serializable { public List<Project> getList() { return list; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see java.lang.Object#toString() */ @Override @@ -46,5 +47,5 @@ public class Projects implements Iterable<Project>, Serializable { public Iterator<Project> iterator() { return list.iterator(); } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Role.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Role.java index 4407bba..98ff8e0 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Role.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Role.java @@ -17,18 +17,17 @@ package com.woorea.openstack.keystone.v3.model; import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("role") public class Role implements Serializable { private String id; - + private String name; - + private String description; - + private String enabled; /** diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Roles.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Roles.java index ed0d21f..c7f13ae 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Roles.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Roles.java @@ -19,7 +19,6 @@ package com.woorea.openstack.keystone.v3.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; public class Roles implements Iterable<Role>, Serializable { @@ -33,8 +32,10 @@ public class Roles implements Iterable<Role>, Serializable { public List<Role> getList() { return list; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see java.lang.Object#toString() */ @Override @@ -46,5 +47,5 @@ public class Roles implements Iterable<Role>, Serializable { public Iterator<Role> iterator() { return list.iterator(); } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Service.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Service.java index 713a370..a0a3508 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Service.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Service.java @@ -22,11 +22,11 @@ import com.fasterxml.jackson.annotation.JsonRootName; public class Service { private String id; - + private String type; - + private String name; - + private String description; public String getId() { @@ -60,5 +60,5 @@ public class Service { public void setDescription(String description) { this.description = description; } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Services.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Services.java index d9e23f1..25da795 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Services.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Services.java @@ -19,11 +19,10 @@ package com.woorea.openstack.keystone.v3.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; import com.woorea.openstack.keystone.model.Service; -public class Services implements Iterable<Service>, Serializable { +public class Services implements Iterable<Service>, Serializable { @JsonProperty("services") private List<Service> list; @@ -34,8 +33,10 @@ public class Services implements Iterable<Service>, Serializable { public List<Service> getList() { return list; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see java.lang.Object#toString() */ @Override @@ -47,5 +48,5 @@ public class Services implements Iterable<Service>, Serializable { public Iterator<Service> iterator() { return list.iterator(); } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Token.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Token.java index ce38ff0..e85bc67 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Token.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Token.java @@ -19,30 +19,29 @@ package com.woorea.openstack.keystone.v3.model; import java.io.Serializable; import java.util.Calendar; import java.util.List; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("token") -@JsonIgnoreProperties(ignoreUnknown=true) +@JsonIgnoreProperties(ignoreUnknown = true) public class Token implements Serializable { - + private String id; - + @JsonProperty("expires_at") private Calendar expiresAt; - + @JsonProperty("issued_at") private Calendar issuedAt; - + private List<String> methods; - - @JsonIgnoreProperties(ignoreUnknown=true) + + @JsonIgnoreProperties(ignoreUnknown = true) public static final class Domain { - + private String id; - + private String name; public String getId() { @@ -60,18 +59,18 @@ public class Token implements Serializable { public void setName(String name) { this.name = name; } - + } - + private Domain domain; - - @JsonIgnoreProperties(ignoreUnknown=true) + + @JsonIgnoreProperties(ignoreUnknown = true) public static final class Project { - + private Domain domain; - + private String id; - + private String name; public Domain getDomain() { @@ -97,19 +96,19 @@ public class Token implements Serializable { public void setName(String name) { this.name = name; } - + } - + private Project project; - - @JsonIgnoreProperties(ignoreUnknown=true) + + @JsonIgnoreProperties(ignoreUnknown = true) public static final class User { - - @JsonIgnoreProperties(ignoreUnknown=true) + + @JsonIgnoreProperties(ignoreUnknown = true) private static final class Domain { - + private String id; - + private String name; public String getId() { @@ -127,11 +126,11 @@ public class Token implements Serializable { public void setName(String name) { this.name = name; } - + } - + private String id; - + private String name; public String getId() { @@ -149,37 +148,37 @@ public class Token implements Serializable { public void setName(String name) { this.name = name; } - + } - + private User user; - - @JsonIgnoreProperties(ignoreUnknown=true) + + @JsonIgnoreProperties(ignoreUnknown = true) public static final class Role { - + private String id; - + private String name; - + } - + private List<Role> roles; - + public static final class Service { - + public static final class Endpoint { - + private String id; - + private String url; - + private String region; - + private Boolean enabled; - + @JsonProperty("legacy_endpoint_id") private String legacyEndpointId; - + @JsonProperty("interface") private String iface; @@ -230,13 +229,13 @@ public class Token implements Serializable { public void setInterface(String iface) { this.iface = iface; } - + } - + private String id; - + private String type; - + private List<Endpoint> endpoints; public String getId() { @@ -262,9 +261,9 @@ public class Token implements Serializable { public void setEndpoints(List<Endpoint> endpoints) { this.endpoints = endpoints; } - + } - + private List<Service> catalog; @@ -374,13 +373,12 @@ public class Token implements Serializable { this.catalog = catalog; } - + @Override public String toString() { - return "Token [id=" + id + ", expiresAt=" + expiresAt + ", issuedAt=" - + issuedAt + ", methods=" + methods + ", domain=" + domain - + ", project=" + project + ", user=" + user + ", roles=" - + roles + ", catalog=" + catalog + "]"; + return "Token [id=" + id + ", expiresAt=" + expiresAt + ", issuedAt=" + issuedAt + ", methods=" + methods + + ", domain=" + domain + ", project=" + project + ", user=" + user + ", roles=" + roles + ", catalog=" + + catalog + "]"; } } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/User.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/User.java index 91a6230..6724213 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/User.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/User.java @@ -23,21 +23,21 @@ import com.fasterxml.jackson.annotation.JsonRootName; public class User { private String id; - + @JsonProperty("domain_id") private String domainId; - + @JsonProperty("default_project_id") private String defaultProjectId; - + private String name; - + private String password; - + private String email; - + private String description; - + private Boolean enabled; public String getId() { @@ -103,5 +103,5 @@ public class User { public void setEnabled(Boolean enabled) { this.enabled = enabled; } - + } diff --git a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Users.java b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Users.java index a371018..41e9b0e 100644 --- a/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Users.java +++ b/keystone-model/src/main/java/com/woorea/openstack/keystone/v3/model/Users.java @@ -19,11 +19,10 @@ package com.woorea.openstack.keystone.v3.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; import com.woorea.openstack.keystone.model.User; -public class Users implements Iterable<User>, Serializable { +public class Users implements Iterable<User>, Serializable { @JsonProperty("users") private List<User> list; @@ -34,8 +33,10 @@ public class Users implements Iterable<User>, Serializable { public List<User> getList() { return list; } - - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see java.lang.Object#toString() */ @Override @@ -47,5 +48,5 @@ public class Users implements Iterable<User>, Serializable { public Iterator<User> iterator() { return list.iterator(); } - + } |