Remove explicit type parameters which can be inferred
Change-Id: I62cd4df252bab6208e1b1cd37f8f8757b0cfc17e
diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleApplicationIdStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleApplicationIdStore.java
index a6b2f20..2999639 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleApplicationIdStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleApplicationIdStore.java
@@ -42,7 +42,7 @@
@Override
public Set<ApplicationId> getAppIds() {
- return ImmutableSet.<ApplicationId>copyOf(appIds.values());
+ return ImmutableSet.copyOf(appIds.values());
}
@Override
diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java
index b51a1d1..14e37b8 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStore.java
@@ -348,7 +348,7 @@
// exist, it creates and registers a new one.
private ConcurrentMap<PortNumber, Port> getPortMap(DeviceId deviceId) {
return createIfAbsentUnchecked(devicePorts, deviceId,
- NewConcurrentHashMap.<PortNumber, Port>ifNeeded());
+ NewConcurrentHashMap.ifNeeded());
}
private Map<ProviderId, DeviceDescriptions> getOrCreateDeviceDescriptions(
diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java
index b71faef..f8eb1ba 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleDeviceStoreTest.java
@@ -265,7 +265,7 @@
@Test
public final void testUpdatePorts() {
putDevice(DID1, SW1);
- List<PortDescription> pds = Arrays.<PortDescription>asList(
+ List<PortDescription> pds = Arrays.asList(
new DefaultPortDescription(P1, true),
new DefaultPortDescription(P2, true)
);
@@ -283,7 +283,7 @@
assertTrue("Event for all expectedport appeared", expectedPorts.isEmpty());
- List<PortDescription> pds2 = Arrays.<PortDescription>asList(
+ List<PortDescription> pds2 = Arrays.asList(
new DefaultPortDescription(P1, false),
new DefaultPortDescription(P2, true),
new DefaultPortDescription(P3, true)
@@ -308,7 +308,7 @@
}
}
- List<PortDescription> pds3 = Arrays.<PortDescription>asList(
+ List<PortDescription> pds3 = Arrays.asList(
new DefaultPortDescription(P1, false),
new DefaultPortDescription(P2, true)
);
@@ -334,7 +334,7 @@
@Test
public final void testUpdatePortStatus() {
putDevice(DID1, SW1);
- List<PortDescription> pds = Arrays.<PortDescription>asList(
+ List<PortDescription> pds = Arrays.asList(
new DefaultPortDescription(P1, true)
);
deviceStore.updatePorts(PID, DID1, pds);
@@ -352,7 +352,7 @@
public final void testUpdatePortStatusAncillary() {
putDeviceAncillary(DID1, SW1);
putDevice(DID1, SW1);
- List<PortDescription> pds = Arrays.<PortDescription>asList(
+ List<PortDescription> pds = Arrays.asList(
new DefaultPortDescription(P1, true, A1)
);
deviceStore.updatePorts(PID, DID1, pds);
@@ -416,7 +416,7 @@
public final void testGetPort() {
putDevice(DID1, SW1);
putDevice(DID2, SW1);
- List<PortDescription> pds = Arrays.<PortDescription>asList(
+ List<PortDescription> pds = Arrays.asList(
new DefaultPortDescription(P1, true),
new DefaultPortDescription(P2, false)
);
@@ -437,7 +437,7 @@
@Test
public final void testRemoveDevice() {
putDevice(DID1, SW1, A1);
- List<PortDescription> pds = Arrays.<PortDescription>asList(
+ List<PortDescription> pds = Arrays.asList(
new DefaultPortDescription(P1, true, A2)
);
deviceStore.updatePorts(PID, DID1, pds);
@@ -457,7 +457,7 @@
// putBack Device, Port w/o annotation
putDevice(DID1, SW1);
- List<PortDescription> pds2 = Arrays.<PortDescription>asList(
+ List<PortDescription> pds2 = Arrays.asList(
new DefaultPortDescription(P1, true)
);
deviceStore.updatePorts(PID, DID1, pds2);
diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleFlowRuleStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleFlowRuleStore.java
index 8924b61..bc8805d 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleFlowRuleStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleFlowRuleStore.java
@@ -164,7 +164,7 @@
}
private static NewConcurrentHashMap<FlowId, List<StoredFlowEntry>> lazyEmptyFlowTable() {
- return NewConcurrentHashMap.<FlowId, List<StoredFlowEntry>>ifNeeded();
+ return NewConcurrentHashMap.ifNeeded();
}
/**
diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStore.java
index 213244f..e019ed9 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStore.java
@@ -101,22 +101,22 @@
private static NewConcurrentHashMap<GroupKey, StoredGroupEntry>
lazyEmptyGroupKeyTable() {
- return NewConcurrentHashMap.<GroupKey, StoredGroupEntry>ifNeeded();
+ return NewConcurrentHashMap.ifNeeded();
}
private static NewConcurrentHashMap<GroupId, StoredGroupEntry>
lazyEmptyGroupIdTable() {
- return NewConcurrentHashMap.<GroupId, StoredGroupEntry>ifNeeded();
+ return NewConcurrentHashMap.ifNeeded();
}
private static NewConcurrentHashMap<GroupKey, StoredGroupEntry>
lazyEmptyPendingGroupKeyTable() {
- return NewConcurrentHashMap.<GroupKey, StoredGroupEntry>ifNeeded();
+ return NewConcurrentHashMap.ifNeeded();
}
private static NewConcurrentHashMap<GroupId, Group>
lazyEmptyExtraneousGroupIdTable() {
- return NewConcurrentHashMap.<GroupId, Group>ifNeeded();
+ return NewConcurrentHashMap.ifNeeded();
}
/**
diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleHostStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleHostStore.java
index a635742..98a9252 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleHostStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleHostStore.java
@@ -177,7 +177,7 @@
@Override
public Iterable<Host> getHosts() {
- return ImmutableSet.<Host>copyOf(hosts.values());
+ return ImmutableSet.copyOf(hosts.values());
}
@Override