From 4f27ba159b9786fd440c7b07f19da26b5a65786c Mon Sep 17 00:00:00 2001 From: seshukm Date: Wed, 25 Jul 2018 18:13:18 +0800 Subject: fix keystone code issues Issue-ID: SO-729 Change-Id: Ia3f30f048499b5f8b3654cb851f140aa1707bd63 Signed-off-by: seshukm --- .../keystone/v3/api/DomainUserRolesResource.java | 20 +++---- .../openstack/keystone/v3/api/DomainsResource.java | 22 +++---- .../keystone/v3/api/EndpointsResource.java | 6 +- .../openstack/keystone/v3/api/GenericResource.java | 68 +++++++++++----------- .../keystone/v3/api/GroupUsersResource.java | 6 +- .../openstack/keystone/v3/api/GroupsResource.java | 14 ++--- 6 files changed, 68 insertions(+), 68 deletions(-) diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/DomainUserRolesResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/DomainUserRolesResource.java index af0f7e1..44ffb2d 100644 --- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/DomainUserRolesResource.java +++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/DomainUserRolesResource.java @@ -25,16 +25,16 @@ import com.woorea.openstack.keystone.model.Roles; public class DomainUserRolesResource extends GenericResource { - public DomainUserRolesResource(OpenStackClient client, String path) { - super(client, path, Role.class, Roles.class); - } + public DomainUserRolesResource(OpenStackClient client, String path) { + super(client, path, Role.class, Roles.class); + } - public OpenStackRequest add(String roleId) { - return new OpenStackRequest<>(CLIENT, HttpMethod.PUT, new StringBuilder(path).append("/").append(roleId).toString(), Entity.json(""), Void.class); - } - - public OpenStackRequest remove(String roleId) { - return new OpenStackRequest<>(CLIENT, HttpMethod.DELETE, new StringBuilder(path).append("/").append(roleId).toString(), null, Void.class); - } + public OpenStackRequest add(String roleId) { + return new OpenStackRequest<>(CLIENT, HttpMethod.PUT, new StringBuilder(path).append("/").append(roleId).toString(), Entity.json(""), Void.class); + } + + public OpenStackRequest remove(String roleId) { + return new OpenStackRequest<>(CLIENT, HttpMethod.DELETE, new StringBuilder(path).append("/").append(roleId).toString(), null, Void.class); + } } diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/DomainsResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/DomainsResource.java index 9aa01f3..c04aba0 100644 --- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/DomainsResource.java +++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/DomainsResource.java @@ -22,16 +22,16 @@ import com.woorea.openstack.keystone.v3.model.Domains; public class DomainsResource extends GenericResource { - public DomainsResource(OpenStackClient client) { - super(client, "/domains", Domain.class, Domains.class); - } - - public DomainUserRolesResource userRoles(String domainId, String userId) { - return new DomainUserRolesResource(CLIENT, new StringBuilder(path).append("/").append(domainId).append("/users/").append(userId).append("/roles").toString()); - } - - public DomainUserRolesResource groupRoles(String domainId, String groupId) { - return new DomainUserRolesResource(CLIENT, new StringBuilder(path).append("/").append(domainId).append("/groups/").append(groupId).append("/roles").toString()); - } + public DomainsResource(OpenStackClient client) { + super(client, "/domains", Domain.class, Domains.class); + } + + public DomainUserRolesResource userRoles(String domainId, String userId) { + return new DomainUserRolesResource(CLIENT, new StringBuilder(path).append("/").append(domainId).append("/users/").append(userId).append("/roles").toString()); + } + + public DomainUserRolesResource groupRoles(String domainId, String groupId) { + return new DomainUserRolesResource(CLIENT, new StringBuilder(path).append("/").append(domainId).append("/groups/").append(groupId).append("/roles").toString()); + } } diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/EndpointsResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/EndpointsResource.java index 7a7b1bf..4d4d147 100644 --- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/EndpointsResource.java +++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/EndpointsResource.java @@ -22,8 +22,8 @@ import com.woorea.openstack.keystone.v3.model.Endpoints; public class EndpointsResource extends GenericResource { - public EndpointsResource(OpenStackClient client) { - super(client, "/endpoints", Endpoint.class, Endpoints.class); - } + public EndpointsResource(OpenStackClient client) { + super(client, "/endpoints", Endpoint.class, Endpoints.class); + } } diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GenericResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GenericResource.java index 30c915c..c27ab8b 100644 --- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GenericResource.java +++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GenericResource.java @@ -23,38 +23,38 @@ import com.woorea.openstack.base.client.OpenStackRequest; public class GenericResource { - protected final OpenStackClient CLIENT; - - protected CharSequence path; - - protected Class oneClass; - protected Class manyClass; - - public GenericResource(OpenStackClient client, CharSequence path, Class oneClass, Class manyClass) { - CLIENT = client; - this.path = path; - this.oneClass = oneClass; - this.manyClass = manyClass; - } - - public OpenStackRequest list() { - return new OpenStackRequest<>(CLIENT, HttpMethod.GET, path, null, manyClass); - } - - public OpenStackRequest create(One one) { - return new OpenStackRequest<>(CLIENT, HttpMethod.POST, path, Entity.json(one), oneClass); - } - - public OpenStackRequest show(String id) { - return new OpenStackRequest<>(CLIENT, HttpMethod.GET, new StringBuilder(path).append("/").append(id).toString(), null, oneClass); - } - - public OpenStackRequest update(String id, One one) { - return new OpenStackRequest<>(CLIENT, HttpMethod.PATCH, new StringBuilder(path).append("/").append(id).toString(), Entity.json(one), oneClass); - } - - public OpenStackRequest delete(String id) { - return new OpenStackRequest<>(CLIENT, HttpMethod.DELETE, new StringBuilder(path).append("/").append(id).toString(), null, oneClass); - } - + protected final OpenStackClient CLIENT; + + protected CharSequence path; + + protected Class oneClass; + protected Class manyClass; + + public GenericResource(OpenStackClient client, CharSequence path, Class oneClass, Class manyClass) { + CLIENT = client; + this.path = path; + this.oneClass = oneClass; + this.manyClass = manyClass; + } + + public OpenStackRequest list() { + return new OpenStackRequest<>(CLIENT, HttpMethod.GET, path, null, manyClass); + } + + public OpenStackRequest create(One one) { + return new OpenStackRequest<>(CLIENT, HttpMethod.POST, path, Entity.json(one), oneClass); + } + + public OpenStackRequest show(String id) { + return new OpenStackRequest<>(CLIENT, HttpMethod.GET, new StringBuilder(path).append("/").append(id).toString(), null, oneClass); + } + + public OpenStackRequest update(String id, One one) { + return new OpenStackRequest<>(CLIENT, HttpMethod.PATCH, new StringBuilder(path).append("/").append(id).toString(), Entity.json(one), oneClass); + } + + public OpenStackRequest delete(String id) { + return new OpenStackRequest<>(CLIENT, HttpMethod.DELETE, new StringBuilder(path).append("/").append(id).toString(), null, oneClass); + } + } diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GroupUsersResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GroupUsersResource.java index 45da3a6..efcf7d0 100644 --- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GroupUsersResource.java +++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GroupUsersResource.java @@ -23,8 +23,8 @@ import com.woorea.openstack.keystone.v3.model.Users; public class GroupUsersResource extends GenericResource { - public GroupUsersResource(OpenStackClient client, String path) { - super(client, path, User.class, Users.class); - } + public GroupUsersResource(OpenStackClient client, String path) { + super(client, path, User.class, Users.class); + } } diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GroupsResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GroupsResource.java index 7c35825..c3b760f 100644 --- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GroupsResource.java +++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GroupsResource.java @@ -22,12 +22,12 @@ import com.woorea.openstack.keystone.v3.model.Groups; public class GroupsResource extends GenericResource { - public GroupsResource(OpenStackClient client) { - super(client, "/groups", Group.class, Groups.class); - } - - public DomainUserRolesResource userRoles(String domainId, String userId) { - return new DomainUserRolesResource(CLIENT, new StringBuilder(path).append("/").append(domainId).append("/users/").append(userId).append("/roles").toString()); - } + public GroupsResource(OpenStackClient client) { + super(client, "/groups", Group.class, Groups.class); + } + + public DomainUserRolesResource userRoles(String domainId, String userId) { + return new DomainUserRolesResource(CLIENT, new StringBuilder(path).append("/").append(domainId).append("/users/").append(userId).append("/roles").toString()); + } } -- cgit 1.2.3-korg