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, 18 insertions, 26 deletions

diff --git a/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.java b/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.java
index fc5cf69..c87e52f 100644
--- a/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.java
+++ b/nova-model/src/test/java/com/woorea/openstack/nova/model/SecurityGroupRuleForCreateTest.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,30 +33,22 @@ public class SecurityGroupRuleForCreateTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"security_group_rule\" : {" + EOL
-        + "    \"cidr\" : \"cidr\"," + EOL
-        + "    \"parent_group_id\" : \"parentgroupid\"," + EOL
-        + "    \"ip_protocol\" : \"ipprotocol\"," + EOL
-        + "    \"from_port\" : 7," + EOL
-        + "    \"to_port\" : 98," + EOL
-        + "    \"group_id\" : \"groupid\"" + EOL
-        + "  }" + EOL
-        + "}";
+    private static final String JSON_FULL = "{" + EOL + "  \"security_group_rule\" : {" + EOL
+            + "    \"cidr\" : \"cidr\"," + EOL + "    \"parent_group_id\" : \"parentgroupid\"," + EOL
+            + "    \"ip_protocol\" : \"ipprotocol\"," + EOL + "    \"from_port\" : 7," + EOL + "    \"to_port\" : 98,"
+            + EOL + "    \"group_id\" : \"groupid\"" + 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 {
         System.out.println("CLASS: " + SecurityGroupRuleForCreate.class.getName());
         System.out.println("TEST JSON: " + JSON_FULL);
-        SecurityGroupRuleForCreate securitygroupruleforcreate = objectMapper.readValue(JSON_FULL, SecurityGroupRuleForCreate.class);
+        SecurityGroupRuleForCreate securitygroupruleforcreate =
+                objectMapper.readValue(JSON_FULL, SecurityGroupRuleForCreate.class);
         String json = objectMapper.writeValueAsString(securitygroupruleforcreate);
         System.out.println("RE-SERIALIZED OBJECT: " + json);
         JSONAssert.assertEquals(JSON_FULL, json, JSONCompareMode.LENIENT);
@@ -65,29 +56,30 @@ public class SecurityGroupRuleForCreateTest {
 
     @Test
     public void testMethods() throws Exception {
-        SecurityGroupRuleForCreate securitygroupruleforcreate = objectMapper.readValue(JSON_FULL, SecurityGroupRuleForCreate.class);
+        SecurityGroupRuleForCreate securitygroupruleforcreate =
+                objectMapper.readValue(JSON_FULL, SecurityGroupRuleForCreate.class);
         securitygroupruleforcreate.toString();
-        
+
         String parentGroupId = securitygroupruleforcreate.getParentGroupId();
         Assert.assertNotNull(parentGroupId);
         securitygroupruleforcreate.setParentGroupId(parentGroupId);
-        
+
         String ipProtocol = securitygroupruleforcreate.getIpProtocol();
         Assert.assertNotNull(ipProtocol);
         securitygroupruleforcreate.setIpProtocol(ipProtocol);
-        
+
         String groupId = securitygroupruleforcreate.getGroupId();
         Assert.assertNotNull(groupId);
         securitygroupruleforcreate.setGroupId(groupId);
-        
+
         Integer fromPort = securitygroupruleforcreate.getFromPort();
         Assert.assertNotNull(fromPort);
         securitygroupruleforcreate.setFromPort(fromPort);
-        
+
         String cidr = securitygroupruleforcreate.getCidr();
         Assert.assertNotNull(cidr);
         securitygroupruleforcreate.setCidr(cidr);
-        
+
         Integer toPort = securitygroupruleforcreate.getToPort();
         Assert.assertNotNull(toPort);
         securitygroupruleforcreate.setToPort(toPort);