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, 11 insertions, 20 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeAttachmentTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeAttachmentTest.java
index b051d52..37dfd64 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeAttachmentTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/VolumeAttachmentTest.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,22 +33,14 @@ public class VolumeAttachmentTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"volumeAttachment\" : {" + EOL
-        + "    \"id\" : \"id\"," + EOL
-        + "    \"volumeId\" : \"volumeid\"," + EOL
-        + "    \"serverId\" : \"serverid\"," + EOL
-        + "    \"device\" : \"device\"" + EOL
-        + "  }" + EOL
-        + "}";
+    private static final String JSON_FULL = "{" + EOL + "  \"volumeAttachment\" : {" + EOL + "    \"id\" : \"id\","
+            + EOL + "    \"volumeId\" : \"volumeid\"," + EOL + "    \"serverId\" : \"serverid\"," + EOL
+            + "    \"device\" : \"device\"" + 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 {
@@ -65,19 +56,19 @@ public class VolumeAttachmentTest {
     public void testMethods() throws Exception {
         VolumeAttachment volumeattachment = objectMapper.readValue(JSON_FULL, VolumeAttachment.class);
         volumeattachment.toString();
-        
+
         String volumeId = volumeattachment.getVolumeId();
         Assert.assertNotNull(volumeId);
         volumeattachment.setVolumeId(volumeId);
-        
+
         String id = volumeattachment.getId();
         Assert.assertNotNull(id);
         volumeattachment.setId(id);
-        
+
         String device = volumeattachment.getDevice();
         Assert.assertNotNull(device);
         volumeattachment.setDevice(device);
-        
+
         String serverId = volumeattachment.getServerId();
         Assert.assertNotNull(serverId);
         volumeattachment.setServerId(serverId);