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

diff --git a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RoutersTest.java b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RoutersTest.java
index 168dffc..917838a 100644
--- a/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RoutersTest.java
+++ b/quantum-model/src/test/java/com/woorea/openstack/quantum/model/RoutersTest.java
@@ -24,9 +24,7 @@ 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 java.util.List;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
@@ -36,47 +34,23 @@ public class RoutersTest {
 
     private static final String EOL = System.lineSeparator();
 
-    private static final String JSON_FULL = "{" + EOL
-        + "  \"routers\" : [ {" + EOL
-        + "    \"status\" : \"status\"," + EOL
-        + "    \"name\" : \"name\"," + EOL
-        + "    \"admin_state_up\" : \"admin_state_up\"," + EOL
-        + "    \"id\" : \"id\"," + EOL
-        + "    \"routes\" : [ {" + EOL
-        + "      \"destination\" : \"destination\"," + EOL
-        + "      \"nexthop\" : \"nexthop\"" + EOL
-        + "    }, {" + EOL
-        + "      \"destination\" : \"destination\"," + EOL
-        + "      \"nexthop\" : \"nexthop\"" + EOL
-        + "    } ]," + EOL
-        + "    \"external_gateway_info\" : {" + EOL
-        + "      \"network_id\" : \"networkid\"" + EOL
-        + "    }," + EOL
-        + "    \"tenant_id\" : \"tenantid\"" + EOL
-        + "  }, {" + EOL
-        + "    \"status\" : \"status\"," + EOL
-        + "    \"name\" : \"name\"," + EOL
-        + "    \"admin_state_up\" : \"admin_state_up\"," + EOL
-        + "    \"id\" : \"id\"," + EOL
-        + "    \"routes\" : [ {" + EOL
-        + "      \"destination\" : \"destination\"," + EOL
-        + "      \"nexthop\" : \"nexthop\"" + EOL
-        + "    }, {" + EOL
-        + "      \"destination\" : \"destination\"," + EOL
-        + "      \"nexthop\" : \"nexthop\"" + EOL
-        + "    } ]," + EOL
-        + "    \"external_gateway_info\" : {" + EOL
-        + "      \"network_id\" : \"networkid\"" + EOL
-        + "    }," + EOL
-        + "    \"tenant_id\" : \"tenantid\"" + EOL
-        + "  } ]" + EOL
-        + "}";
+    private static final String JSON_FULL = "{" + EOL + "  \"routers\" : [ {" + EOL + "    \"status\" : \"status\","
+            + EOL + "    \"name\" : \"name\"," + EOL + "    \"admin_state_up\" : \"admin_state_up\"," + EOL
+            + "    \"id\" : \"id\"," + EOL + "    \"routes\" : [ {" + EOL + "      \"destination\" : \"destination\","
+            + EOL + "      \"nexthop\" : \"nexthop\"" + EOL + "    }, {" + EOL
+            + "      \"destination\" : \"destination\"," + EOL + "      \"nexthop\" : \"nexthop\"" + EOL + "    } ],"
+            + EOL + "    \"external_gateway_info\" : {" + EOL + "      \"network_id\" : \"networkid\"" + EOL + "    },"
+            + EOL + "    \"tenant_id\" : \"tenantid\"" + EOL + "  }, {" + EOL + "    \"status\" : \"status\"," + EOL
+            + "    \"name\" : \"name\"," + EOL + "    \"admin_state_up\" : \"admin_state_up\"," + EOL
+            + "    \"id\" : \"id\"," + EOL + "    \"routes\" : [ {" + EOL + "      \"destination\" : \"destination\","
+            + EOL + "      \"nexthop\" : \"nexthop\"" + EOL + "    }, {" + EOL
+            + "      \"destination\" : \"destination\"," + EOL + "      \"nexthop\" : \"nexthop\"" + EOL + "    } ],"
+            + EOL + "    \"external_gateway_info\" : {" + EOL + "      \"network_id\" : \"networkid\"" + EOL + "    },"
+            + EOL + "    \"tenant_id\" : \"tenantid\"" + EOL + "  } ]" + EOL + "}";
 
-    private ObjectMapper objectMapper = new ObjectMapper()
-        .setSerializationInclusion(Include.NON_NULL)
-        .enable(SerializationFeature.INDENT_OUTPUT)
-        .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(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @Test
     public void testSerialization() throws Exception {
@@ -92,14 +66,15 @@ public class RoutersTest {
     public void testMethods() throws Exception {
         Routers routers = objectMapper.readValue(JSON_FULL, Routers.class);
         routers.toString();
-        
+
         List<Router> list = routers.getList();
         Assert.assertNotNull(list);
         Assert.assertEquals(2, list.size());
         routers.setList(list);
-        
+
         int cnt = 0;
-        for (@SuppressWarnings("unused") Router x : routers) {
+        for (@SuppressWarnings("unused")
+        Router x : routers) {
             ++cnt;
         }
         Assert.assertEquals(2, cnt);