Merge "Clean up collapsable if statements"

diff --git a/dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/Activator.java b/dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/Activator.java
index 2becb07ba9f3b8387d7b255b3ad54c79ea2bf776..385a5d172d4a90862f27c27f88401000e9af873b 100644 (file)
--- a/dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/Activator.java
+++ b/dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/Activator.java
@@ -35,8 +35,6 @@ import org.opendaylight.neutron.spi.INeutronVPNServiceAware;
 
 import org.osgi.framework.BundleContext;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class Activator extends DependencyActivatorBase {
 

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 0fbe61468af2cc33ccd713318f707dcb2435503f..a9fb1fa93a0452e9aa2149c4aa16adef7f8603e3 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
@@ -270,37 +270,37 @@ public class NeutronPort implements Serializable, INeutronObject {
     public NeutronPort extractFields(List<String> fields) {
         NeutronPort ans = new NeutronPort();
         for (String field: fields) {
-            if (fields.equals("id")) {
+            if ("id".equals(field)) {
                 ans.setPortUUID(this.getPortUUID());
             }
-            if (fields.equals("network_id")) {
+            if ("network_id".equals(field)) {
                 ans.setNetworkUUID(this.getNetworkUUID());
             }
-            if (fields.equals("name")) {
+            if ("name".equals(field)) {
                 ans.setName(this.getName());
             }
-            if (fields.equals("admin_state_up")) {
+            if ("admin_state_up".equals(field)) {
                 ans.setAdminStateUp(this.getAdminStateUp());
             }
-            if (fields.equals("status")) {
+            if ("status".equals(field)) {
                 ans.setStatus(this.getStatus());
             }
-            if (fields.equals("mac_address")) {
+            if ("mac_address".equals(field)) {
                 ans.setMacAddress(this.getMacAddress());
             }
-            if (fields.equals("fixed_ips")) {
+            if ("fixed_ips".equals(field)) {
                 ans.setFixedIPs(new ArrayList<Neutron_IPs>(this.getFixedIPs()));
             }
-            if (fields.equals("device_id")) {
+            if ("device_id".equals(field)) {
                 ans.setDeviceID(this.getDeviceID());
             }
-            if (fields.equals("device_owner")) {
+            if ("device_owner".equals(field)) {
                 ans.setDeviceOwner(this.getDeviceOwner());
             }
-            if (fields.equals("tenant_id")) {
+            if ("tenant_id".equals(field)) {
                 ans.setTenantID(this.getTenantID());
             }
-            if (fields.equals("security_groups")) {
+            if ("security_groups".equals(field)) {
                 ans.setSecurityGroups(new ArrayList<NeutronSecurityGroup>(this.getSecurityGroups()));
             }
         }

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 17af074990bb05226571dfd5be89ffd7e40bd6cb..12471fd4dc1a59f3e4440837c80ce222bbcf8729 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
@@ -56,7 +56,7 @@ public class NeutronSecurityGroup implements Serializable {
 
     public NeutronSecurityGroup() {
         neutronPorts = new ArrayList<NeutronPort> ();
-        List<NeutronSecurityRule> securityRules;
+        neutronSecurityRule = new ArrayList<NeutronSecurityRule>();
 
     }
 

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 97939e89e14e26ec7e4ea205715427d11feb2ab7..fa9135efd4563fd11ce4a71fb3f3d3db5dfeba55 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
@@ -71,7 +71,6 @@ public class NeutronSecurityRule implements Serializable {
     String securityRuleTenantID;
 
     public NeutronSecurityRule() {
-        List<NeutronSecurityRule> securityRules;
     }
 
     public String getSecurityRuleUUID() {

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java
index b7c7c02eb9cba04f94b66e5f08b0ca6fcca8c1e9..4be51dbbd5e86db63cba50846349b09ce16cecd0 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java
@@ -206,7 +206,6 @@ public class NeutronSecurityGroupsNorthbound {
         } else {
             List<NeutronSecurityGroup> bulk = input.getBulk();
             Iterator<NeutronSecurityGroup> i = bulk.iterator();
-            HashMap<String, NeutronSecurityGroup> testMap = new HashMap<String, NeutronSecurityGroup>();
             Object[] instances = NeutronUtil.getInstances(INeutronSecurityGroupAware.class, this);
             while (i.hasNext()) {
                 NeutronSecurityGroup test = i.next();

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronUtil.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronUtil.java
index 1cc9fab76614f0b6d36e14efca33af6b358a2db9..f382f886d28376144fc287e2b0ee61202160e3d4 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronUtil.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronUtil.java
@@ -6,7 +6,7 @@ import org.osgi.framework.ServiceReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-final public class NeutronUtil {
+public final class NeutronUtil {
     private static final Logger LOGGER = LoggerFactory
             .getLogger(NeutronUtil.class);
 

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 d6a9c9801127f819076c048e610097f5f09b4c6f..d61186155a88afb97c5f1d889349167c15642bb0 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
@@ -21,7 +21,7 @@ import org.opendaylight.neutron.spi.NeutronNetwork;
 import org.opendaylight.neutron.spi.NeutronPort;
 import org.opendaylight.neutron.spi.NeutronSubnet;
 
-final public class PaginatedRequestFactory {
+public final class PaginatedRequestFactory {
 
     private static final Comparator<INeutronObject> NEUTRON_OBJECT_COMPARATOR = new Comparator<INeutronObject>() {
         @Override

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java
index ec37eef4d2164fa87f35cfb529c33271c196cef9..1f786c6c09d3555cd643d6489bb6640cf0083b53 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java
@@ -116,8 +116,6 @@ public class NeutronFloatingIPInterface extends AbstractNeutronInterface<Floatin
             return false;
         }
         NeutronFloatingIP floatIP = getFloatingIP(uuid);
-        //if floating_ip_address isn't there, allocate from the subnet pool
-        NeutronSubnet subnet = subnetCRUD.getSubnet(networkCRUD.getNetwork(floatIP.getFloatingNetworkUUID()).getSubnets().get(0));
         if (floatIP.getPortUUID() != null) {
             NeutronPort port = portCRUD.getPort(floatIP.getPortUUID());
             port.removeFloatingIP(floatIP.getFixedIPAddress());

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
index 655af6f71a3a4d26025ca43f71d7996a1e121f26..06fc993d61b12934ffa690db499fb761081d3013 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
@@ -161,7 +161,6 @@ public class NeutronPortInterface extends AbstractNeutronInterface<Port, Neutron
         }
         NeutronPort target = portDB.get(uuid);
         if (delta.getFixedIPs() != null) {
-            NeutronPort port = getPort(uuid);
             NeutronCRUDInterfaces interfaces = new NeutronCRUDInterfaces()
                 .fetchINeutronSubnetCRUD(this);
             INeutronSubnetCRUD systemCRUD = interfaces.getSubnetInterface();

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTranscriberProvider.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTranscriberProvider.java
index d733bdbd7e2940f72988cfedadb4b0845402f3ec..8f255cbb3449ce703e1bab43670eed86d825d047 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTranscriberProvider.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTranscriberProvider.java
@@ -1,11 +1,8 @@
 package org.opendaylight.neutron.transcriber;
 
-import java.util.List;
-
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;