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, 13 insertions, 22 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairTest.java
index c7f564c..0ef3f5d 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/KeyPairTest.java
@@ -24,7 +24,6 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -34,23 +33,15 @@ public class KeyPairTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"keypair\" : {" + EOL
-        + "    \"name\" : \"name\"," + EOL
-        + "    \"fingerprint\" : \"fingerprint\"," + EOL
-        + "    \"user_id\" : \"userid\"," + EOL
-        + "    \"public_key\" : \"publickey\"," + EOL
-        + "    \"private_key\" : \"privatekey\"" + EOL
-        + "  }" + EOL
-        + "}";
+    private static final String JSON_FULL = "{" + EOL + "  \"keypair\" : {" + EOL + "    \"name\" : \"name\"," + EOL
+            + "    \"fingerprint\" : \"fingerprint\"," + EOL + "    \"user_id\" : \"userid\"," + EOL
+            + "    \"public_key\" : \"publickey\"," + EOL + "    \"private_key\" : \"privatekey\"" + 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 {
@@ -66,21 +57,21 @@ public class KeyPairTest {
     public void testMethods() throws Exception {
         KeyPair keypair = objectMapper.readValue(JSON_FULL, KeyPair.class);
         keypair.toString();
-        
+
         String privateKey = keypair.getPrivateKey();
         Assert.assertNotNull(privateKey);
-        
+
         String name = keypair.getName();
         Assert.assertNotNull(name);
         keypair.setName(name);
-        
+
         String fingerprint = keypair.getFingerprint();
         Assert.assertNotNull(fingerprint);
-        
+
         String publicKey = keypair.getPublicKey();
         Assert.assertNotNull(publicKey);
         keypair.setPublicKey(publicKey);
-        
+
         String userId = keypair.getUserId();
         Assert.assertNotNull(userId);
     }