Bump upstreams

[openflowplugin.git] / test-provider / src / main / java / org / opendaylight / openflowplugin / test / OpenflowPluginBulkGroupTransactionProvider.java

diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkGroupTransactionProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkGroupTransactionProvider.java
index ce2880ef24300a27117beb69b54a194b4f255ee3..5c82d1d419cd94bff555af857d1b41ec4094d6d0 100644 (file)
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkGroupTransactionProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowPluginBulkGroupTransactionProvider.java
@@ -98,11 +98,12 @@ import org.slf4j.LoggerFactory;
 
 public class OpenflowPluginBulkGroupTransactionProvider implements CommandProvider {
     private static final Logger LOG = LoggerFactory.getLogger(OpenflowPluginBulkGroupTransactionProvider.class);
+    private static final String ORIGINAL_FLOW_NAME = "Foo";
+    private static final String ORIGINAL_GROUP_NAME = "Foo";
+
     private final DataBroker dataBroker;
     private final BundleContext ctx;
-    private final String originalFlowName = "Foo";
     private Node testNode12;
-    private final String originalGroupName = "Foo";
 
     public OpenflowPluginBulkGroupTransactionProvider(final DataBroker dataBroker, final BundleContext ctx) {
         this.dataBroker = dataBroker;
@@ -306,7 +307,8 @@ public class OpenflowPluginBulkGroupTransactionProvider implements CommandProvid
                 .build()));
     }
 
-    private FlowBuilder createTestFlow(final NodeBuilder nodeBuilder, final String flowTypeArg, final String tableId) {
+    private static FlowBuilder createTestFlow(final NodeBuilder nodeBuilder, final String flowTypeArg,
+            final String tableId) {
 
         FlowBuilder flow = new FlowBuilder();
         long id = 123;
@@ -409,7 +411,7 @@ public class OpenflowPluginBulkGroupTransactionProvider implements CommandProvid
 
         flow.withKey(key);
         flow.setPriority(Uint16.TWO);
-        flow.setFlowName(originalFlowName + "X" + flowType);
+        flow.setFlowName(ORIGINAL_FLOW_NAME + "X" + flowType);
         return flow;
     }
 
@@ -629,7 +631,7 @@ public class OpenflowPluginBulkGroupTransactionProvider implements CommandProvid
         }, MoreExecutors.directExecutor());
     }
 
-    private GroupBuilder createTestGroup(String actionType, String groupType, final String groupmod,
+    private static GroupBuilder createTestGroup(String actionType, String groupType, final String groupmod,
             final String strId) {
         // Sample data , committing to DataStore
 
@@ -712,7 +714,7 @@ public class OpenflowPluginBulkGroupTransactionProvider implements CommandProvid
 
         return group.withKey(new GroupKey(new GroupId(Uint32.valueOf(strId))))
             // .group.setInstall(false)
-            .setGroupName(originalGroupName)
+            .setGroupName(ORIGINAL_GROUP_NAME)
             .setBarrier(false)
             .setBuckets(new BucketsBuilder().setBucket(BindingMap.of(bucket.build())).build());
     }