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, 10 insertions, 21 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/CreateImageTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/CreateImageTest.java
index 2c33b27..903a29f 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/CreateImageTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/CreateImageTest.java
@@ -25,9 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.woorea.openstack.nova.model.ServerAction.CreateImage;
-
 import java.util.Map;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -37,23 +35,14 @@ public class CreateImageTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"createImage\" : {" + EOL
-        + "    \"name\" : \"name\"," + EOL
-        + "    \"metadata\" : {" + EOL
-        + "      \"metadata-k1\" : \"metadata-v1\"," + EOL
-        + "      \"metadata-k2\" : \"metadata-v2\"" + EOL
-        + "    }" + EOL
-        + "  }" + EOL
-        + "}";
+    private static final String JSON_FULL = "{" + EOL + "  \"createImage\" : {" + EOL + "    \"name\" : \"name\"," + EOL
+            + "    \"metadata\" : {" + EOL + "      \"metadata-k1\" : \"metadata-v1\"," + EOL
+            + "      \"metadata-k2\" : \"metadata-v2\"" + 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 {
@@ -69,12 +58,12 @@ public class CreateImageTest {
     public void testMethods() throws Exception {
         CreateImage createimage = objectMapper.readValue(JSON_FULL, CreateImage.class);
         createimage.toString();
-        
-        Map<String,String> metadata = createimage.getMetadata();
+
+        Map<String, String> metadata = createimage.getMetadata();
         Assert.assertNotNull(metadata);
         Assert.assertEquals(2, metadata.size());
         createimage.setMetadata(metadata);
-        
+
         String name = createimage.getName();
         Assert.assertNotNull(name);
         createimage.setName(name);