Bug 3902 : Local variables to be declared final.

[neutron.git] / transcriber / src / main / java / org / opendaylight / neutron / transcriber / NeutronFirewallInterface.java

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java
index 9e6aa068ac9157e977251cd0e06b75d2bb0293f0..64b651f7a4053dcf7e0812f4d4635356eeb399bc 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java
@@ -12,11 +12,10 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderCo
 import org.opendaylight.neutron.spi.INeutronFirewallCRUD;
 import org.opendaylight.neutron.spi.NeutronFirewall;
 
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.fwaas.rev141002.firewalls.attributes.Firewalls;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.fwaas.rev141002.firewalls.attributes.firewalls.Firewall;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.fwaas.rev141002.firewalls.attributes.firewalls.FirewallBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150325.Neutron;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.fwaas.rev150712.firewalls.attributes.Firewalls;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.fwaas.rev150712.firewalls.attributes.firewalls.Firewall;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.fwaas.rev150712.firewalls.attributes.firewalls.FirewallBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
 
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.osgi.framework.BundleContext;
@@ -25,13 +24,9 @@ import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
 
-public class NeutronFirewallInterface extends AbstractNeutronInterface<Firewall,NeutronFirewall> implements INeutronFirewallCRUD {
+public class NeutronFirewallInterface extends AbstractNeutronInterface<Firewall, Firewalls, NeutronFirewall> implements INeutronFirewallCRUD {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronFirewallInterface.class);
 
@@ -50,18 +45,8 @@ public class NeutronFirewallInterface extends AbstractNeutronInterface<Firewall,
     }
 
     @Override
-    public List<NeutronFirewall> getAll() {
-        Set<NeutronFirewall> allFirewalls = new HashSet<NeutronFirewall>();
-        Firewalls firewalls = readMd(createInstanceIdentifier());
-        if (firewalls != null) {
-            for (Firewall firewall: firewalls.getFirewall()) {
-                allFirewalls.add(fromMd(firewall));
-            }
-        }
-        LOGGER.debug("Exiting getFirewalls, Found {} OpenStackFirewall", allFirewalls.size());
-        List<NeutronFirewall> ans = new ArrayList<NeutronFirewall>();
-        ans.addAll(allFirewalls);
-        return ans;
+    protected List<Firewall> getDataObjectList(Firewalls firewalls) {
+        return firewalls.getFirewall();
     }
 
     @Override
@@ -96,13 +81,14 @@ public class NeutronFirewallInterface extends AbstractNeutronInterface<Firewall,
                 .child(Firewall.class, item.getKey());
     }
 
+    @Override
     protected InstanceIdentifier<Firewalls> createInstanceIdentifier() {
         return InstanceIdentifier.create(Neutron.class)
                 .child(Firewalls.class);
     }
 
     protected NeutronFirewall fromMd(Firewall firewall) {
-        NeutronFirewall answer = new NeutronFirewall();
+        final NeutronFirewall answer = new NeutronFirewall();
         if (firewall.getUuid() != null) {
             answer.setID(firewall.getUuid().getValue());
         }
@@ -110,7 +96,7 @@ public class NeutronFirewallInterface extends AbstractNeutronInterface<Firewall,
             answer.setFirewallName(firewall.getName());
         }
         if (firewall.getTenantId() != null) {
-            answer.setTenantID(firewall.getTenantId().getValue().replace("-",""));
+            answer.setTenantID(firewall.getTenantId());
         }
         answer.setFirewallAdminStateIsUp(firewall.isAdminStateUp());
         if (firewall.getStatus() != null) {
@@ -130,7 +116,7 @@ public class NeutronFirewallInterface extends AbstractNeutronInterface<Firewall,
 
     @Override
     protected Firewall toMd(NeutronFirewall firewall) {
-        FirewallBuilder firewallBuilder = new FirewallBuilder();
+        final FirewallBuilder firewallBuilder = new FirewallBuilder();
         if (firewall.getID() != null) {
             firewallBuilder.setUuid(toUuid(firewall.getID()));
         }
@@ -160,7 +146,7 @@ public class NeutronFirewallInterface extends AbstractNeutronInterface<Firewall,
 
     @Override
     protected Firewall toMd(String uuid) {
-        FirewallBuilder firewallBuilder = new FirewallBuilder();
+        final FirewallBuilder firewallBuilder = new FirewallBuilder();
         firewallBuilder.setUuid(toUuid(uuid));
         return firewallBuilder.build();
     }
@@ -168,8 +154,8 @@ public class NeutronFirewallInterface extends AbstractNeutronInterface<Firewall,
     public static void registerNewInterface(BundleContext context,
                                             ProviderContext providerContext,
                                             List<ServiceRegistration<?>> registrations) {
-        NeutronFirewallInterface neutronFirewallInterface = new NeutronFirewallInterface(providerContext);
-        ServiceRegistration<INeutronFirewallCRUD> neutronFirewallInterfaceRegistration = context.registerService(INeutronFirewallCRUD.class, neutronFirewallInterface, null);
+        final NeutronFirewallInterface neutronFirewallInterface = new NeutronFirewallInterface(providerContext);
+        final ServiceRegistration<INeutronFirewallCRUD> neutronFirewallInterfaceRegistration = context.registerService(INeutronFirewallCRUD.class, neutronFirewallInterface, null);
         if(neutronFirewallInterfaceRegistration != null) {
             registrations.add(neutronFirewallInterfaceRegistration);
         }