diff --git a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
index f1ac1f8..8b7be9a 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
@@ -78,7 +78,6 @@
 import org.slf4j.Logger;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Dictionary;
 import java.util.HashSet;
@@ -388,7 +387,7 @@
     @Override
     public void storeFlowRule(FlowRule rule) {
         storeBatch(new FlowRuleBatchOperation(
-                Arrays.asList(new FlowRuleBatchEntry(FlowRuleOperation.ADD, rule)),
+                Collections.singletonList(new FlowRuleBatchEntry(FlowRuleOperation.ADD, rule)),
                 rule.deviceId(), idGenerator.getNewId()));
     }
 
@@ -516,7 +515,7 @@
     public void deleteFlowRule(FlowRule rule) {
         storeBatch(
                 new FlowRuleBatchOperation(
-                        Arrays.asList(
+                        Collections.singletonList(
                                 new FlowRuleBatchEntry(
                                         FlowRuleOperation.REMOVE,
                                         rule)), rule.deviceId(), idGenerator.getNewId()));
diff --git a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/NewDistributedFlowRuleStore.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/NewDistributedFlowRuleStore.java
index 8bfab64..56c4dfb 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/NewDistributedFlowRuleStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/NewDistributedFlowRuleStore.java
@@ -71,7 +71,6 @@
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Dictionary;
 import java.util.HashSet;
@@ -378,7 +377,7 @@
     @Override
     public void storeFlowRule(FlowRule rule) {
         storeBatch(new FlowRuleBatchOperation(
-                Arrays.asList(new FlowRuleBatchEntry(FlowRuleOperation.ADD, rule)),
+                Collections.singletonList(new FlowRuleBatchEntry(FlowRuleOperation.ADD, rule)),
                 rule.deviceId(), idGenerator.getNewId()));
     }
 
@@ -484,7 +483,7 @@
     public void deleteFlowRule(FlowRule rule) {
         storeBatch(
                 new FlowRuleBatchOperation(
-                        Arrays.asList(
+                        Collections.singletonList(
                                 new FlowRuleBatchEntry(
                                         FlowRuleOperation.REMOVE,
                                         rule)), rule.deviceId(), idGenerator.getNewId()));
diff --git a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleGroupStoreTest.java b/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleGroupStoreTest.java
index 3cf2af3..88e30e5 100644
--- a/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleGroupStoreTest.java
+++ b/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleGroupStoreTest.java
@@ -20,6 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -307,7 +308,7 @@
         PortNumber[] newNeighborPorts = {PortNumber.portNumber(41),
                                          PortNumber.portNumber(42)};
         List<PortNumber> newOutPorts = new ArrayList<PortNumber>();
-        newOutPorts.addAll(Arrays.asList(newNeighborPorts[0]));
+        newOutPorts.addAll(Collections.singletonList(newNeighborPorts[0]));
 
         List<GroupBucket> toAddBuckets = new ArrayList<GroupBucket>();
         for (PortNumber portNumber: newOutPorts) {