commit 21d00698f1c5925a76233828fb038684b703037f
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Aug 15 11:15:28 2016 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Tue Aug 16 18:07:05 2016 +0000
tree f7e4a9b3518d4860fc563d037169bd23a91a1756
parent 1578042b4d669fd0c95383af1796bcd960c56782

Remove explicit type parameters which can be inferred

Change-Id: I62cd4df252bab6208e1b1cd37f8f8757b0cfc17e

core/net/src/test/java/org/onosproject/net/edgeservice/impl/EdgeManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/edgeservice/impl/EdgeManagerTest.java b/core/net/src/test/java/org/onosproject/net/edgeservice/impl/EdgeManagerTest.java
index b01ec39..67c82e1 100644
--- a/core/net/src/test/java/org/onosproject/net/edgeservice/impl/EdgeManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/edgeservice/impl/EdgeManagerTest.java
@@ -37,7 +37,6 @@
 import org.onosproject.net.device.DeviceServiceAdapter;
 import org.onosproject.net.edge.EdgePortEvent;
 import org.onosproject.net.edge.EdgePortListener;
-import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.net.link.LinkEvent;
 import org.onosproject.net.packet.OutboundPacket;
 import org.onosproject.net.packet.PacketServiceAdapter;
@@ -352,7 +351,7 @@
                                                                              true)));
         }
 
-        mgr.emitPacket(ByteBuffer.wrap(arr), Optional.<TrafficTreatment>empty());
+        mgr.emitPacket(ByteBuffer.wrap(arr), Optional.empty());
 
         assertEquals("There were an unexpected number of emitted packets",
                      (totalPorts - numInfraPorts) * numDevices, packets.size());
@@ -364,7 +363,7 @@
         }
         //Start testing emission to a specific device
         packets.clear();
-        mgr.emitPacket(NetTestTools.did(Integer.toString(1)), ByteBuffer.wrap(arr), Optional.<TrafficTreatment>empty());
+        mgr.emitPacket(NetTestTools.did(Integer.toString(1)), ByteBuffer.wrap(arr), Optional.empty());
 
         assertEquals("Unexpected number of outbound packets were emitted.",
                      totalPorts - numInfraPorts, packets.size());
@@ -530,4 +529,4 @@
             events.add(event);
         }
     }
-}
\ No newline at end of file
+}

core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
index 014cb95..88a7e7a 100644
--- a/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
@@ -554,14 +554,14 @@
             @Override
             public CompletedBatchOperation get()
                     throws InterruptedException, ExecutionException {
-                return new CompletedBatchOperation(true, Collections.<FlowRule>emptySet(), null);
+                return new CompletedBatchOperation(true, Collections.emptySet(), null);
             }
 
             @Override
             public CompletedBatchOperation get(long timeout, TimeUnit unit)
                     throws InterruptedException,
                     ExecutionException, TimeoutException {
-                return new CompletedBatchOperation(true, Collections.<FlowRule>emptySet(), null);
+                return new CompletedBatchOperation(true, Collections.emptySet(), null);
             }
 
             @Override

core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java b/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java
index 50baee9..6e91ab0 100644
--- a/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java
@@ -416,7 +416,7 @@
      */
     @Test
     public void testNotKnown() {
-        expect(hostService.getHostsByIp(IP1)).andReturn(Collections.<Host>emptySet());
+        expect(hostService.getHostsByIp(IP1)).andReturn(Collections.emptySet());
         replay(hostService);
         replay(interfaceService);