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, 45 insertions, 78 deletions

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/AccessKeyTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/AccessKeyTest.java
index ffaae7e..f7dcd2d 100644
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/AccessKeyTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/AccessKeyTest.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.model.authentication.AccessKey.ApiAccessKeyCredentials;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -35,24 +34,15 @@ public class AccessKeyTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"auth\" : {" + EOL
-        + "    \"tenantId\" : \"tenantid\"," + EOL
-        + "    \"tenantName\" : \"tenantname\"," + EOL
-        + "    \"apiAccessKeyCredentials\" : {" + EOL
-        + "      \"accessKey\" : \"accesskey\"," + EOL
-        + "      \"secretKey\" : \"secretkey\"" + EOL
-        + "    }" + EOL
-        + "  }" + EOL
-        + "}";
+    private static final String JSON_FULL = "{" + EOL + "  \"auth\" : {" + EOL + "    \"tenantId\" : \"tenantid\","
+            + EOL + "    \"tenantName\" : \"tenantname\"," + EOL + "    \"apiAccessKeyCredentials\" : {" + EOL
+            + "      \"accessKey\" : \"accesskey\"," + EOL + "      \"secretKey\" : \"secretkey\"" + EOL + "    }" + EOL
+            + "  }" + EOL + "}";
 
-    private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Include.NON_NULL)
-        .enable(SerializationFeature.INDENT_OUTPUT)
-        .enable(SerializationFeature.WRAP_ROOT_VALUE)
-        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+    private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL)
+            .enable(SerializationFeature.INDENT_OUTPUT).enable(SerializationFeature.WRAP_ROOT_VALUE)
+            .enable(DeserializationFeature.UNWRAP_ROOT_VALUE).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {
@@ -68,15 +58,15 @@ public class AccessKeyTest {
     public void testMethods() throws Exception {
         AccessKey accesskey = objectMapper.readValue(JSON_FULL, AccessKey.class);
         accesskey.toString();
-        
+
         ApiAccessKeyCredentials apiAccessKeyCredentials = accesskey.getApiAccessKeyCredentials();
         Assert.assertNotNull(apiAccessKeyCredentials);
         accesskey.setApiAccessKeyCredentials(apiAccessKeyCredentials);
-        
+
         String tenantId = accesskey.getTenantId();
         Assert.assertNotNull(tenantId);
         accesskey.setTenantId(tenantId);
-        
+
         String tenantName = accesskey.getTenantName();
         Assert.assertNotNull(tenantName);
         accesskey.setTenantName(tenantName);
diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/ApiAccessKeyCredentialsTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/ApiAccessKeyCredentialsTest.java
index 4a0534c..b06eeac 100644
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/ApiAccessKeyCredentialsTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/ApiAccessKeyCredentialsTest.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.model.authentication.AccessKey.ApiAccessKeyCredentials;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -35,22 +34,19 @@ public class ApiAccessKeyCredentialsTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"accessKey\" : \"accesskey\"," + EOL
-        + "  \"secretKey\" : \"secretkey\"" + EOL
-        + "}";
+    private static final String JSON_FULL =
+            "{" + EOL + "  \"accessKey\" : \"accesskey\"," + EOL + "  \"secretKey\" : \"secretkey\"" + EOL + "}";
 
-    private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Include.NON_NULL)
-        .enable(SerializationFeature.INDENT_OUTPUT)
-        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+    private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL)
+            .enable(SerializationFeature.INDENT_OUTPUT).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {
         System.out.println("CLASS: " + ApiAccessKeyCredentials.class.getName());
         System.out.println("TEST JSON: " + JSON_FULL);
-        ApiAccessKeyCredentials apiaccesskeycredentials = objectMapper.readValue(JSON_FULL, ApiAccessKeyCredentials.class);
+        ApiAccessKeyCredentials apiaccesskeycredentials =
+                objectMapper.readValue(JSON_FULL, ApiAccessKeyCredentials.class);
         String json = objectMapper.writeValueAsString(apiaccesskeycredentials);
         System.out.println("RE-SERIALIZED OBJECT: " + json);
         JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT);
@@ -58,13 +54,14 @@ public class ApiAccessKeyCredentialsTest {
 
     @Test
     public void testMethods() throws Exception {
-        ApiAccessKeyCredentials apiaccesskeycredentials = objectMapper.readValue(JSON_FULL, ApiAccessKeyCredentials.class);
+        ApiAccessKeyCredentials apiaccesskeycredentials =
+                objectMapper.readValue(JSON_FULL, ApiAccessKeyCredentials.class);
         apiaccesskeycredentials.toString();
-        
+
         String secretKey = apiaccesskeycredentials.getSecretKey();
         Assert.assertNotNull(secretKey);
         apiaccesskeycredentials.setSecretKey(secretKey);
-        
+
         String accessKey = apiaccesskeycredentials.getAccessKey();
         Assert.assertNotNull(accessKey);
         apiaccesskeycredentials.setAccessKey(accessKey);
diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/PasswordCredentialsTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/PasswordCredentialsTest.java
index 02adcaa..f629150 100644
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/PasswordCredentialsTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/PasswordCredentialsTest.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.model.authentication.UsernamePassword.PasswordCredentials;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -35,16 +34,12 @@ public class PasswordCredentialsTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"username\" : \"username\"," + EOL
-        + "  \"password\" : \"password\"" + EOL
-        + "}";
+    private static final String JSON_FULL =
+            "{" + EOL + "  \"username\" : \"username\"," + EOL + "  \"password\" : \"password\"" + EOL + "}";
 
-    private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Include.NON_NULL)
-        .enable(SerializationFeature.INDENT_OUTPUT)
-        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+    private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL)
+            .enable(SerializationFeature.INDENT_OUTPUT).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {
@@ -60,11 +55,11 @@ public class PasswordCredentialsTest {
     public void testMethods() throws Exception {
         PasswordCredentials passwordcredentials = objectMapper.readValue(JSON_FULL, PasswordCredentials.class);
         passwordcredentials.toString();
-        
+
         String password = passwordcredentials.getPassword();
         Assert.assertNotNull(password);
         passwordcredentials.setPassword(password);
-        
+
         String username = passwordcredentials.getUsername();
         Assert.assertNotNull(username);
         passwordcredentials.setUsername(username);
diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/TokenTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/TokenTest.java
index 5fd13ef..057760a 100644
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/TokenTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/TokenTest.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.model.authentication.TokenAuthentication.Token;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -35,15 +34,11 @@ public class TokenTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"id\" : \"id\"" + EOL
-        + "}";
+    private static final String JSON_FULL = "{" + EOL + "  \"id\" : \"id\"" + EOL + "}";
 
-    private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Include.NON_NULL)
-        .enable(SerializationFeature.INDENT_OUTPUT)
-        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+    private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL)
+            .enable(SerializationFeature.INDENT_OUTPUT).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {
@@ -59,7 +54,7 @@ public class TokenTest {
     public void testMethods() throws Exception {
         Token token = objectMapper.readValue(JSON_FULL, Token.class);
         token.toString();
-        
+
         String id = token.getId();
         Assert.assertNotNull(id);
         token.setId(id);
diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java
index 60d5385..c691484 100644
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/model/authentication/UsernamePasswordTest.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.model.authentication.UsernamePassword.PasswordCredentials;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -35,24 +34,15 @@ public class UsernamePasswordTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"auth\" : {" + EOL
-        + "    \"tenantId\" : \"tenantid\"," + EOL
-        + "    \"tenantName\" : \"tenantname\"," + EOL
-        + "    \"passwordCredentials\" : {" + EOL
-        + "      \"username\" : \"username\"," + EOL
-        + "      \"password\" : \"password\"" + EOL
-        + "    }" + EOL
-        + "  }" + EOL
-        + "}";
+    private static final String JSON_FULL = "{" + EOL + "  \"auth\" : {" + EOL + "    \"tenantId\" : \"tenantid\","
+            + EOL + "    \"tenantName\" : \"tenantname\"," + EOL + "    \"passwordCredentials\" : {" + EOL
+            + "      \"username\" : \"username\"," + EOL + "      \"password\" : \"password\"" + EOL + "    }" + EOL
+            + "  }" + EOL + "}";
 
-    private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Include.NON_NULL)
-        .enable(SerializationFeature.INDENT_OUTPUT)
-        .enable(SerializationFeature.WRAP_ROOT_VALUE)
-        .enable(DeserializationFeature.UNWRAP_ROOT_VALUE)
-        .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
-        .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+    private ObjectMapper objectMapper = new ObjectMapper().setSerializationInclusion(Include.NON_NULL)
+            .enable(SerializationFeature.INDENT_OUTPUT).enable(SerializationFeature.WRAP_ROOT_VALUE)
+            .enable(DeserializationFeature.UNWRAP_ROOT_VALUE).enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {
@@ -68,15 +58,15 @@ public class UsernamePasswordTest {
     public void testMethods() throws Exception {
         UsernamePassword usernamepassword = objectMapper.readValue(JSON_FULL, UsernamePassword.class);
         usernamepassword.toString();
-        
+
         PasswordCredentials passwordCredentials = usernamepassword.getPasswordCredentials();
         Assert.assertNotNull(passwordCredentials);
         usernamepassword.setPasswordCredentials(passwordCredentials);
-        
+
         String tenantId = usernamepassword.getTenantId();
         Assert.assertNotNull(tenantId);
         usernamepassword.setTenantId(tenantId);
-        
+
         String tenantName = usernamepassword.getTenantName();
         Assert.assertNotNull(tenantName);
         usernamepassword.setTenantName(tenantName);