Use Java declarations instead of Google Collections

[netvirt.git] / openstack / net-virt-providers / src / main / java / org / opendaylight / netvirt / openstack / netvirt / providers / openflow13 / services / ClassifierService.java

diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/services/ClassifierService.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/services/ClassifierService.java
index 0f85750adbae7c2d4607e80a67bf0414b34c862a..e74a9604d00cff2d5d0e8eb7a4eb3260f962352e 100644 (file)
--- a/openstack/net-virt-providers/src/main/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/services/ClassifierService.java
+++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/netvirt/openstack/netvirt/providers/openflow13/services/ClassifierService.java
@@ -9,12 +9,12 @@
 package org.opendaylight.netvirt.openstack.netvirt.providers.openflow13.services;
 
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.List;
-
 import org.opendaylight.netvirt.openstack.netvirt.api.ClassifierProvider;
+import org.opendaylight.netvirt.openstack.netvirt.providers.ConfigInterface;
 import org.opendaylight.netvirt.openstack.netvirt.providers.openflow13.AbstractServiceInstance;
 import org.opendaylight.netvirt.openstack.netvirt.providers.openflow13.Service;
-import org.opendaylight.netvirt.openstack.netvirt.providers.ConfigInterface;
 import org.opendaylight.netvirt.utils.mdsal.openflow.ActionUtils;
 import org.opendaylight.netvirt.utils.mdsal.openflow.FlowUtils;
 import org.opendaylight.netvirt.utils.mdsal.openflow.InstructionUtils;
@@ -39,8 +39,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev14
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg0;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg6;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxRegCaseBuilder;
-
-import com.google.common.collect.Lists;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 
@@ -85,7 +83,7 @@ public class ClassifierService extends AbstractServiceInstance implements Classi
             InstructionsBuilder isb = new InstructionsBuilder();
 
             // Instructions List Stores Individual Instructions
-            List<Instruction> instructions = Lists.newArrayList();
+            List<Instruction> instructions = new ArrayList<>();
 
             InstructionUtils.createSetTunnelIdInstructions(ib, new BigInteger(segmentationId));
             ApplyActionsCase aac = (ApplyActionsCase) ib.getInstruction();
@@ -150,7 +148,7 @@ public class ClassifierService extends AbstractServiceInstance implements Classi
             InstructionsBuilder isb = new InstructionsBuilder();
 
             // Instructions List Stores Individual Instructions
-            List<Instruction> instructions = Lists.newArrayList();
+            List<Instruction> instructions = new ArrayList<>();
 
             // Set VLAN ID Instruction
             InstructionUtils.createSetVlanInstructions(ib, new VlanId(Integer.valueOf(segmentationId)));
@@ -200,7 +198,7 @@ public class ClassifierService extends AbstractServiceInstance implements Classi
             InstructionsBuilder isb = new InstructionsBuilder();
 
             // Instructions List Stores Individual Instructions
-            List<Instruction> instructions = Lists.newArrayList();
+            List<Instruction> instructions = new ArrayList<>();
 
             // Call the InstructionBuilder Methods Containing Actions
             InstructionUtils.createDropInstructions(ib);
@@ -244,9 +242,9 @@ public class ClassifierService extends AbstractServiceInstance implements Classi
             InstructionsBuilder isb = new InstructionsBuilder();
 
             // Instructions List Stores Individual Instructions
-            List<Instruction> instructions = Lists.newArrayList();
+            List<Instruction> instructions = new ArrayList<>();
 
-            List<Action> actionList = Lists.newArrayList();
+            List<Action> actionList = new ArrayList<>();
             ActionBuilder ab = new ActionBuilder();
             ab.setAction(ActionUtils.nxLoadRegAction(new DstNxRegCaseBuilder().setNxReg(REG_FIELD).build(),
                     BigInteger.valueOf(REG_VALUE_FROM_REMOTE)));
@@ -305,7 +303,7 @@ public class ClassifierService extends AbstractServiceInstance implements Classi
             InstructionsBuilder isb = new InstructionsBuilder();
 
             // Instructions List Stores Individual Instructions
-            List<Instruction> instructions = Lists.newArrayList();
+            List<Instruction> instructions = new ArrayList<>();
 
             // Append the default pipeline after the first classification
             InstructionBuilder ib = this.getMutablePipelineInstructionBuilder();
@@ -348,7 +346,7 @@ public class ClassifierService extends AbstractServiceInstance implements Classi
         InstructionsBuilder isb = new InstructionsBuilder();
 
         // Instructions List Stores Individual Instructions
-        List<Instruction> instructions = Lists.newArrayList();
+        List<Instruction> instructions = new ArrayList<>();
 
         // Call the InstructionBuilder Methods Containing Actions
         InstructionUtils.createSendToControllerInstructions(FlowUtils.getNodeName(dpidLong), ib);
@@ -378,7 +376,7 @@ public class ClassifierService extends AbstractServiceInstance implements Classi
 
         if (write) {
             InstructionsBuilder isb = new InstructionsBuilder();
-            List<Instruction> instructions = Lists.newArrayList();
+            List<Instruction> instructions = new ArrayList<>();
             InstructionBuilder ib =
                     InstructionUtils.createGotoTableInstructions(new InstructionBuilder(), getTable());
             ib.setOrder(0);