commit d88db6f142e72f786365245acf951f2eb674cb50
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Sep 09 14:22:06 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Sep 09 21:50:38 2015 +0000
tree 6e813dbb106a9919cff1be97bba5337bc366c877
parent 5bfd4e6d083afbaeb0c6e04518ef295518814ac5

Use diamond operator

Change-Id: I966c7033fc97259b3c3727a07d552c675a9446a4

core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java b/core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java
index d2079a8..ae7cc87 100644
--- a/core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java
@@ -159,8 +159,8 @@
         PortNumber[] ports2 = {PortNumber.portNumber(41),
                                PortNumber.portNumber(42)};
         GroupKey key = new DefaultGroupKey("group1BeforeAudit".getBytes());
-        List<GroupBucket> buckets = new ArrayList<GroupBucket>();
-        List<PortNumber> outPorts = new ArrayList<PortNumber>();
+        List<GroupBucket> buckets = new ArrayList<>();
+        List<PortNumber> outPorts = new ArrayList<>();
         outPorts.addAll(Arrays.asList(ports1));
         outPorts.addAll(Arrays.asList(ports2));
         for (PortNumber portNumber: outPorts) {
@@ -270,14 +270,16 @@
 
         GroupKey prevKey = new DefaultGroupKey("group1BeforeAudit".getBytes());
         Group createdGroup = groupService.getGroup(DID, prevKey);
-        List<GroupBucket> buckets = new ArrayList<GroupBucket>();
+        List<GroupBucket> buckets = new ArrayList<>();
         buckets.addAll(createdGroup.buckets().buckets());
 
         PortNumber[] addPorts = {PortNumber.portNumber(51),
                                  PortNumber.portNumber(52)};
-        List<PortNumber> outPorts = new ArrayList<PortNumber>();
+        List<PortNumber> outPorts;
+        outPorts = new ArrayList<PortNumber>();
         outPorts.addAll(Arrays.asList(addPorts));
-        List<GroupBucket> addBuckets = new ArrayList<GroupBucket>();
+        List<GroupBucket> addBuckets;
+        addBuckets = new ArrayList<GroupBucket>();
         for (PortNumber portNumber: outPorts) {
             TrafficTreatment.Builder tBuilder = DefaultTrafficTreatment.builder();
             tBuilder.setOutput(portNumber)
@@ -314,14 +316,14 @@
 
         GroupKey prevKey = new DefaultGroupKey("group1AddBuckets".getBytes());
         Group createdGroup = groupService.getGroup(DID, prevKey);
-        List<GroupBucket> buckets = new ArrayList<GroupBucket>();
+        List<GroupBucket> buckets = new ArrayList<>();
         buckets.addAll(createdGroup.buckets().buckets());
 
         PortNumber[] removePorts = {PortNumber.portNumber(31),
                                  PortNumber.portNumber(32)};
-        List<PortNumber> outPorts = new ArrayList<PortNumber>();
+        List<PortNumber> outPorts = new ArrayList<>();
         outPorts.addAll(Arrays.asList(removePorts));
-        List<GroupBucket> removeBuckets = new ArrayList<GroupBucket>();
+        List<GroupBucket> removeBuckets = new ArrayList<>();
         for (PortNumber portNumber: outPorts) {
             TrafficTreatment.Builder tBuilder = DefaultTrafficTreatment.builder();
             tBuilder.setOutput(portNumber)
@@ -380,8 +382,8 @@
                 PortNumber.portNumber(42)};
         // Test Group creation before AUDIT process
         GroupKey key = new DefaultGroupKey("group1BeforeAudit".getBytes());
-        List<GroupBucket> buckets = new ArrayList<GroupBucket>();
-        List<PortNumber> outPorts = new ArrayList<PortNumber>();
+        List<GroupBucket> buckets = new ArrayList<>();
+        List<PortNumber> outPorts = new ArrayList<>();
         outPorts.addAll(Arrays.asList(ports1));
         outPorts.addAll(Arrays.asList(ports2));
         for (PortNumber portNumber: outPorts) {
@@ -454,10 +456,10 @@
     private Group createSouthboundGroupEntry(GroupId gId,
                                              List<PortNumber> ports,
                                              long referenceCount) {
-        List<PortNumber> outPorts = new ArrayList<PortNumber>();
+        List<PortNumber> outPorts = new ArrayList<>();
         outPorts.addAll(ports);
 
-        List<GroupBucket> buckets = new ArrayList<GroupBucket>();
+        List<GroupBucket> buckets = new ArrayList<>();
         for (PortNumber portNumber: outPorts) {
             TrafficTreatment.Builder tBuilder = DefaultTrafficTreatment.builder();
             tBuilder.setOutput(portNumber)
@@ -499,7 +501,7 @@
     private class TestGroupProvider
                 extends AbstractProvider implements GroupProvider {
         DeviceId lastDeviceId;
-        List<GroupOperation> groupOperations = new ArrayList<GroupOperation>();
+        List<GroupOperation> groupOperations = new ArrayList<>();
 
         protected TestGroupProvider(ProviderId id) {
             super(id);