remove usage of deprecated JaxbTestHelper utility in all tests

Change-Id: Ieac043116404be980c726a0f185375afd66ca010
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/JaxbTestHelper.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/JaxbTestHelper.java
index e05090c2c34544c03044f301afc45f713a4723cf..d4a2b23aaf8e8f4b9ac5c5dbcd60ef5a188b19ab 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/JaxbTestHelper.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/JaxbTestHelper.java
@@ -25,11 +25,6 @@ public final class JaxbTestHelper {
     private JaxbTestHelper() {
     }
 
-    @Deprecated
-    public static Object jaxbUnmarshall(Object schemaObject, String json) throws JAXBException {
-        return jaxbUnmarshall(schemaObject.getClass(), json);
-    }
-
     public static <T> T jaxbUnmarshall(Class<T> schemaClass, String json) throws JAXBException {
         Map<String, String> namespacePrefixMapper = new HashMap<>(3);
         namespacePrefixMapper.put("router", "router");

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFirewallJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFirewallJAXBTest.java
index e6844ae71a6e4efb57454a4049289aa8e4210268..f42fbadd17983f5d129acce6b3f8301ab3380c7b 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFirewallJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFirewallJAXBTest.java
@@ -21,9 +21,7 @@ public class NeutronFirewallJAXBTest {
 
     @Test
     public void test_NeutronFirewall_JAXB() throws JAXBException {
-        NeutronFirewall dummyObject = new NeutronFirewall();
-
-        NeutronFirewall testObject = (NeutronFirewall) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronFirewall testObject = JaxbTestHelper.jaxbUnmarshall(NeutronFirewall.class,
                 NEUTRON_FIREWALL_SOURCE_JSON);
         Assert.assertEquals("NeutronFirewall JAXB Test 1: Testing id failed",
                 "d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getID());
@@ -51,9 +49,7 @@ public class NeutronFirewallJAXBTest {
 
     @Test
     public void test_NeutronFirewallPolicy_JAXB() throws JAXBException {
-        NeutronFirewallPolicy dummyObject = new NeutronFirewallPolicy();
-
-        NeutronFirewallPolicy testObject = (NeutronFirewallPolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronFirewallPolicy testObject = JaxbTestHelper.jaxbUnmarshall(NeutronFirewallPolicy.class,
                 NEUTRON_FIREWALL_POLICY_SOURCE_JSON);
         Assert.assertEquals("NeutronFirewallPolicy JAXB Test 1: Testing id failed",
                 "d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getID());
@@ -81,9 +77,7 @@ public class NeutronFirewallJAXBTest {
 
     @Test
     public void test_NeutronFirewallRule_JAXB() throws JAXBException {
-        NeutronFirewallRule dummyObject = new NeutronFirewallRule();
-
-        NeutronFirewallRule testObject = (NeutronFirewallRule) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronFirewallRule testObject = JaxbTestHelper.jaxbUnmarshall(NeutronFirewallRule.class,
                 NEUTRON_FIREWALL_RULE_SOURCE_JSON);
         Assert.assertEquals("NeutronFirewallRule JAXB Test 1: Testing id failed",
                 "8722e0e0-9cc9-4490-9660-8c9a5732fbb0", testObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFloatingIpJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFloatingIpJAXBTest.java
index f5593c7c627526a2c3e4b4eae452409678c60457..952f19a016936fc06663171d8bcd646307c29613 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFloatingIpJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFloatingIpJAXBTest.java
@@ -24,9 +24,7 @@ public class NeutronFloatingIpJAXBTest {
 
     @Test
     public void test_NeutronFloatingIp_JAXB() throws JAXBException {
-        NeutronFloatingIp dummyObject = new NeutronFloatingIp();
-
-        NeutronFloatingIp testObject = (NeutronFloatingIp) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronFloatingIp testObject = JaxbTestHelper.jaxbUnmarshall(NeutronFloatingIp.class,
                 NEUTRON_FLOATING_IP_SOURCE_JSON);
         Assert.assertEquals("NeutronFloatingIp JAXB Test 1: Testing id failed",
                 "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronIdJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronIdJAXBTest.java
index 17df660f2deefd89a62f422389cb3c8f9f69e09e..187bdf9c5ceba66cc18a1077b2f77531dc1ba641 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronIdJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronIdJAXBTest.java
@@ -19,8 +19,7 @@ public class NeutronIdJAXBTest {
 
     @Test
     public void test_NeutronID_JAXB() throws JAXBException {
-        NeutronID neutronObject = new NeutronID();
-        NeutronID testObject = (NeutronID) JaxbTestHelper.jaxbUnmarshall(neutronObject, NEUTRON_ID_SOURCE_JSON);
+        NeutronID testObject = JaxbTestHelper.jaxbUnmarshall(NeutronID.class, NEUTRON_ID_SOURCE_JSON);
 
         Assert.assertEquals("NeutronID JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                     testObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronIpsJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronIpsJAXBTest.java
index 79719d5f3c0d73b592e938e7f15c648773ac5081..f6c3f7f3bdcb8f089ed95d134ba1baa4a5fc85ab 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronIpsJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronIpsJAXBTest.java
@@ -19,8 +19,7 @@ public class NeutronIpsJAXBTest {
 
     @Test
     public void test_NeutronIps_JAXB() throws JAXBException {
-        NeutronIps neutronObject = new NeutronIps();
-        NeutronIps testObject = (NeutronIps) JaxbTestHelper.jaxbUnmarshall(neutronObject, NEUTRON_IPS_SOURCE_JSON);
+        NeutronIps testObject = JaxbTestHelper.jaxbUnmarshall(NeutronIps.class, NEUTRON_IPS_SOURCE_JSON);
 
         Assert.assertEquals("NeutronIps JAXB Test 1: Testing ip_address failed", "192.168.111.3",
                     testObject.getIpAddress());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitorJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitorJAXBTest.java
index 80f17f2594895ef3b613c6f4c0862ed3cd78fc43..1bd842975aff1f5f84b9b1febc84806a263c518d 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitorJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitorJAXBTest.java
@@ -24,10 +24,8 @@ public class NeutronLoadBalancerHealthMonitorJAXBTest {
 
     @Test
     public void test_NeutronLoadBalancerHealthMonitor_JAXB() throws JAXBException {
-        NeutronLoadBalancerHealthMonitor dummyObject = new NeutronLoadBalancerHealthMonitor();
-
-        NeutronLoadBalancerHealthMonitor testObject = (NeutronLoadBalancerHealthMonitor) JaxbTestHelper
-                .jaxbUnmarshall(dummyObject, NEUTRON_LOAD_BALANCER_HEALTH_MONITOR_SOURCE_JSON);
+        NeutronLoadBalancerHealthMonitor testObject = JaxbTestHelper.jaxbUnmarshall(
+                NeutronLoadBalancerHealthMonitor.class, NEUTRON_LOAD_BALANCER_HEALTH_MONITOR_SOURCE_JSON);
         Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 1: Testing id failed",
                 "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID());
 

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerJAXBTest.java
index d708aa28c6f757a30e6eb25789324b3612df832b..ebb537ea35fe19e08b03b78acfcb99a417d86327 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerJAXBTest.java
@@ -23,9 +23,7 @@ public class NeutronLoadBalancerJAXBTest {
 
     @Test
     public void test_NeutronLoadBalancer_JAXB() throws JAXBException {
-        NeutronLoadBalancer dummyObject = new NeutronLoadBalancer();
-
-        NeutronLoadBalancer testObject = (NeutronLoadBalancer) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronLoadBalancer testObject = JaxbTestHelper.jaxbUnmarshall(NeutronLoadBalancer.class,
                 NEUTRON_LOAD_BALANCER_SOURCE_JSON);
         Assert.assertEquals("NeutronLoadBalancer JAXB Test 1: Testing id failed",
                 "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.uuid);

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java
index 1cc25a7b7b743a61e86957e9b340441339e5a9ff..6a8cdda3ed32c58833aee95a7d460ac327c176db 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java
@@ -31,10 +31,8 @@ public class NeutronLoadBalancerListenerJAXBTest {
 
     @Test
     public void test_NeutronLoadBalancerListener_JAXB() throws JAXBException {
-        NeutronLoadBalancerListener dummyObject = new NeutronLoadBalancerListener();
-
-        NeutronLoadBalancerListener testObject = (NeutronLoadBalancerListener) JaxbTestHelper
-                .jaxbUnmarshall(dummyObject, NEUTRON_LOAD_BALANCER_LISTENER_SOURCE_JSON);
+        NeutronLoadBalancerListener testObject = JaxbTestHelper
+                .jaxbUnmarshall(NeutronLoadBalancerListener.class, NEUTRON_LOAD_BALANCER_LISTENER_SOURCE_JSON);
         Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 1: Testing id failed",
                 "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID());
 

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java
index 4f987630e3c83730c90ec5435b695a96ebadf141..19733d94b70f3426f61bb61f7d861da7714f03fc 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java
@@ -25,9 +25,7 @@ public class NeutronLoadBalancerPoolJAXBTest {
 
     @Test
     public void test_NeutronLoadBalancerPool_JAXB()  throws JAXBException {
-        NeutronLoadBalancerPool dummyObject = new NeutronLoadBalancerPool();
-
-        NeutronLoadBalancerPool testObject = (NeutronLoadBalancerPool) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronLoadBalancerPool testObject = JaxbTestHelper.jaxbUnmarshall(NeutronLoadBalancerPool.class,
                 NEUTRON_LOAD_BALANCER_POOL_SOURCE_JSON);
         Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 1: Testing id failed",
                 "12ff63af-4127-4074-a251-bcb2ecc53ebe", testObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMemberJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMemberJAXBTest.java
index 495aa469f38ba25936884fbf3bcf7ab526d87b71..6af121c5fadb755011534566d137c4213047e063 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMemberJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMemberJAXBTest.java
@@ -22,10 +22,8 @@ public class NeutronLoadBalancerPoolMemberJAXBTest {
 
     @Test
     public void test_NeutronLoadBalancerPoolMember_JAXB()  throws JAXBException {
-        NeutronLoadBalancerPoolMember dummyObject = new NeutronLoadBalancerPoolMember();
-
-        NeutronLoadBalancerPoolMember testObject = (NeutronLoadBalancerPoolMember) JaxbTestHelper
-                .jaxbUnmarshall(dummyObject, NEUTRON_LOAD_BALANCER_POOL_MEMBER_SOURCE_JSON);
+        NeutronLoadBalancerPoolMember testObject = JaxbTestHelper
+                .jaxbUnmarshall(NeutronLoadBalancerPoolMember.class, NEUTRON_LOAD_BALANCER_POOL_MEMBER_SOURCE_JSON);
         Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 1: Testing id failed",
                 "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID());
 

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerSessionPersistenceJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerSessionPersistenceJAXBTest.java
index c8ca63c4b44038357a4bc87ade3f85236f7928f5..35324834b1deef072e0eda83d692e6337b75b781 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerSessionPersistenceJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerSessionPersistenceJAXBTest.java
@@ -19,10 +19,8 @@ public class NeutronLoadBalancerSessionPersistenceJAXBTest {
 
     @Test
     public void test_NeutronLoadBalancerSessionPersistence_JAXB() throws JAXBException {
-        NeutronLoadBalancerSessionPersistence dummyObject = new NeutronLoadBalancerSessionPersistence();
-
-        NeutronLoadBalancerSessionPersistence testObject = (NeutronLoadBalancerSessionPersistence) JaxbTestHelper
-                .jaxbUnmarshall(dummyObject, NEUTRON_LOAD_BALANCER_SESSION_PERSISTENCE_SOURCE_JSON);
+        NeutronLoadBalancerSessionPersistence testObject = JaxbTestHelper.jaxbUnmarshall(
+                NeutronLoadBalancerSessionPersistence.class, NEUTRON_LOAD_BALANCER_SESSION_PERSISTENCE_SOURCE_JSON);
         Assert.assertEquals("NeutronLoadBalancer JAXB Test 1: Testing id failed",
                 "NeutronLoadBalancerSessionPersistence_Cookie", testObject.getCookieName());
 

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelJAXBTest.java
index a3acab57c0ce892740eb1d4f43c13353b1554ade..7597f288beac4431e4852ba24721c735d08fda61 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelJAXBTest.java
@@ -21,9 +21,7 @@ public class NeutronMeteringLabelJAXBTest {
 
     @Test
     public void test_NeutronMeteringLabel_JAXB()  throws JAXBException {
-        NeutronMeteringLabel meteringObject = new NeutronMeteringLabel();
-
-        NeutronMeteringLabel testObject = (NeutronMeteringLabel) JaxbTestHelper.jaxbUnmarshall(meteringObject,
+        NeutronMeteringLabel testObject = JaxbTestHelper.jaxbUnmarshall(NeutronMeteringLabel.class,
                 NEUTRON_METERING_LABEL_SOURCE_JSON);
         Assert.assertEquals("NeutronMeteringLabel JAXB Test 1: Testing id failed",
                 "4e8e5957-649f-477b-9e5b-f1f75b21c03c", testObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRuleJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRuleJAXBTest.java
index 83666f1273aa258c9d90f89945c3d2e154774f24..d51e99ddc146c6e051398d1878386745357cf10a 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRuleJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRuleJAXBTest.java
@@ -21,10 +21,8 @@ public class NeutronMeteringLabelRuleJAXBTest {
 
     @Test
     public void test_NeutronMeteringLabelRule_JAXB()  throws JAXBException {
-        NeutronMeteringLabelRule meteringObject = new NeutronMeteringLabelRule();
-
-        NeutronMeteringLabelRule testObject = (NeutronMeteringLabelRule) JaxbTestHelper
-                .jaxbUnmarshall(meteringObject, NEUTRON_METERING_LABEL_RULE_SOURCE_JSON);
+        NeutronMeteringLabelRule testObject = JaxbTestHelper
+                .jaxbUnmarshall(NeutronMeteringLabelRule.class, NEUTRON_METERING_LABEL_RULE_SOURCE_JSON);
         Assert.assertEquals("NeutronMeteringLabelRule JAXB Test 1: Testing metering_label_id failed",
                 "e131d186-b02d-4c0b-83d5-0c0725c4f812", testObject.getMeteringLabelRuleLabelID());
 

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java
index 9dae347c853113e51dfac51ab2ba9a658bfa3521..af4cb599831d0e50680050563c48e73bb7efd37d 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java
@@ -25,9 +25,7 @@ public class NeutronNetworkJAXBTest {
 
     @Test
     public void test_NeutronNetwork_SingleProvider_JAXB()  throws JAXBException {
-        NeutronNetwork dummyObject = new NeutronNetwork();
-
-        NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronNetwork testObject = JaxbTestHelper.jaxbUnmarshall(NeutronNetwork.class,
                 NEUTRON_NETWORK_SINGLE_PROVIDER_SOURCE_JSON);
         Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                 testObject.getID());
@@ -69,9 +67,7 @@ public class NeutronNetworkJAXBTest {
 
     @Test
     public void test_NeutronNetwork_MultipleProvider_JAXB()  throws JAXBException {
-        NeutronNetwork dummyObject = new NeutronNetwork();
-
-        NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronNetwork testObject = JaxbTestHelper.jaxbUnmarshall(NeutronNetwork.class,
                 NEUTRON_NETWORK_MULTIPLE_PROVIDER_SOURCE_JSON);
         Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                 testObject.getID());
@@ -123,9 +119,7 @@ public class NeutronNetworkJAXBTest {
 
     @Test
     public void test_NeutronNetwork_L3_HA_JAXB()  throws JAXBException {
-        NeutronNetwork dummyObject = new NeutronNetwork();
-
-        NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronNetwork testObject = JaxbTestHelper.jaxbUnmarshall(NeutronNetwork.class,
                 NEUTRON_NETWORK_L3_HA_SOURCE_JSON);
         Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "d3a2beea-c6ca-4e76-ba7d-e947c5df0c0e",
                 testObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkQosJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkQosJAXBTest.java
index a8af020e6d94325a2364216d89e37a6fd99fdbd0..284bf0fa467c3490dd528a6b7ae76d65d56b57e3 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkQosJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkQosJAXBTest.java
@@ -24,9 +24,7 @@ public class NeutronNetworkQosJAXBTest {
 
     @Test
     public void test_NeutronNetworkQos_JAXB() throws JAXBException {
-        NeutronNetwork dummyObject = new NeutronNetwork();
-
-        NeutronNetwork testObject = (NeutronNetwork) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronNetwork testObject = JaxbTestHelper.jaxbUnmarshall(NeutronNetwork.class,
                 NEUTRON_NETWORK_QOS_ENABLED_SOURCE_JSON);
         Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                 testObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkSegmentJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkSegmentJAXBTest.java
index 5daed66aacfa1c094482170af77bbb5615bf0116..8f4d64910e8e3aba2507822ef7a038da0bf243e4 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkSegmentJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkSegmentJAXBTest.java
@@ -19,9 +19,7 @@ public class NeutronNetworkSegmentJAXBTest {
 
     @Test
     public void test_NeutronNetworkSegment_JAXB()  throws JAXBException {
-        NeutronNetworkSegment segmentObject = new NeutronNetworkSegment();
-
-        NeutronNetworkSegment testObject = (NeutronNetworkSegment) JaxbTestHelper.jaxbUnmarshall(segmentObject,
+        NeutronNetworkSegment testObject = JaxbTestHelper.jaxbUnmarshall(NeutronNetworkSegment.class,
                 NEUTRON_NETWORK_SEGMENT_SOURCE_JSON);
 
         Assert.assertEquals("NeutronNetworkSegment JAXB Test 1: Testing provider:network_type failed", "vlan",

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortAllowedAddressPairsJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortAllowedAddressPairsJAXBTest.java
index 9656acc3ebeeeb33fcb62c34803163576a1dff1f..9b829c618d4cc894dcc4ae3ce492e8a4f771a4cd 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortAllowedAddressPairsJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortAllowedAddressPairsJAXBTest.java
@@ -19,10 +19,8 @@ public class NeutronPortAllowedAddressPairsJAXBTest {
 
     @Test
     public void test_NeutronPortAllowedAddressPairs_JAXB()  throws JAXBException {
-        NeutronPortAllowedAddressPairs portObject = new NeutronPortAllowedAddressPairs();
-
-        NeutronPortAllowedAddressPairs testObject = (NeutronPortAllowedAddressPairs) JaxbTestHelper
-                .jaxbUnmarshall(portObject, NEUTRON_PORT_ALLOWED_ADDRESS_PAIRS_SOURCE_JSON);
+        NeutronPortAllowedAddressPairs testObject = JaxbTestHelper
+                .jaxbUnmarshall(NeutronPortAllowedAddressPairs.class, NEUTRON_PORT_ALLOWED_ADDRESS_PAIRS_SOURCE_JSON);
         Assert.assertEquals("NeutronPort Allowed Address Pairs JAXB Test 1: Testing ip_address failed",
                 "192.168.199.1", testObject.getIpAddress());
 

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortExtraDHCPOptionJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortExtraDHCPOptionJAXBTest.java
index 0f7412f9cc5bd1bddbfda0e2e24dda2692f96c3a..7544560bd9bef52246a3f620f2ae6ca4e124ab16 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortExtraDHCPOptionJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortExtraDHCPOptionJAXBTest.java
@@ -27,10 +27,7 @@ public class NeutronPortExtraDHCPOptionJAXBTest {
 
     @Test
     public void test_NeutronPortExtraDHCPOption_JAXB() throws JAXBException {
-        NeutronPortExtraDHCPOption portObject = new NeutronPortExtraDHCPOption();
-        NeutronPortExtraDHCPOption testObject;
-
-        testObject = (NeutronPortExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject,
+        NeutronPortExtraDHCPOption testObject = JaxbTestHelper.jaxbUnmarshall(NeutronPortExtraDHCPOption.class,
                 NEUTRON_PORT_EXTRA_DHCP_OPTION_SOURCE_JSON);
 
         Assert.assertEquals("NeutronPortExtraDHCPOption JAXB Test 1: Testing opt_value failed", "123.123.123.456",
@@ -43,10 +40,7 @@ public class NeutronPortExtraDHCPOptionJAXBTest {
 
     @Test
     public void test_NeutronPortExtraDHCPOption_IPv4_JAXB() throws JAXBException {
-        NeutronPortExtraDHCPOption portObject = new NeutronPortExtraDHCPOption();
-        NeutronPortExtraDHCPOption testObject;
-
-        testObject = (NeutronPortExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject,
+        NeutronPortExtraDHCPOption testObject = JaxbTestHelper.jaxbUnmarshall(NeutronPortExtraDHCPOption.class,
                 NEUTRON_PORT_EXTRA_DHCP_OPTION_IPV4_SOURCE_JSON);
 
         Assert.assertEquals("NeutronPortExtraDHCPOption_IPv4 JAXB Test 1: Testing opt_value failed", "123.123.123.456",
@@ -59,11 +53,8 @@ public class NeutronPortExtraDHCPOptionJAXBTest {
 
     @Test
     public void test_NeutronPortExtraDHCPOption_IPv6_JAXB() throws JAXBException {
-        NeutronPortExtraDHCPOption portObject = new NeutronPortExtraDHCPOption();
-        NeutronPortExtraDHCPOption testObject;
-
-        testObject = (NeutronPortExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject,
-                NEUTRON_PORT_EXTRA_DHCP_OPTION_IPV6_SOURCE_JSON);
+        NeutronPortExtraDHCPOption testObject = JaxbTestHelper
+                .jaxbUnmarshall(NeutronPortExtraDHCPOption.class, NEUTRON_PORT_EXTRA_DHCP_OPTION_IPV6_SOURCE_JSON);
 
         Assert.assertEquals("NeutronPortExtraDHCPOption_IPv6 JAXB Test 1: Testing opt_value failed",
                 "::ffff:123.123.123.456", testObject.getValue());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java
index 4ada90bd2d6367ab7ac0b61eaaa08e08ec0140cc..244606c4c2c33cb3c0c7c3616fd22b90d5aeca8d 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java
@@ -30,9 +30,7 @@ public class NeutronPortJAXBTest {
 
     @Test
     public void test_NeutronPort_JAXB() throws JAXBException {
-        NeutronPort testObject = new NeutronPort();
-
-        NeutronPort neutronObject = (NeutronPort) JaxbTestHelper.jaxbUnmarshall(testObject, NEUTRON_PORT_SOURCE_JSON);
+        NeutronPort neutronObject = JaxbTestHelper.jaxbUnmarshall(NeutronPort.class, NEUTRON_PORT_SOURCE_JSON);
         Assert.assertEquals("NeutronPort JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                 neutronObject.getID());
 

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortQosJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortQosJAXBTest.java
index cbc12a43b366fcf8975465fd5268a5983771b4e0..5ac31a64a020242afa1e0f94b18d615763d913fc 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortQosJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortQosJAXBTest.java
@@ -32,9 +32,7 @@ public class NeutronPortQosJAXBTest {
 
     @Test
     public void test_PortQosEnabled_JAXB() throws JAXBException {
-        NeutronPort testObject = new NeutronPort();
-
-        NeutronPort neutronObject = (NeutronPort) JaxbTestHelper.jaxbUnmarshall(testObject,
+        NeutronPort neutronObject = JaxbTestHelper.jaxbUnmarshall(NeutronPort.class,
                 NEUTRON_PORT_QOS_ENABLED_SOURCE_JSON);
         Assert.assertEquals("NeutronPort JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                 neutronObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortSecurityJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortSecurityJAXBTest.java
index 3a93cc9f296993cefbfc2d5ec8cca9faa436e00e..76afc5f0ced5262a2e2842ee6afaa89cb6bbf8e5 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortSecurityJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortSecurityJAXBTest.java
@@ -78,9 +78,7 @@ public class NeutronPortSecurityJAXBTest {
     }
 
     private void test_PortSecurityEnabled_JAXB(String sourceJson, Boolean portSecurityEnabled) throws JAXBException {
-        NeutronPort testObject = new NeutronPort();
-
-        NeutronPort neutronObject = (NeutronPort) JaxbTestHelper.jaxbUnmarshall(testObject, sourceJson);
+        NeutronPort neutronObject = JaxbTestHelper.jaxbUnmarshall(NeutronPort.class, sourceJson);
         Assert.assertEquals("NeutronPort JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                 neutronObject.getID());
 

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronQosJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronQosJAXBTest.java
index 801cce182a22fbb68f91f15b696b51c9cb92d833..b6eb2644b98fca197445beb1174ba8eead9aba73 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronQosJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronQosJAXBTest.java
@@ -31,8 +31,7 @@ public class NeutronQosJAXBTest {
 
     @Test
     public void test_NeutronQosPolicy_JAXB() throws JAXBException {
-        NeutronQosPolicy testObject = new NeutronQosPolicy();
-        NeutronQosPolicy neutronObject = (NeutronQosPolicy) JaxbTestHelper.jaxbUnmarshall(testObject,
+        NeutronQosPolicy neutronObject = JaxbTestHelper.jaxbUnmarshall(NeutronQosPolicy.class,
                 NEUTRON_QOS_POLICY_SOURCE_JSON);
         Assert.assertEquals("NeutronQosPolicy JAXB Test 1: Testing id failed", "d6220bbb-35f3-48ab-8eae-69c60aef3546",
                 neutronObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterInterfaceJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterInterfaceJAXBTest.java
index 7367da0b230d578e48236fabba581f6729df0106..d8ce501ed3594af9de3a272f6e407c5ddb5fedff 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterInterfaceJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterInterfaceJAXBTest.java
@@ -20,9 +20,7 @@ public class NeutronRouterInterfaceJAXBTest {
 
     @Test
     public void test_NeutronRouterInterface_JAXB() throws JAXBException {
-        NeutronRouterInterface dummyObject = new NeutronRouterInterface();
-
-        NeutronRouterInterface testObject = (NeutronRouterInterface) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronRouterInterface testObject = JaxbTestHelper.jaxbUnmarshall(NeutronRouterInterface.class,
                 NEUTRON_ROUTER_INTERFACE_SOURCE_JSON);
 
         Assert.assertEquals("NeutronRouterInterface JAXB Test 1: Testing subnet_id failed",

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java
index 8de480576282fc20546940116503bbe022111f2a..da44f6efad89ee7a231631e364c83c50f0fe83c7 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java
@@ -24,9 +24,7 @@ public class NeutronRouterJAXBTest {
 
     @Test
     public void test_NeutronRouter_JAXB() throws JAXBException {
-        NeutronRouter dummyObject = new NeutronRouter();
-
-        NeutronRouter testObject = (NeutronRouter) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronRouter testObject = JaxbTestHelper.jaxbUnmarshall(NeutronRouter.class,
                 NEUTRON_ROUTER_SOURCE_JSON);
 
         NeutronRouterNetworkReference externalGatewayInfo = testObject.getExternalGatewayInfo();

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterNetworkReferenceJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterNetworkReferenceJAXBTest.java
index f64846ed92d550c238c045c767704ddf42267278..e7186a486d1785e768864989f66695fa9c0af000 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterNetworkReferenceJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterNetworkReferenceJAXBTest.java
@@ -23,10 +23,8 @@ public class NeutronRouterNetworkReferenceJAXBTest {
 
     @Test
     public void test_NeutronRouterNetworkReference_JAXB() throws JAXBException {
-        NeutronRouterNetworkReference dummyObject = new NeutronRouterNetworkReference();
-
-        NeutronRouterNetworkReference testObject = (NeutronRouterNetworkReference) JaxbTestHelper
-                .jaxbUnmarshall(dummyObject, NEUTRON_ROUTER_NETWORK_REFERENCE_SOURCE_JSON);
+        NeutronRouterNetworkReference testObject = JaxbTestHelper
+                .jaxbUnmarshall(NeutronRouterNetworkReference.class, NEUTRON_ROUTER_NETWORK_REFERENCE_SOURCE_JSON);
 
         List<NeutronIps> externalFixedIps = testObject.getExternalFixedIps();
 

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifierJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifierJAXBTest.java
index 24fed591b6fb6ccbf325c029680cf0bc7c217832..3bb5818ce400ada9fd7a4ea15fe0957c68c64b9a 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifierJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifierJAXBTest.java
@@ -29,8 +29,7 @@ public class NeutronSFCFlowClassifierJAXBTest {
 
     @Test
     public void test_NeutronSFCFlowClassifier_JAXB() throws JAXBException {
-        NeutronSFCFlowClassifier testObject = new NeutronSFCFlowClassifier();
-        NeutronSFCFlowClassifier neutronObject = (NeutronSFCFlowClassifier) JaxbTestHelper.jaxbUnmarshall(testObject,
+        NeutronSFCFlowClassifier neutronObject = JaxbTestHelper.jaxbUnmarshall(NeutronSFCFlowClassifier.class,
                 NEUTRON_SFC_FLOW_CLASSIFIER_SOURCE_JSON);
 
         Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 1: Testing id failed",

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortChainJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortChainJAXBTest.java
index ce65183d0dfacab7e48d3c953a9236691aa4f013..0daed5b3a3de8ba7e5449c80e617cd0959ded27d 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortChainJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortChainJAXBTest.java
@@ -27,8 +27,7 @@ public class NeutronSFCPortChainJAXBTest {
 
     @Test
     public void test_NeutronSFCPortChain_JAXB() throws JAXBException {
-        NeutronSFCPortChain testObject = new NeutronSFCPortChain();
-        NeutronSFCPortChain neutronObject = (NeutronSFCPortChain) JaxbTestHelper.jaxbUnmarshall(testObject,
+        NeutronSFCPortChain neutronObject = JaxbTestHelper.jaxbUnmarshall(NeutronSFCPortChain.class,
                 NEUTRON_SFC_PORT_CHAIN_SOURCE_JSON);
 
         Assert.assertEquals("NeutronSFCPortChain JAXB Test 1: Testing id failed",

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroupJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroupJAXBTest.java
index 897ca306bec5192b74f0c672bd539f85bfb10da9..658671dedfc69f454875f3c296d49649f4fa63d9 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroupJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroupJAXBTest.java
@@ -23,8 +23,7 @@ public class NeutronSFCPortPairGroupJAXBTest {
 
     @Test
     public void test_NeutronSFCPortPairGroup_JAXB() throws JAXBException {
-        NeutronSFCPortPairGroup testObject = new NeutronSFCPortPairGroup();
-        NeutronSFCPortPairGroup neutronObject = (NeutronSFCPortPairGroup) JaxbTestHelper.jaxbUnmarshall(testObject,
+        NeutronSFCPortPairGroup neutronObject = JaxbTestHelper.jaxbUnmarshall(NeutronSFCPortPairGroup.class,
                 NEUTRON_SFC_PORT_PAIR_GROUP_SOURCE_JSON);
 
         Assert.assertEquals("NeutronSFCPortPairGroup JAXB Test 1: Testing id failed",

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairJAXBTest.java
index 6071958db0617b2e0de9389041272bde29b48608..4fe4a337eba2dd7de7ef37ae1fd05a83a3756f95 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairJAXBTest.java
@@ -25,8 +25,7 @@ public class NeutronSFCPortPairJAXBTest {
 
     @Test
     public void test_NeutronSFCPortPair_JAXB() throws JAXBException {
-        NeutronSFCPortPair testObject = new NeutronSFCPortPair();
-        NeutronSFCPortPair neutronObject = (NeutronSFCPortPair) JaxbTestHelper.jaxbUnmarshall(testObject,
+        NeutronSFCPortPair neutronObject = JaxbTestHelper.jaxbUnmarshall(NeutronSFCPortPair.class,
                 NEUTRON_SFC_PORT_PAIR_SOURCE_JSON);
 
         Assert.assertEquals("NeutronSFCPortPair JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityGroupJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityGroupJAXBTest.java
index ac6679dfc167d334a44cee517d990af6322be245..02e333e56a945cd98df5b07f25438e3bc95d9d60 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityGroupJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityGroupJAXBTest.java
@@ -26,9 +26,7 @@ public class NeutronSecurityGroupJAXBTest {
 
     @Test
     public void test_NeutronSecurityGroup_JAXB() throws JAXBException {
-        NeutronSecurityGroup dummyObject = new NeutronSecurityGroup();
-
-        NeutronSecurityGroup testObject = (NeutronSecurityGroup) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronSecurityGroup testObject = JaxbTestHelper.jaxbUnmarshall(NeutronSecurityGroup.class,
                 NEUTRON_SECURITY_GROUP_SOURCE_JSON);
         Assert.assertEquals("NeutronSecurityGroup JAXB Test 1: Testing id failed",
                 "2076db17-a522-4506-91de-c6dd8e837028", testObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityRuleJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityRuleJAXBTest.java
index 263b2a1b6e5a371df14cb113688cdd3d04b5ef95..06b47c35748445a7fcea510e305d742d91867f36 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityRuleJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSecurityRuleJAXBTest.java
@@ -40,9 +40,7 @@ public class NeutronSecurityRuleJAXBTest {
 
     @Test
     public void test_NeutronSecurityRule_JAXB() throws JAXBException {
-        NeutronSecurityRule dummyObject = new NeutronSecurityRule();
-
-        NeutronSecurityRule testObject = (NeutronSecurityRule) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronSecurityRule testObject = JaxbTestHelper.jaxbUnmarshall(NeutronSecurityRule.class,
                 NEUTRON_SECURITY_RULE_SOURCE_JSON);
         Assert.assertEquals("NeutronSecurityRule JAXB Test 1: Testing id failed",
                 "2bc0accf-312e-429a-956e-e4407625eb62", testObject.getID());
@@ -77,8 +75,7 @@ public class NeutronSecurityRuleJAXBTest {
 
     @Test
     public void test_NeutronSecurityRuleProtocolNumber_JAXB() throws JAXBException {
-        NeutronSecurityRule dummyObject = new NeutronSecurityRule();
-        NeutronSecurityRule testObject = (NeutronSecurityRule) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronSecurityRule testObject = JaxbTestHelper.jaxbUnmarshall(NeutronSecurityRule.class,
                 NEUTRON_SECURITY_RULE_PROTOCOL_NUMBER_SOURCE_JSON);
         Assert.assertEquals("NeutronSecurityRuleProtocolNumber JAXB: Testing protocol failed", "6",
                 testObject.getSecurityRuleProtocol());
@@ -86,8 +83,7 @@ public class NeutronSecurityRuleJAXBTest {
 
     @Test
     public void test_NeutronSecurityRuleProtocolNumberString_JAXB() throws JAXBException {
-        NeutronSecurityRule dummyObject = new NeutronSecurityRule();
-        NeutronSecurityRule testObject = (NeutronSecurityRule) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronSecurityRule testObject = JaxbTestHelper.jaxbUnmarshall(NeutronSecurityRule.class,
                 NEUTRON_SECURITY_RULE_PROTOCOL_NUMBER_STRING_SOURCE_JSON);
         Assert.assertEquals("NeutronSecurityRuleProtocolNumberString JAXB: Testing protocol failed", "6",
                 testObject.getSecurityRuleProtocol());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSubnetJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSubnetJAXBTest.java
index b0da2d13d7163a489b4c536741c7c7b2792a532b..94b80e9f51758127ff4d6d2997135a5038d6b51e 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSubnetJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSubnetJAXBTest.java
@@ -39,9 +39,7 @@ public class NeutronSubnetJAXBTest {
 
     @Test
     public void test_NeutronSubnet_JAXB() throws JAXBException {
-        NeutronSubnet dummyObject = new NeutronSubnet();
-
-        NeutronSubnet testObject = (NeutronSubnet) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronSubnet testObject = JaxbTestHelper.jaxbUnmarshall(NeutronSubnet.class,
                 NEUTRON_SUBNET_ENABLED_SOURCE_JSON);
         Assert.assertEquals("NeutronSubnet JAXB Test 1: Testing id failed",
                             "dd4320eb-a56b-412b-ae83-fc5ac2a5e6f6", testObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapFlowJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapFlowJAXBTest.java
index 6002ebf9bd1ce8ed5c34f9500ff8a17c9c37253d..f19d38b19e779501bab6806fac39385e5e1e1679 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapFlowJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapFlowJAXBTest.java
@@ -24,8 +24,7 @@ public class NeutronTapFlowJAXBTest {
 
     @Test
     public void test_NeutronTapFlow_JAXB() throws JAXBException {
-        NeutronTapFlow testObject = new NeutronTapFlow();
-        NeutronTapFlow neutronObject = (NeutronTapFlow) JaxbTestHelper.jaxbUnmarshall(testObject,
+        NeutronTapFlow neutronObject = JaxbTestHelper.jaxbUnmarshall(NeutronTapFlow.class,
                 NEUTRON_TAP_FLOW_SOURCE_JSON);
         Assert.assertEquals("NeutronTapFlow JAXB Test 1: Testing id failed", "f6220bbb-35f3-48ab-8eae-69c60aef3546",
                 neutronObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapServiceJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapServiceJAXBTest.java
index c0709e9dee999ddceb7391f7dfaab11ff0c53c37..992ca7583bcc8c9158a19a3dffb5b7eba4672422 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapServiceJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapServiceJAXBTest.java
@@ -22,8 +22,7 @@ public class NeutronTapServiceJAXBTest {
 
     @Test
     public void test_NeutronTapService_JAXB() throws JAXBException {
-        NeutronTapService testObject = new NeutronTapService();
-        NeutronTapService neutronObject = (NeutronTapService) JaxbTestHelper.jaxbUnmarshall(testObject,
+        NeutronTapService neutronObject = JaxbTestHelper.jaxbUnmarshall(NeutronTapService.class,
                 NEUTRON_TAP_SERVICE_SOURCE_JSON);
         Assert.assertEquals("NeutronTapService JAXB Test 1: Testing id failed", "b6440bbb-35f3-48ab-8eae-69c60aef3546",
                 neutronObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTrunkJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTrunkJAXBTest.java
index 8715b854186e9cff386c0656b22aa68c1ffa8480..20b2988e7a5e244cb7bbdcdbb2c759d45d83fee1 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTrunkJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTrunkJAXBTest.java
@@ -25,8 +25,7 @@ public class NeutronTrunkJAXBTest {
 
     @Test
     public void test_NeutronTrunk_JAXB() throws JAXBException {
-        NeutronTrunk testObject = new NeutronTrunk();
-        NeutronTrunk neutronObject = (NeutronTrunk) JaxbTestHelper.jaxbUnmarshall(testObject,
+        NeutronTrunk neutronObject = JaxbTestHelper.jaxbUnmarshall(NeutronTrunk.class,
                 NEUTRON_TRUNK_SOURCE_JSON);
         Assert.assertEquals("NeutronTrunk JAXB Test 1: Testing id failed", "c935240e-4aa6-496a-841c-d113c54499b9",
                 neutronObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnDeadPeerDetectionJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnDeadPeerDetectionJAXBTest.java
index f6c15b2893deabe11db50b7ac1ac90f8acb2c0cb..e8b236a2873704339fae2e1048ace3ead39da763 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnDeadPeerDetectionJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnDeadPeerDetectionJAXBTest.java
@@ -19,10 +19,8 @@ public class NeutronVpnDeadPeerDetectionJAXBTest {
 
     @Test
     public void test_NeutronVPNDeadPeerDetection_JAXB() throws JAXBException {
-        NeutronVpnDeadPeerDetection dummyObject = new NeutronVpnDeadPeerDetection();
-
-        NeutronVpnDeadPeerDetection testObject = (NeutronVpnDeadPeerDetection) JaxbTestHelper
-                .jaxbUnmarshall(dummyObject, NEUTRON_VPN_DEAD_PEER_DETECTION_SOURCE_JSON);
+        NeutronVpnDeadPeerDetection testObject = JaxbTestHelper
+                .jaxbUnmarshall(NeutronVpnDeadPeerDetection.class, NEUTRON_VPN_DEAD_PEER_DETECTION_SOURCE_JSON);
         Assert.assertEquals("NeutronVpnDeadPeerDetection JAXB Test 1: Testing action failed", "hold",
                 testObject.getAction());
 

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIkePolicyJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIkePolicyJAXBTest.java
index ca8805544c7a429ced8922567caba4aa04a9380d..9b73cf3240faa90ad5e9c92db113c93242d44e4e 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIkePolicyJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIkePolicyJAXBTest.java
@@ -23,9 +23,7 @@ public class NeutronVpnIkePolicyJAXBTest {
 
     @Test
     public void test_NeutronVpnIkePolicy_JAXB() throws JAXBException {
-        NeutronVpnIkePolicy dummyObject = new NeutronVpnIkePolicy();
-
-        NeutronVpnIkePolicy testObject = (NeutronVpnIkePolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronVpnIkePolicy testObject = JaxbTestHelper.jaxbUnmarshall(NeutronVpnIkePolicy.class,
                 NEUTRON_VPN_IKE_POLICY_SOURCE_JSON);
         Assert.assertEquals("NeutronVpnIkePolicy JAXB Test 1: Testing id failed",
                 "5522aff7-1b3c-48dd-9c3c-b50f016b73db", testObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecPolicyJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecPolicyJAXBTest.java
index e72ae9e3913597054fe4f5a5728aced660d9279d..1d9bf6081f53d91876c993050b5be0b3b002c360 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecPolicyJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecPolicyJAXBTest.java
@@ -24,9 +24,7 @@ public class NeutronVpnIpSecPolicyJAXBTest {
 
     @Test
     public void test_NeutronVpnIPSecPolicy_JAXB() throws JAXBException {
-        NeutronVpnIpSecPolicy dummyObject = new NeutronVpnIpSecPolicy();
-
-        NeutronVpnIpSecPolicy testObject = (NeutronVpnIpSecPolicy) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronVpnIpSecPolicy testObject = JaxbTestHelper.jaxbUnmarshall(NeutronVpnIpSecPolicy.class,
                 NEUTRON_VPN_IPSEC_POLICY_SINGLE_PROVIDER_SOURCE_JSON);
         Assert.assertEquals("NeutronVpnIpSecPolicy JAXB Test 1: Testing id failed",
                 "5291b189-fd84-46e5-84bd-78f40c05d69c", testObject.getID());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecSiteConnectionJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecSiteConnectionJAXBTest.java
index 318b211332296b1378b157ff8e991f541f047f83..c758d9efc7cd3661110aea5aa2ba0755450585bb 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecSiteConnectionJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecSiteConnectionJAXBTest.java
@@ -29,10 +29,8 @@ public class NeutronVpnIpSecSiteConnectionJAXBTest {
 
     @Test
     public void test_NeutronVpnIPSecSiteConnection_JAXB() throws JAXBException {
-        NeutronVpnIpSecSiteConnection dummyObject = new NeutronVpnIpSecSiteConnection();
-
-        NeutronVpnIpSecSiteConnection testObject = (NeutronVpnIpSecSiteConnection) JaxbTestHelper
-                .jaxbUnmarshall(dummyObject, NEUTRON_VPN_IPSEC_SITE_CONNECTION_SOURCE_JSON);
+        NeutronVpnIpSecSiteConnection testObject = JaxbTestHelper
+                .jaxbUnmarshall(NeutronVpnIpSecSiteConnection.class, NEUTRON_VPN_IPSEC_SITE_CONNECTION_SOURCE_JSON);
         Assert.assertEquals("NeutronVpnIpSecSiteConnection JAXB Test 1: Testing id failed",
                 "cbc152a0-7e93-4f98-9f04-b085a4bf2511", testObject.getID());
 

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnLifetimeJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnLifetimeJAXBTest.java
index 2e9217a51dcba196d8d7fd359875427b492bbe65..d16dcde2f7187dc67d8150b0680b85f65139a96b 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnLifetimeJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnLifetimeJAXBTest.java
@@ -19,9 +19,7 @@ public class NeutronVpnLifetimeJAXBTest {
 
     @Test
     public void test_NeutronVPNLifetime_JAXB() throws JAXBException {
-        NeutronVpnLifetime dummyObject = new NeutronVpnLifetime();
-
-        NeutronVpnLifetime testObject = (NeutronVpnLifetime) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronVpnLifetime testObject = JaxbTestHelper.jaxbUnmarshall(NeutronVpnLifetime.class,
                 NEUTRON_VPN_LIFETIME_TEST_SOURCE_JSON);
         Assert.assertEquals("NeutronVpnLifetime JAXB Test 1: Testing units failed", "seconds",
                 testObject.getUnits());

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnServiceJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnServiceJAXBTest.java
index 5780fc72647d6b2f30abe317972139f46a5347b4..5430103b1bc007f9eb52b7b590f71e5e5ec3a4da 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnServiceJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnServiceJAXBTest.java
@@ -23,9 +23,7 @@ public class NeutronVpnServiceJAXBTest {
 
     @Test
     public void test_NeutronVPNService_JAXB() throws JAXBException {
-        NeutronVpnService dummyObject = new NeutronVpnService();
-
-        NeutronVpnService testObject = (NeutronVpnService) JaxbTestHelper.jaxbUnmarshall(dummyObject,
+        NeutronVpnService testObject = JaxbTestHelper.jaxbUnmarshall(NeutronVpnService.class,
                 NEUTRON_VPN_SERVICE_SOURCE_JSON);
         Assert.assertEquals("NeutronVpnService JAXB Test 1: Testing router id failed",
                 "ec8619be-0ba8-4955-8835-3b49ddb76f89", testObject.getRouterUUID());