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>

5 files changed, 68 insertions, 72 deletions

diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/api/EndpointsResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/api/EndpointsResource.java
index db970a5..cf1909c 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/api/EndpointsResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/api/EndpointsResource.java
@@ -25,63 +25,63 @@ import com.woorea.openstack.keystone.model.Endpoint;
 import com.woorea.openstack.keystone.model.Endpoints;
 
 public class EndpointsResource {
-    
+
     private OpenStackClient client;
-    
+
     public EndpointsResource(OpenStackClient client) {
         this.client = client;
     }
-    
+
     public List list() {
         return new List();
     }
-    
+
     public Create create(Endpoint endpoint) {
         return new Create(endpoint);
     }
-    
+
     public Show show(String id) {
         return new Show(id);
     }
 
-    
+
     public Delete delete(String id) {
         return new Delete(id);
     }
 
     public class List extends OpenStackRequest<Endpoints> {
-        
+
         public List() {
             super(client, HttpMethod.GET, "/endpoints", null, Endpoints.class);
         }
 
     }
-    
+
     public class Create extends OpenStackRequest<Endpoint> {
 
         private Endpoint endpoint;
-        
+
         public Create(Endpoint endpoint) {
             super(client, HttpMethod.POST, "/endpoints", Entity.json(endpoint), Endpoint.class);
             this.endpoint = endpoint;
         }
-        
+
     }
-    
+
     public class Show extends OpenStackRequest<Endpoint> {
-        
+
         public Show(String id) {
             super(client, HttpMethod.GET, new StringBuilder("/endpoints/").append(id).toString(), null, Endpoint.class);
         }
 
     }
-    
+
     public class Delete extends OpenStackRequest<Void> {
-        
+
         public Delete(String id) {
             super(client, HttpMethod.DELETE, new StringBuilder("/endpoints/").append(id).toString(), null, Void.class);
         }
-        
+
     }
-    
+
 }
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/api/RolesResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/api/RolesResource.java
index 71641fb..e7193b5 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/api/RolesResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/api/RolesResource.java
@@ -25,50 +25,51 @@ import com.woorea.openstack.keystone.model.Role;
 import com.woorea.openstack.keystone.model.Roles;
 
 public class RolesResource {
-    
+
     private OpenStackClient client;
-    
+
     public RolesResource(OpenStackClient client) {
         this.client = client;
     }
-    
+
     public List list() {
         return new List();
     }
-    
+
     public Create create(Role role) {
         return new Create(role);
     }
-    
+
     public Delete delete(String id) {
         return new Delete(id);
     }
 
     public class List extends OpenStackRequest<Roles> {
-        
+
         public List() {
             super(client, HttpMethod.GET, "/OS-KSADM/roles", null, Roles.class);
         }
 
     }
-    
+
     public class Create extends OpenStackRequest<Role> {
 
         private Role role;
-        
+
         public Create(Role role) {
             super(client, HttpMethod.POST, "/OS-KSADM/roles", Entity.json(role), Role.class);
             this.role = role;
         }
-        
+
     }
-    
+
     public class Delete extends OpenStackRequest<Void> {
-        
+
         public Delete(String id) {
-            super(client, HttpMethod.DELETE, new StringBuilder("/OS-KSADM/roles/").append(id).toString(), null, Void.class);
+            super(client, HttpMethod.DELETE, new StringBuilder("/OS-KSADM/roles/").append(id).toString(), null,
+                    Void.class);
         }
-        
+
     }
-    
+
 }
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/api/ServicesResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/api/ServicesResource.java
index 315d2be..033846f 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/api/ServicesResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/api/ServicesResource.java
@@ -25,62 +25,64 @@ import com.woorea.openstack.keystone.model.Service;
 import com.woorea.openstack.keystone.model.Services;
 
 public class ServicesResource {
-    
+
     private OpenStackClient client;
-    
+
     public ServicesResource(OpenStackClient client) {
         this.client = client;
     }
-    
+
     public List list() {
         return new List();
     }
-    
+
     public Create create(Service service) {
         return new Create(service);
     }
-    
+
     public Show show(String id) {
         return new Show(id);
     }
-    
+
     public Delete delete(String id) {
         return new Delete(id);
     }
 
     public class List extends OpenStackRequest<Services> {
-        
+
         public List() {
             super(client, HttpMethod.GET, "/OS-KSADM/services", null, Services.class);
         }
 
     }
-    
+
     public class Create extends OpenStackRequest<Service> {
 
         private Service service;
-        
+
         public Create(Service service) {
             super(client, HttpMethod.POST, "/OS-KSADM/services", Entity.json(service), Service.class);
             this.service = service;
         }
-        
+
     }
-    
+
     public class Show extends OpenStackRequest<Service> {
-        
+
         public Show(String id) {
-            super(client, HttpMethod.GET, new StringBuilder("/OS-KSADM/services/").append(id).toString(), null, Service.class);
+            super(client, HttpMethod.GET, new StringBuilder("/OS-KSADM/services/").append(id).toString(), null,
+                    Service.class);
         }
 
     }
-    
+
     public class Delete extends OpenStackRequest<Void> {
-        
+
         public Delete(String id) {
-            super(client, HttpMethod.DELETE, new StringBuilder("/OS-KSADM/services/").append(id).toString(), null, Void.class);
+            super(client, HttpMethod.DELETE, new StringBuilder("/OS-KSADM/services/").append(id).toString(), null,
+                    Void.class);
         }
-        
+
     }
-    
+
 }
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/api/TenantsResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/api/TenantsResource.java
index 0d0a027..3fbf545 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/api/TenantsResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/api/TenantsResource.java
@@ -130,8 +130,7 @@ public class TenantsResource {
         private Tenant tenant;
 
         public Update(String id, Tenant tenant) {
-            super(client, HttpMethod.PUT, getTenantsString(id).toString(), Entity.json(tenant),
-                Tenant.class);
+            super(client, HttpMethod.PUT, getTenantsString(id).toString(), Entity.json(tenant), Tenant.class);
             this.tenant = tenant;
         }
     }
@@ -146,16 +145,14 @@ public class TenantsResource {
     public class ListUsers extends OpenStackRequest<Users> {
 
         public ListUsers(String tenantId) {
-            super(client, HttpMethod.GET,getTenantsString(tenantId).append("/users").toString(),
-                null, Users.class);
+            super(client, HttpMethod.GET, getTenantsString(tenantId).append("/users").toString(), null, Users.class);
         }
     }
 
     public class AddUser extends OpenStackRequest<Void> {
 
         public AddUser(String tenantId, String userId, String roleId) {
-            super(client, HttpMethod.PUT,
-                getTenantsString(tenantId).append(USERS).append(userId)
+            super(client, HttpMethod.PUT, getTenantsString(tenantId).append(USERS).append(userId)
                     .append("/roles/OS-KSADM/").append(roleId).toString(), null, Void.class);
         }
     }
@@ -163,8 +160,7 @@ public class TenantsResource {
     public class RemoveUser extends OpenStackRequest<Void> {
 
         public RemoveUser(String tenantId, String userId, String roleId) {
-            super(client, HttpMethod.DELETE,
-                getTenantsString(tenantId).append(USERS).append(userId)
+            super(client, HttpMethod.DELETE, getTenantsString(tenantId).append(USERS).append(userId)
                     .append("/roles/OS-KSADM/").append(roleId).toString(), null, Void.class);
         }
     }
@@ -173,15 +169,14 @@ public class TenantsResource {
 
         public ListUserRoles(String tenantId, String userId) {
             super(client, HttpMethod.GET,
-                getTenantsString(tenantId).append(USERS).append(userId).append("/roles")
-                    .toString(), null, Roles.class);
+                    getTenantsString(tenantId).append(USERS).append(userId).append("/roles").toString(), null,
+                    Roles.class);
         }
     }
 
     /**
-     * The following APIs support Tenant-level metadata.  This is a feature supported
-     * by the DCP/LCP (i.e. AIC cloud), but not native Openstack.  The full API as
-     * documented by AIC is implemented below.
+     * The following APIs support Tenant-level metadata. This is a feature supported by the DCP/LCP (i.e. AIC cloud),
+     * but not native Openstack. The full API as documented by AIC is implemented below.
      */
     public class ShowMetadata extends OpenStackRequest<Metadata> {
 
@@ -194,7 +189,7 @@ public class TenantsResource {
 
         public CreateOrUpdateMetadata(String tenantId, Metadata metadata) {
             super(client, HttpMethod.POST, getTenantsString(tenantId).append(METADATA), Entity.json(metadata),
-                Metadata.class);
+                    Metadata.class);
         }
     }
 
@@ -202,32 +197,31 @@ public class TenantsResource {
 
         public ReplaceMetadata(String tenantId, Metadata metadata) {
             super(client, HttpMethod.PUT, getTenantsString(tenantId).append(METADATA), Entity.json(metadata),
-                Metadata.class);
+                    Metadata.class);
         }
     }
 
     public class ShowMetadataItem extends OpenStackRequest<Metadata> {
 
         public ShowMetadataItem(String tenantId, String key) {
-            super(client, HttpMethod.GET,
-                getTenantsString(tenantId).append(METADATA).append(key), null, Metadata.class);
+            super(client, HttpMethod.GET, getTenantsString(tenantId).append(METADATA).append(key), null,
+                    Metadata.class);
         }
     }
 
     public class CreateOrUpdateMetadataItem extends OpenStackRequest<Metadata> {
 
         public CreateOrUpdateMetadataItem(String tenantId, String key, Metadata metadata) {
-            super(client, HttpMethod.POST,
-                getTenantsString(tenantId).append(METADATA).append(key), Entity.json(metadata),
-                Metadata.class);
+            super(client, HttpMethod.POST, getTenantsString(tenantId).append(METADATA).append(key),
+                    Entity.json(metadata), Metadata.class);
         }
     }
 
     public class DeleteMetadataItem extends OpenStackRequest<Void> {
 
         public DeleteMetadataItem(String tenantId, String key) {
-            super(client, HttpMethod.DELETE,
-                getTenantsString(tenantId).append("/metadata/").append(key), null, Void.class);
+            super(client, HttpMethod.DELETE, getTenantsString(tenantId).append("/metadata/").append(key), null,
+                    Void.class);
         }
     }
 
diff --git a/keystone-client/src/main/java/com/woorea/openstack/keystone/api/UsersResource.java b/keystone-client/src/main/java/com/woorea/openstack/keystone/api/UsersResource.java
index 87b7a46..bb02043 100644
--- a/keystone-client/src/main/java/com/woorea/openstack/keystone/api/UsersResource.java
+++ b/keystone-client/src/main/java/com/woorea/openstack/keystone/api/UsersResource.java
@@ -82,8 +82,7 @@ public class UsersResource {
         private User user;
 
         public Update(String id, User user) {
-            super(client, HttpMethod.PUT, getUserString(id), Entity.json(user),
-                User.class);
+            super(client, HttpMethod.PUT, getUserString(id), Entity.json(user), User.class);
             this.user = user;
         }
     }