Enhance Openstack Client

Update Openstack Client to support additional fields
Updat all formatting issues

Issue-ID: SO-1844

Change-Id: I1369e0c18cc25274db8df7e12855a020b8da38da
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

11 files changed, 73 insertions, 55 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 44ffb2d..c7d547b 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
@@ -30,11 +30,13 @@ public class DomainUserRolesResource extends GenericResource<Role, Roles> {
     }
 
     public OpenStackRequest<Void> add(String roleId) {
-        return new OpenStackRequest<>(CLIENT, HttpMethod.PUT, new StringBuilder(path).append("/").append(roleId).toString(), Entity.json(""), Void.class);
+        return new OpenStackRequest<>(CLIENT, HttpMethod.PUT,
+                new StringBuilder(path).append("/").append(roleId).toString(), Entity.json(""), Void.class);
     }
-    
+
     public OpenStackRequest<Void> remove(String roleId) {
-        return new OpenStackRequest<>(CLIENT, HttpMethod.DELETE, new StringBuilder(path).append("/").append(roleId).toString(), null, Void.class);
+        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 c04aba0..d0e5665 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
@@ -25,13 +25,15 @@ public class DomainsResource extends GenericResource<Domain, Domains> {
     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());
+        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());
+        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/GenericResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GenericResource.java
index c27ab8b..1c1b4fa 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
@@ -24,37 +24,40 @@ import com.woorea.openstack.base.client.OpenStackRequest;
 public class GenericResource<One, Many> {
 
     protected final OpenStackClient CLIENT;
-    
+
     protected CharSequence path;
-    
+
     protected Class<One> oneClass;
     protected Class<Many> manyClass;
-    
+
     public GenericResource(OpenStackClient client, CharSequence path, Class<One> oneClass, Class<Many> manyClass) {
         CLIENT = client;
         this.path = path;
         this.oneClass = oneClass;
         this.manyClass = manyClass;
     }
-    
+
     public OpenStackRequest<Many> list() {
         return new OpenStackRequest<>(CLIENT, HttpMethod.GET, path, null, manyClass);
     }
-    
+
     public OpenStackRequest<One> create(One one) {
         return new OpenStackRequest<>(CLIENT, HttpMethod.POST, path, Entity.json(one), oneClass);
     }
-    
+
     public OpenStackRequest<One> show(String id) {
-        return new OpenStackRequest<>(CLIENT, HttpMethod.GET, new StringBuilder(path).append("/").append(id).toString(), null, oneClass);
+        return new OpenStackRequest<>(CLIENT, HttpMethod.GET, new StringBuilder(path).append("/").append(id).toString(),
+                null, oneClass);
     }
-    
+
     public OpenStackRequest<One> update(String id, One one) {
-        return new OpenStackRequest<>(CLIENT, HttpMethod.PATCH, new StringBuilder(path).append("/").append(id).toString(), Entity.json(one), oneClass);
+        return new OpenStackRequest<>(CLIENT, HttpMethod.PATCH,
+                new StringBuilder(path).append("/").append(id).toString(), Entity.json(one), oneClass);
     }
-    
+
     public OpenStackRequest<One> delete(String id) {
-        return new OpenStackRequest<>(CLIENT, HttpMethod.DELETE, new StringBuilder(path).append("/").append(id).toString(), null, oneClass);
+        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/GroupsResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/GroupsResource.java
index c3b760f..6514ae6 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
@@ -25,9 +25,10 @@ public class GroupsResource extends GenericResource<Group, Groups> {
     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());
+        return new DomainUserRolesResource(CLIENT, new StringBuilder(path).append("/").append(domainId)
+                .append("/users/").append(userId).append("/roles").toString());
     }
 
 }
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/PoliciesResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/PoliciesResource.java
index d22416d..1a8fb42 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/PoliciesResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/PoliciesResource.java
@@ -17,7 +17,6 @@
 package com.woorea.openstack.keystone.v3.api;
 
 import com.woorea.openstack.base.client.OpenStackClient;
-
 import com.woorea.openstack.keystone.v3.model.Policies;
 import com.woorea.openstack.keystone.v3.model.Policy;
 
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectRolesResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectRolesResource.java
index a2cd01c..4e26d88 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectRolesResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectRolesResource.java
@@ -22,22 +22,24 @@ import com.woorea.openstack.base.client.OpenStackClient;
 import com.woorea.openstack.base.client.OpenStackRequest;
 
 public class ProjectRolesResource {
-    
+
     private final OpenStackClient CLIENT;
-    
+
     private final String PATH;
 
     public ProjectRolesResource(OpenStackClient client, String path) {
         this.CLIENT = client;
         this.PATH = path;
     }
-    
+
     public OpenStackRequest<Void> add(String roleId) {
-        return new OpenStackRequest<>(CLIENT, HttpMethod.PUT, new StringBuilder(PATH).append("/").append(roleId).toString(), Entity.json(""), Void.class);
+        return new OpenStackRequest<>(CLIENT, HttpMethod.PUT,
+                new StringBuilder(PATH).append("/").append(roleId).toString(), Entity.json(""), Void.class);
     }
-    
+
     public OpenStackRequest<Void> remove(String roleId) {
-        return new OpenStackRequest<>(CLIENT, HttpMethod.DELETE, new StringBuilder(PATH).append("/").append(roleId).toString(), null, Void.class);
+        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/ProjectUserRolesResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectUserRolesResource.java
index 95f5d0c..9868882 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectUserRolesResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectUserRolesResource.java
@@ -28,13 +28,15 @@ public class ProjectUserRolesResource extends GenericResource<Role, Roles> {
     public ProjectUserRolesResource(OpenStackClient client, String path) {
         super(client, path, Role.class, Roles.class);
     }
-    
+
     public OpenStackRequest<Void> add(String roleId) {
-        return new OpenStackRequest<>(CLIENT, HttpMethod.PUT, new StringBuilder(path).append("/").append(roleId).toString(), Entity.json(""), Void.class);
+        return new OpenStackRequest<>(CLIENT, HttpMethod.PUT,
+                new StringBuilder(path).append("/").append(roleId).toString(), Entity.json(""), Void.class);
     }
-    
+
     public OpenStackRequest<Void> remove(String roleId) {
-        return new OpenStackRequest<>(CLIENT, HttpMethod.DELETE, new StringBuilder(path).append("/").append(roleId).toString(), null, Void.class);
+        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/ProjectsResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectsResource.java
index 900ce20..a5cb8f2 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectsResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/ProjectsResource.java
@@ -27,17 +27,20 @@ public class ProjectsResource extends GenericResource<Project, Projects> {
     public ProjectsResource(OpenStackClient client) {
         super(client, "/projects", Project.class, Projects.class);
     }
-    
+
     public OpenStackRequest<Users> users(String projectId) {
-        return CLIENT.get(new StringBuilder(path).append("/").append(projectId).append("/users/").toString(), Users.class);
+        return CLIENT.get(new StringBuilder(path).append("/").append(projectId).append("/users/").toString(),
+                Users.class);
     }
-    
+
     public ProjectUserRolesResource userRoles(String projectId, String userId) {
-        return new ProjectUserRolesResource(CLIENT, new StringBuilder(path).append("/").append(projectId).append("/users/").append(userId).append("/roles").toString());
+        return new ProjectUserRolesResource(CLIENT, new StringBuilder(path).append("/").append(projectId)
+                .append("/users/").append(userId).append("/roles").toString());
     }
-    
+
     public ProjectUserRolesResource groupRoles(String projectId, String groupId) {
-        return new ProjectUserRolesResource(CLIENT, new StringBuilder(path).append("/").append(projectId).append("/groups/").append(groupId).append("/roles").toString());
+        return new ProjectUserRolesResource(CLIENT, new StringBuilder(path).append("/").append(projectId)
+                .append("/groups/").append(groupId).append("/roles").toString());
     }
 
 }
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/RolesResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/RolesResource.java
index ae8fc60..864764d 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/RolesResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/RolesResource.java
@@ -27,9 +27,10 @@ public class RolesResource extends GenericResource<Role, Roles> {
     public RolesResource(OpenStackClient client) {
         super(client, "/roles", Role.class, Roles.class);
     }
-    
+
     public OpenStackRequest<Users> users(String domainId, String userId) {
-        return CLIENT.get(new StringBuilder(path).append("/").append(domainId).append("/users/").append(userId).append("/roles").toString(), Users.class);
+        return CLIENT.get(new StringBuilder(path).append("/").append(domainId).append("/users/").append(userId)
+                .append("/roles").toString(), Users.class);
     }
 
 }
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/TokensResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/TokensResource.java
index 9d176d7..fda51f2 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/TokensResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/TokensResource.java
@@ -24,35 +24,35 @@ import com.woorea.openstack.keystone.v3.model.Authentication;
 import com.woorea.openstack.keystone.v3.model.Token;
 
 public class TokensResource {
-    
+
     private final OpenStackClient CLIENT;
-    
+
     public TokensResource(OpenStackClient client) {
         CLIENT = client;
     }
-    
+
     public Authenticate authenticate(Authentication authentication) {
         return new Authenticate(authentication);
     }
-    
+
     public OpenStackRequest<Token> show() {
         return CLIENT.get("/auth/tokens", Token.class);
     }
 
     public class Authenticate extends OpenStackRequest<Token> {
-        
+
         private Authentication authentication;
-        
+
         public Authenticate() {
-            
+
         }
-        
+
         public Authenticate(Authentication authentication) {
             super(CLIENT, HttpMethod.POST, "/auth/tokens", Entity.json(authentication), Token.class);
             this.authentication = authentication;
         }
 
     }
-    
+
 }
 
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/UsersResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/UsersResource.java
index 0e1e609..dc6894a 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/UsersResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/v3/api/UsersResource.java
@@ -27,17 +27,20 @@ public class UsersResource extends GenericResource<User, Users> {
     public UsersResource(OpenStackClient client) {
         super(client, "/users", User.class, Users.class);
     }
-    
+
     public OpenStackRequest<Services> groups(String userId) {
-        return CLIENT.get(new StringBuilder(path).append("/").append(userId).append("/groups").toString(), Services.class);
+        return CLIENT.get(new StringBuilder(path).append("/").append(userId).append("/groups").toString(),
+                Services.class);
     }
-    
+
     public OpenStackRequest<Services> projects(String userId) {
-        return CLIENT.get(new StringBuilder(path).append("/").append(userId).append("/projects").toString(), Services.class);
+        return CLIENT.get(new StringBuilder(path).append("/").append(userId).append("/projects").toString(),
+                Services.class);
     }
-    
+
     public OpenStackRequest<Services> roles(String userId) {
-        return CLIENT.get(new StringBuilder(path).append("/").append(userId).append("/roles").toString(), Services.class);
+        return CLIENT.get(new StringBuilder(path).append("/").append(userId).append("/roles").toString(),
+                Services.class);
     }
 
 }