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>

1 files changed, 16 insertions, 41 deletions

diff --git a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/AuthenticationTest.java b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/AuthenticationTest.java
index 2779e1b..8fdaf88 100644
--- a/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/AuthenticationTest.java
+++ b/keystone-model/src/test/java/com/woorea/openstack/keystone/v3/model/AuthenticationTest.java
@@ -26,7 +26,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.keystone.v3.model.Authentication.Identity;
 import com.woorea.openstack.keystone.v3.model.Authentication.Scope;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -36,45 +35,21 @@ public class AuthenticationTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"auth\" : {" + EOL
-        + "    \"identity\" : {" + EOL
-        + "      \"methods\" : [ \"methods-v1\", \"methods-v2\" ]," + EOL
-        + "      \"password\" : {" + EOL
-        + "        \"user\" : {" + EOL
-        + "          \"domain\" : {" + EOL
-        + "            \"id\" : \"id\"," + EOL
-        + "            \"name\" : \"name\"" + EOL
-        + "          }," + EOL
-        + "          \"id\" : \"id\"," + EOL
-        + "          \"name\" : \"name\"," + EOL
-        + "          \"password\" : \"password\"" + EOL
-        + "        }" + EOL
-        + "      }," + EOL
-        + "      \"token\" : {" + EOL
-        + "        \"id\" : \"id\"" + EOL
-        + "      }" + EOL
-        + "    }," + EOL
-        + "    \"scope\" : {" + EOL
-        + "      \"project\" : {" + EOL
-        + "        \"id\" : \"id\"," + EOL
-        + "        \"domain\" : {" + EOL
-        + "          \"id\" : \"id\"," + EOL
-        + "          \"name\" : \"name\"" + EOL
-        + "        }," + EOL
-        + "        \"name\" : \"name\"" + EOL
-        + "      }" + EOL
-        + "    }" + EOL
-        + "  }" + EOL
-        + "}";
+    private static final String JSON_FULL = "{" + EOL + "  \"auth\" : {" + EOL + "    \"identity\" : {" + EOL
+            + "      \"methods\" : [ \"methods-v1\", \"methods-v2\" ]," + EOL + "      \"password\" : {" + EOL
+            + "        \"user\" : {" + EOL + "          \"domain\" : {" + EOL + "            \"id\" : \"id\"," + EOL
+            + "            \"name\" : \"name\"" + EOL + "          }," + EOL + "          \"id\" : \"id\"," + EOL
+            + "          \"name\" : \"name\"," + EOL + "          \"password\" : \"password\"" + EOL + "        }" + EOL
+            + "      }," + EOL + "      \"token\" : {" + EOL + "        \"id\" : \"id\"" + EOL + "      }" + EOL
+            + "    }," + EOL + "    \"scope\" : {" + EOL + "      \"project\" : {" + EOL + "        \"id\" : \"id\","
+            + EOL + "        \"domain\" : {" + EOL + "          \"id\" : \"id\"," + EOL
+            + "          \"name\" : \"name\"" + EOL + "        }," + EOL + "        \"name\" : \"name\"" + EOL
+            + "      }" + 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 {
@@ -90,11 +65,11 @@ public class AuthenticationTest {
     public void testMethods() throws Exception {
         Authentication authentication = objectMapper.readValue(JSON_FULL, Authentication.class);
         authentication.toString();
-        
+
         Identity identity = authentication.getIdentity();
         Assert.assertNotNull(identity);
         authentication.setIdentity(identity);
-        
+
         Scope scope = authentication.getScope();
         Assert.assertNotNull(scope);
         authentication.setScope(scope);