Checkstyle Import issues fix (SPI, Model)

Patch fixes Import order issues and also removes
the unused imports. Patch is for Integration tests,
spi and model

Change-Id: I5565cf9f83ba9bc3092ebaa8c40c8d3056821e72
Signed-off-by: Ritu Sood <ritu.sood@intel.com>

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java
index 2df318579a075235b2b229214aa6b60085899869..4eed4d375b3f8eeb89bac6a22faa0a919ead0936 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java
@@ -15,33 +15,28 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configure
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
-import static org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.io.BufferedReader;
-
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Map;
 import java.util.Set;
-
 import javax.inject.Inject;
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
-import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
-
 import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
+import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.cm.ConfigurationAdmin;
 

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronNetworkTests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronNetworkTests.java
index db00c50da5089d8e7a701aeee40b9de118fd5e89..3047288c6e9d6aebeef5777f9d8e81fe31d35e2e 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronNetworkTests.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronNetworkTests.java
@@ -8,11 +8,8 @@
 
 package org.opendaylight.neutron.e2etest;
 
-import java.lang.Thread;
-
 import java.net.HttpURLConnection;
 import java.net.URL;
-
 import org.junit.Assert;
 
 public class NeutronNetworkTests {

diff --git a/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/constants/rev150712/NeutronUtils.java b/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/constants/rev150712/NeutronUtils.java
index faedb3f6601e4139abd1dceb1ed8b9af18587f99..f416382b1da88f507b3055ac41e7202b490352a9 100644 (file)
--- a/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/constants/rev150712/NeutronUtils.java
+++ b/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/constants/rev150712/NeutronUtils.java
@@ -10,16 +10,6 @@ package org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev15071
 
 import com.google.common.collect.ImmutableBiMap;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.FwProtocolBase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.FwProtocolIcmp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.FwProtocolTcp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.FwProtocolUdp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.ProtocolBase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.ProtocolIcmp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.ProtocolIcmpV6;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.ProtocolTcp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.ProtocolUdp;
-
 
 public final class NeutronUtils {
     private NeutronUtils() {

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallCRUD.java
index 55792a8a6b169f2cc1d52394f064e2a2071f31c3..b3e91b7d1cc124de4a2bfeeea6b376395474caac 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 /**
  * This interface defines the methods for CRUD of NB OpenStack Firewall objects
  */

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyCRUD.java
index 98f415689cd5e75e8e4c7856e14e0c9f9896a6cc..c893ffbce2cf8ec87c32e98dfe89039c11bc7c4a 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallPolicyCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 /**
  * This interface defines the methods for CRUD of NB OpenStack Firewall Policy objects
  *

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleCRUD.java
index fa1d2980b29b8c8560f040b279392ab98b237034..a7aa525328a9bb277f9e855fd6769fa8231ab14c 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFirewallRuleCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 /**
  * This interface defines the methods for CRUD of NB OpenStack Firewall Rule objects
  *

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPCRUD.java
index fa97499c9ac9066cf707ea273340e413733a4b03..c330e5ebd52e6455d560377f7ca553de63c8e3da 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronFloatingIPCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 /**
  * This interface defines the methods for CRUD of NB FloatingIP objects
  *

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerCRUD.java
index 772de57531f00f526ed7c224db1ffb8cef0420fd..5a21db183d8cdf998e4537c8a63ff0842cac7537 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 /**
  * This interface defines the methods for CRUD of NB OpenStack LoadBalancer objects
  *

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorCRUD.java
index 0a4611aae72adf79d3c1b4e4e4efaed745e32389..a49bc2aaa45025b03c6b01f2b9783c2110c8b7a9 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerHealthMonitorCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 /**
  * This interface defines the methods for CRUD of NB OpenStack LoadBalancerHealthMonitor objects
  *

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerCRUD.java
index a49137106d8a6ccd8cfad5e6caa433391e7316c3..468100a30a2b258c9c51d887b788e533bc858928 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronLoadBalancerListenerCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 /**
  * This interface defines the methods for CRUD of NB OpenStack LoadBalancerListener objects
  *

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronMeteringLabelCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronMeteringLabelCRUD.java
index 4f85819dbb73a5bbc8e044bf28922eb96d26594d..3df1228af413525c7c03febc2a20ce2f40bc9fb1 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronMeteringLabelCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronMeteringLabelCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 public interface INeutronMeteringLabelCRUD
     extends INeutronCRUD<NeutronMeteringLabel> {
     // Nothing Here.

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronMeteringLabelRuleCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronMeteringLabelRuleCRUD.java
index cf98bcd5c6bc38d90260bae5e0472b87a993049d..26f67ae5d9330c7b2a1d36a1db348f787bd48532 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronMeteringLabelRuleCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronMeteringLabelRuleCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 public interface INeutronMeteringLabelRuleCRUD
     extends INeutronCRUD<NeutronMeteringLabelRule> {
     // Nothing Here.

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkCRUD.java
index 28a4e19507fc0eb89fd0ac00bc6b7d2b54e3f0a8..ec67ddd52cd5b14e49c7a1ce0a779a28cc888cc1 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronNetworkCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 /**
  * This interface defines the methods for CRUD of NB network objects
  *

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortCRUD.java
index d2901dd528d8b4e29bac4f9e22f8a03f0c6774e8..d8b17373565b3fcfeb3a870bc0f22958eb9e91cc 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronPortCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 /**
  * This interface defines the methods for CRUD of NB Port objects
  *

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterCRUD.java
index 6f884e9b2dd6a350685b8b4d52e5e7ee1b9d5a5f..799e24ffe1cdfcbc5983935a8b83e5c9a527915b 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronRouterCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 /**
  * This interface defines the methods for CRUD of NB Router objects
  *

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupCRUD.java
index 162ff5fc03f76cc353dda6afb836ec2e9c523c21..949efebd5eaf0b9029cfb05188346683a115b0b5 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityGroupCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 /**
  * This interface defines the methods for CRUD of NB OpenStack Security Group objects
  */

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleCRUD.java
index 8b1f656c8efa45707bbc8be99d3826929ce99922..3f275c9d99fa65eb88f5e645cf6fda4565dfcac5 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSecurityRuleCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 /**
  * This interface defines the methods for CRUD of NB OpenStack Security Rule objects
  */

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetCRUD.java
index 42fe96a11b06f53c51ecbaa0a838e6f75dae63de..ee628ed34ccc0104a30715d3a5e32e37de2f469b 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronSubnetCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 /**
  * This interface defines the methods for CRUD of NB Subnet objects
  *

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNIKEPolicyCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNIKEPolicyCRUD.java
index 6bfcf10b2f2754fd8e50dab862ed598265685bff..6a7322fc67cf752105e0d708d3bf334c1f09185f 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNIKEPolicyCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNIKEPolicyCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 public interface INeutronVPNIKEPolicyCRUD
     extends INeutronCRUD<NeutronVPNIKEPolicy> {
     // Nothing Here.

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNIPSECPolicyCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNIPSECPolicyCRUD.java
index ade1d3644d5683963ee823bc57f3320458a9c35f..78c48302e27d44f60666dbc861827c00c5cd4727 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNIPSECPolicyCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNIPSECPolicyCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 public interface INeutronVPNIPSECPolicyCRUD
     extends INeutronCRUD<NeutronVPNIPSECPolicy> {
     // Nothing Here.

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNIPSECSiteConnectionsCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNIPSECSiteConnectionsCRUD.java
index 108c4caf324c7e0c48f8155670a2b4e2fd537ed3..f987c5a716cc1b4e00b39bfd6adb9010829b61f6 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNIPSECSiteConnectionsCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNIPSECSiteConnectionsCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 public interface INeutronVPNIPSECSiteConnectionsCRUD
     extends INeutronCRUD<NeutronVPNIPSECSiteConnection> {
     // Nothing Here.

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNServiceCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNServiceCRUD.java
index 200a8636a679400b949e833d2e2f498d633c7e7d..e832d92d728f4dc1041ab150ce8f32bfa20bc708 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNServiceCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/INeutronVPNServiceCRUD.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.neutron.spi;
 
-import java.util.List;
-
 /**
  * This interface defines the methods for CRUD of NB VPNService objects
  *

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBgpvpn.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBgpvpn.java
index d759ed76e6243bfc488e5e160cc9fcd012168aab..854b464d2f79c37f8347b3ce9080b63cebf7ef6d 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBgpvpn.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBgpvpn.java
@@ -11,7 +11,6 @@ package org.opendaylight.neutron.spi;
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
index 73176e8ec782003b4d1bc09071d1e76bdaa5d67e..655b6950acc1a2d8dfe8da0a7e206a6f97ba6693 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
@@ -8,13 +8,13 @@
 
 package org.opendaylight.neutron.spi;
 
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * OpenStack Neutron v2.0 Firewall as a service

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java
index c41efa0929062623d32dada1d91069db65ddb71e..1af3de3ad3280793fc57eadb908e1fccf28b7a5a 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java
@@ -8,13 +8,13 @@
 
 package org.opendaylight.neutron.spi;
 
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * OpenStack Neutron v2.0 Firewall as a service

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
index 589dc8c2847595d6c43e6a44ddc36a113e35215f..e90467533bfe0842d41a03b46bb68e288379fee8 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
@@ -8,13 +8,13 @@
 
 package org.opendaylight.neutron.spi;
 
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * OpenStack Neutron v2.0 Firewall as a service

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIP.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIP.java
index 564ed35ed711d0839f3e0ca82dd8a833b9b7881c..1d7a849b6c149b0596466cd286e680f4aca4a94c 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIP.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIP.java
@@ -11,7 +11,6 @@ package org.opendaylight.neutron.spi;
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gateway.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gateway.java
index a4b266a294b175eafcfb634f4136d1d4fef35568..6770e06ed42cce69d3b758b684646c23085defc5 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gateway.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gateway.java
@@ -12,7 +12,6 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayConnection.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayConnection.java
index f98328c5f3a232c7d7320754e0f3d2a3ea4924c2..b79f98d511d645ebed9b34c0dda109c21d30a1de 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayConnection.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayConnection.java
@@ -11,7 +11,6 @@ package org.opendaylight.neutron.spi;
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java
index 96812db9f1116728f0002fec69351e987b982b97..166f10a740aed7b2c425788dc1603c18925d1aad 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java
@@ -10,7 +10,6 @@ package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlElement;
 
 public class NeutronL2gatewayDevice extends Neutron_ID implements Serializable {

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDeviceInterface.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDeviceInterface.java
index 2cb7ce2b73179258d928f3f0a5af5ffe1fdb5fd8..27998505f669f51c4132047a735da3bcf82675f3 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDeviceInterface.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDeviceInterface.java
@@ -10,7 +10,6 @@ package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlElement;
 
 public class NeutronL2gatewayDeviceInterface implements Serializable {

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java
index 0d61c4c22cb006527727cf72fcf97465d1cfe415..6b5629c2f0838b598dd483d6e719b9d5f25f37fe 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java
@@ -8,13 +8,13 @@
 
 package org.opendaylight.neutron.spi;
 
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * OpenStack Neutron v2.0 Load Balancer as a service

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java
index 93e4db1008f4620f4a5451d79b7e14c42217744d..974ca5a3f6b193ebdc77f035d7bee47141dfcf71 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java
@@ -8,13 +8,13 @@
 
 package org.opendaylight.neutron.spi;
 
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * OpenStack Neutron v2.0 Load Balancer as a service

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
index 39d22c490ca3dda41e176ea46f9c2732fba28964..ee3f417c92d62822e69daf08cb9e12ff2620832a 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
@@ -8,13 +8,13 @@
 
 package org.opendaylight.neutron.spi;
 
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * OpenStack Neutron v2.0 Load Balancer as a service

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
index 21c0dd5cbd03af9a98cb04c864fc913789d51968..5daec0aa8951f60dd674e6fbb758abff753f2045 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
@@ -8,13 +8,13 @@
 
 package org.opendaylight.neutron.spi;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * OpenStack Neutron v2.0 Load Balancer as a service

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java
index 01c8112e1bf3645c46f586b22847d4c0f51ca0b6..37e0ca3694af4ab20052256462ab01a742cc84f8 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java
@@ -8,14 +8,14 @@
 
 package org.opendaylight.neutron.spi;
 
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistence.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistence.java
index d542cd5e1ac8f05ccc6a94f985c64bcd96a6f239..cd7ea5ffc7d5e46c067628efd73f82bf467ed246 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistence.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistence.java
@@ -9,7 +9,6 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabel.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabel.java
index f98e949f5348115e134f9c7e09a950c6dfa0ee35..18e51f2306adc7b68254e6040461f01a72cb430e 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabel.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabel.java
@@ -9,10 +9,8 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import java.util.Iterator;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRule.java
index e7a491002d2f0be5c26e9bfe16620b3c31e05125..17ae8dc35eadc5632b072c441c85c5d20e74aa60 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRule.java
@@ -9,10 +9,8 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import java.util.Iterator;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
index 93b82f071c18ba5bc0777606cffccdfdb5fd153c..93f8c2c87c892f94e94792b68f02160f92a17375 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
@@ -11,7 +11,6 @@ package org.opendaylight.neutron.spi;
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork_Segment.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork_Segment.java
index 76696338be134787944c484b3e6cb6a1433e5bee..0e1d22cd8475497aa53236b021142e03028ff083 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork_Segment.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork_Segment.java
@@ -9,7 +9,6 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java
index dd32f8b17a51fd2f7c5b331788330f1a0aa1fcfd..85fba9f6f77aebe3b27bc069a64892e6f80bb59a 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java
@@ -9,14 +9,12 @@
 
 package org.opendaylight.neutron.spi;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.io.Serializable;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 
 @XmlRootElement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java
index dc000577764cbf0781c0561a0fe40db9157b7d79..0013d511800c0a6c61a77292d623d9c647651a59 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java
@@ -14,12 +14,11 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 @XmlRootElement

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairs.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairs.java
index 22e2e1c948084b3d2144ee68a073eca67a6ffbf8..41cd8726e1bac1a80855efa78a3419e95844a451 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairs.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairs.java
@@ -9,7 +9,6 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOption.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOption.java
index 813be970ff72540b8691b6c696e60fb3e5e635ac..d33a2893c829cea63d3a054e337fabc484a051dc 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOption.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOption.java
@@ -9,7 +9,6 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthRule.java
index f872687f458bb34c296a1159c86f9b2e47b0c591..50fefd7d16bc78993e93f4e547aac45e2954e959 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthRule.java
@@ -8,14 +8,14 @@
 
 package org.opendaylight.neutron.spi;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
 import java.math.BigInteger;
 import java.util.Iterator;
 import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosDscpMarkingRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosDscpMarkingRule.java
index a0141cc4fc184bc5558cd676b2186dcca687f3eb..9ae258c77ce408fa1420b60ce315aaadbc7c3904 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosDscpMarkingRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosDscpMarkingRule.java
@@ -8,13 +8,13 @@
 
 package org.opendaylight.neutron.spi;
 
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java
index 1741073581a30a78ec2aa69472e7f520e8f66aea..5f46e76fa66cbf639d8a00dd00e8a326ff59ebb4 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java
@@ -8,14 +8,14 @@
 
 package org.opendaylight.neutron.spi;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronResourceMapPropertyAdapter.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronResourceMapPropertyAdapter.java
index d748027dc093536739caf468872b9211754775e0..2f2ed6beeddef76eb24647e918c8f3154474ac78 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronResourceMapPropertyAdapter.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronResourceMapPropertyAdapter.java
@@ -10,12 +10,11 @@ package org.opendaylight.neutron.spi;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRoute.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRoute.java
index 7c80560c1a040744dfbaed9729cad22bf052722f..971b92483b0725f5b6257ada995d408e3ea660c7 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRoute.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRoute.java
@@ -9,7 +9,6 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_Interface.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_Interface.java
index e0d6f9a9f8142bf2de69d97324a6b87ec0e26be3..e1df719ce3d418548d7e3114e8e731da246329ae 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_Interface.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_Interface.java
@@ -9,7 +9,6 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReference.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReference.java
index 3f83c15a24d3773782981bfbde42cc4bc6ed221b..09fc77a824de33ed8448cca00de40254f02eaec0 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReference.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReference.java
@@ -9,9 +9,7 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifier.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifier.java
index 28b6f00ada8538c278ed5d0b193fe518243808a1..fbbf6405a2a8d53c05970bf06a545e2b83b08e33 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifier.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifier.java
@@ -7,16 +7,16 @@
  */
 package org.opendaylight.neutron.spi;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortChain.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortChain.java
index 798e4b97da92239c40e86ca777da98c3472f3f2a..339686d14ff4a35d85e0f7dcbd5024d6c53f1f70 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortChain.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortChain.java
@@ -7,18 +7,15 @@
  */
 package org.opendaylight.neutron.spi;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPair.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPair.java
index f3bad9d4330e9eced2b9306a6e58a840981e2dcd..01eedac10713cbb830e3e1923220ed474126d4e0 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPair.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPair.java
@@ -7,16 +7,16 @@
  */
 package org.opendaylight.neutron.spi;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroup.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroup.java
index 0b3e7659adb76ca0b2650d2c09fa94cbd4d116d7..cbdce07aa03014d750b51d9283c18d1b3681961c 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroup.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroup.java
@@ -7,13 +7,13 @@
  */
 package org.opendaylight.neutron.spi;
 
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
index 81ddb0a7e9cdbd5bb19dd21793ac742b8a8b1ea8..9a8bc5285590f496f40ede67490d6c1369f58449 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
@@ -11,7 +11,6 @@ package org.opendaylight.neutron.spi;
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java
index 9b0bfa90265ff30411667cdd170614847a39216b..f0325e4abcd60bc9d73016d614609100c3d0340a 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java
@@ -8,13 +8,13 @@
 
 package org.opendaylight.neutron.spi;
 
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * See OpenStack Network API v2.0 Reference for description of

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java
index e82166cc37615ebb3fdf0537588019d69ea29455..fb58e3f1bdddfb15dbc7572c8e4d81fb4f5bac58 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java
@@ -10,21 +10,18 @@ package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
 import java.math.BigInteger;
-import java.net.InetAddress;
 import java.net.Inet6Address;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-
 import org.apache.commons.net.util.SubnetUtils;
 import org.apache.commons.net.util.SubnetUtils.SubnetInfo;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnetIPAllocationPool.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnetIPAllocationPool.java
index 5c01fb958a361517d87a758f9d7fd55f6ac61366..af4f51616fc9de6aad8e8b91a6826af89b1936da 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnetIPAllocationPool.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnetIPAllocationPool.java
@@ -10,16 +10,14 @@ package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
 import java.math.BigInteger;
-import java.net.InetAddress;
 import java.net.Inet6Address;
+import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNDeadPeerDetection.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNDeadPeerDetection.java
index daaa415ab6903fe5273e540305ec7b1e704b84ea..a99ee4983b60510b1d9842c4a4423cbfa2861be4 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNDeadPeerDetection.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNDeadPeerDetection.java
@@ -9,7 +9,6 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIKEPolicy.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIKEPolicy.java
index 77b1b565ece6fc893e7a449c51c1ca9764253f10..414ec62a60298b84ee4ecb33728887e7f7ab3260 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIKEPolicy.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIKEPolicy.java
@@ -9,10 +9,8 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import java.util.Iterator;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIPSECPolicy.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIPSECPolicy.java
index 766cefa97d05e5e0638a7f441433ca04d2416ef2..3fcd026a4b321990b1e055b6f8dc9f0b3b4fe959 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIPSECPolicy.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIPSECPolicy.java
@@ -9,10 +9,8 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import java.util.Iterator;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIPSECSiteConnection.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIPSECSiteConnection.java
index d0788ace78dd8e55b1d198752bf0a311b65b11a8..5746daf025447577e62035aef194bacf379f491c 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIPSECSiteConnection.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNIPSECSiteConnection.java
@@ -9,10 +9,8 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import java.util.Iterator;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNLifetime.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNLifetime.java
index 97cfd108d418cf588706ed31bfa52b783d871183..879fe72890c4ac2a48f0644a9aada8f131150667 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNLifetime.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNLifetime.java
@@ -9,7 +9,6 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNService.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNService.java
index 3850962e4272f064c284e6b9ce1d3b3e9e279bfd..6926235109a5a59419fd078fe70d3f7a6960e8e1 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNService.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVPNService.java
@@ -11,14 +11,11 @@ package org.opendaylight.neutron.spi;
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.opendaylight.neutron.spi.INeutronObject;
-
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 public class NeutronVPNService extends NeutronObject implements Serializable, INeutronObject {

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_ID.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_ID.java
index 3d867a75ec1c95a1a0da1e7c4fa40ea137c32f2b..b2ae848e5ea57374ea3362d433575d99e1401eff 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_ID.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_ID.java
@@ -11,7 +11,6 @@ package org.opendaylight.neutron.spi;
 import com.google.common.base.Preconditions;
 import java.io.Serializable;
 import java.util.regex.Pattern;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_IPs.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_IPs.java
index 4a6b3f57a163c6c4879da1d65d7cf21304ee88a1..d43953fa5eececf85cd05a214bbfc310f82ade4e 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_IPs.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_IPs.java
@@ -9,7 +9,6 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;