Fix odlparent 3 Checkstyle issues

Change-Id: Id420b0bb2496974af3099f76ff5fbb50ee2caf8c
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronID.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronID.java
index de968c2a04950b8e8be63e8ee5a2e93d7fc41e1f..fa201e61e943ccae94479dcdc2f65ab14bfa39b2 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronID.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronID.java
@@ -30,7 +30,7 @@ public class NeutronID implements Serializable {
     @XmlElement(name = "id")
     String uuid;
 
-    private void checkUuidPattern(String uuid) {
+    private static void checkUuidPattern(String uuid) {
         Preconditions.checkNotNull(uuid, "Supplied value may not be null");
         Preconditions.checkArgument(UUID_PATTERN.matcher(uuid).matches(),
                 "Supplied value \"%s\" does not match uuid pattern \"%s\"", uuid, UUID_PATTERN_REGEX);
@@ -48,9 +48,9 @@ public class NeutronID implements Serializable {
         return uuid;
     }
 
-    public void setID(String uuid) {
-        checkUuidPattern(uuid);
-        this.uuid = uuid;
+    public void setID(String newUuid) {
+        checkUuidPattern(newUuid);
+        this.uuid = newUuid;
     }
 
     @Override

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 8b083894c8e14d4aee04e5dc9f2d9bed4f1165c8..22321bb4b729d2a2a1aef431bdbd9e48071851ca 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
@@ -26,8 +26,8 @@ public final class NeutronL2gateway extends NeutronBaseAttributes<NeutronL2gatew
         return l2gatewayDevices;
     }
 
-    public void setNeutronL2gatewayDevices(List<NeutronL2gatewayDevice> l2gatewayDevices) {
-        this.l2gatewayDevices = l2gatewayDevices;
+    public void setNeutronL2gatewayDevices(List<NeutronL2gatewayDevice> newL2gatewayDevices) {
+        this.l2gatewayDevices = newL2gatewayDevices;
     }
 
     @Override

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 e5d35cbf5ba032b5d08ed55cd2bc13b9c7d1d254..755e41fb6ee33df1d151471d07ae8fa13252fbe0 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
@@ -35,8 +35,8 @@ public final class NeutronL2gatewayDevice extends NeutronID implements Serializa
     }
 
     public void setNeutronL2gatewayDeviceInterfaces(
-            List<NeutronL2gatewayDeviceInterface> l2gatewayDeviceInterfaces) {
-        this.l2gatewayDeviceInterfaces = l2gatewayDeviceInterfaces;
+            List<NeutronL2gatewayDeviceInterface> newL2gatewayDeviceInterfaces) {
+        this.l2gatewayDeviceInterfaces = newL2gatewayDeviceInterfaces;
     }
 
     @Override

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 05cd2729a62697d0a7311760f9415e3ffac8249e..ac9cb5a77bfe38e7619026e319e2ba3d950c1399 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
@@ -73,41 +73,40 @@ public final class NeutronLoadBalancerListener extends NeutronBaseAttributes<Neu
         return loadBalancerListenerProtocol;
     }
 
-    public void setNeutronLoadBalancerListenerProtocol(String loadBalancerListenerProtocol) {
-        this.loadBalancerListenerProtocol = loadBalancerListenerProtocol;
+    public void setNeutronLoadBalancerListenerProtocol(String protocol) {
+        this.loadBalancerListenerProtocol = protocol;
     }
 
     public String getNeutronLoadBalancerListenerProtocolPort() {
         return loadBalancerListenerProtocolPort;
     }
 
-    public void setNeutronLoadBalancerListenerProtocolPort(String loadBalancerListenerProtocolPort) {
-        this.loadBalancerListenerProtocolPort = loadBalancerListenerProtocolPort;
+    public void setNeutronLoadBalancerListenerProtocolPort(String port) {
+        this.loadBalancerListenerProtocolPort = port;
     }
 
     public String getNeutronLoadBalancerListenerDefaultPoolID() {
         return loadBalancerListenerDefaultPoolID;
     }
 
-    public void setNeutronLoadBalancerListenerDefaultPoolID(String loadBalancerListenerDefaultPoolID) {
-        this.loadBalancerListenerDefaultPoolID = loadBalancerListenerDefaultPoolID;
+    public void setNeutronLoadBalancerListenerDefaultPoolID(String id) {
+        this.loadBalancerListenerDefaultPoolID = id;
     }
 
     public Integer getNeutronLoadBalancerListenerConnectionLimit() {
         return loadBalancerListenerConnectionLimit;
     }
 
-    public void setNeutronLoadBalancerListenerConnectionLimit(Integer loadBalancerListenerConnectionLimit) {
-        this.loadBalancerListenerConnectionLimit = loadBalancerListenerConnectionLimit;
+    public void setNeutronLoadBalancerListenerConnectionLimit(Integer limit) {
+        this.loadBalancerListenerConnectionLimit = limit;
     }
 
     public List<NeutronID> getNeutronLoadBalancerListenerLoadBalancerIDs() {
         return loadBalancerListenerLoadBalancerIDs;
     }
 
-    public void setNeutronLoadBalancerListenerLoadBalancerIDs(
-            List<NeutronID> loadBalancerListenerLoadBalancerIDs) {
-        this.loadBalancerListenerLoadBalancerIDs = loadBalancerListenerLoadBalancerIDs;
+    public void setNeutronLoadBalancerListenerLoadBalancerIDs(List<NeutronID> ids) {
+        this.loadBalancerListenerLoadBalancerIDs = ids;
     }
 
     @Override

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 c69e1f70ad13ede372916b49a63873dc1d03f2b2..8d9ccca78a2ca244000562bbc7f69045537ea0ac 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
@@ -102,9 +102,8 @@ public final class NeutronLoadBalancerPool extends NeutronBaseAttributes<Neutron
         return loadBalancerPoolSessionPersistence;
     }
 
-    public void setLoadBalancerSessionPersistence(
-            NeutronLoadBalancerSessionPersistence loadBalancerPoolSessionPersistence) {
-        this.loadBalancerPoolSessionPersistence = loadBalancerPoolSessionPersistence;
+    public void setLoadBalancerSessionPersistence(NeutronLoadBalancerSessionPersistence persistence) {
+        this.loadBalancerPoolSessionPersistence = persistence;
     }
 
     public List<NeutronID> getLoadBalancerPoolListeners() {

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 3f8beda011c8d984e6ed323a92e4e6aa70d760fe..5b434bb5e122a4ea924b3cbd4b3053b8263b77bb 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
@@ -30,8 +30,8 @@ public final class NeutronMeteringLabel extends NeutronBaseAttributes<NeutronMet
         return shared;
     }
 
-    public void setMeteringLabelShared(Boolean shared) {
-        this.shared = shared;
+    public void setMeteringLabelShared(Boolean value) {
+        this.shared = value;
     }
 
     /*

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 f6abaafc1254271646f6506fa1379638310cb6b6..141b41018f1a22cf5392b0a96b2e7e72a899d8d3 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
@@ -153,8 +153,8 @@ public final class NeutronPort extends NeutronAdminAttributes<NeutronPort> imple
         return vifDetails;
     }
 
-    public void setVIFDetails(Map<String, String> vifDetails) {
-        this.vifDetails = vifDetails;
+    public void setVIFDetails(Map<String, String> details) {
+        this.vifDetails = details;
     }
 
     public String getBindinghostID() {

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 593f7931e4ce2a8ee846b10d7857d27d4364fde7..f3e848b6c9a3d719f4124200cad55fab96a36e04 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
@@ -182,9 +182,9 @@ public final class NeutronSubnet extends NeutronBaseAttributes<NeutronSubnet> im
                 ans.setAllocationPools(pools);
                 break;
             case "host_routes":
-                List<NeutronRoute> hostRoutes = new ArrayList<>();
-                hostRoutes.addAll(this.getHostRoutes());
-                ans.setHostRoutes(hostRoutes);
+                List<NeutronRoute> routes = new ArrayList<>();
+                routes.addAll(this.getHostRoutes());
+                ans.setHostRoutes(routes);
                 break;
             case "enable_dhcp":
                 ans.setEnableDHCP(this.getEnableDHCP());

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/PaginatedRequestFactory.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/PaginatedRequestFactory.java
index b2a2ce1050e0b12e45b902216382e6029440a013..12953631291b41184281136a6ef55e68f37edda4 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/PaginatedRequestFactory.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/PaginatedRequestFactory.java
@@ -52,7 +52,7 @@ public final class PaginatedRequestFactory {
         }
 
         @Override
-        public void setID(String id) {
+        public void setID(String newId) {
             throw new UnsupportedOperationException("Marker has constant ID");
         }
 

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractTranscriberInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractTranscriberInterface.java
index 0281306bad375d5470475076b5e105d831f5efd6..0b96169c2274b79be6b58afccb6599f316c55af6 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractTranscriberInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractTranscriberInterface.java
@@ -179,7 +179,7 @@ public abstract class AbstractTranscriberInterface<
         return InstanceIdentifier.create(mdParentClass).child(mdContainerClass);
     }
 
-    protected <S1 extends INeutronObject<S1>, M extends IdAttributes, B extends Builder<M>>
+    protected static <S1 extends INeutronObject<S1>, M extends IdAttributes, B extends Builder<M>>
         B toMdIds(INeutronObject<S1> neutronObject, Class<B> builderClass) {
         B builder;
         try {
@@ -400,7 +400,7 @@ public abstract class AbstractTranscriberInterface<
         return false;
     }
 
-    protected Uuid toUuid(String uuid) {
+    protected static Uuid toUuid(String uuid) {
         Preconditions.checkNotNull(uuid);
         Uuid result;
         try {

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
index 8a2e4c674b9614d302657cf9d6e53b2ff7d59927..feb4ac34d74630d36909446883889546e812f45c 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
@@ -102,6 +102,7 @@ public final class NeutronFirewallRuleInterface
     }
 
     @Override
+    @SuppressWarnings("checkstyle:AvoidHidingCauseException")
     protected FirewallRule toMd(NeutronFirewallRule rule) {
         final FirewallRuleBuilder ruleBuilder = new FirewallRuleBuilder();
         toMdBaseAttributes(rule, ruleBuilder);
@@ -120,8 +121,7 @@ public final class NeutronFirewallRuleInterface
                 final Protocol protocol = new Protocol(protocolString.toCharArray());
                 ruleBuilder.setProtocol(protocol);
             } catch (NumberFormatException e) {
-                throw new BadRequestException("Protocol {" + rule.getFirewallRuleProtocol()
-                        + "} is not supported");
+                throw new BadRequestException("Protocol {" + rule.getFirewallRuleProtocol() + "} is not supported");
             }
         }
         if (rule.getFirewallRuleIpVer() != null) {

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
index 97fff3fef5cffaca71e661c5ee929dbebf8b883d..ac5a5d391e67ebb261a23c9290e32e9141a8902b 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
@@ -90,6 +90,7 @@ public final class NeutronSecurityRuleInterface extends
     }
 
     @Override
+    @SuppressWarnings("checkstyle:AvoidHidingCauseException")
     protected SecurityRule toMd(NeutronSecurityRule securityRule) {
         final SecurityRuleBuilder securityRuleBuilder = new SecurityRuleBuilder();
         toMdIds(securityRule, securityRuleBuilder);