diff --git a/apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java b/apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java
index d415d0d..6a74cf5 100644
--- a/apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java
+++ b/apps/dhcp/src/main/java/org/onosproject/dhcp/impl/DistributedDhcpStore.java
@@ -258,7 +258,7 @@
 
     @Override
     public Iterable<Ip4Address> getAvailableIPs() {
-        return ImmutableSet.<Ip4Address>copyOf(freeIPPool);
+        return ImmutableSet.copyOf(freeIPPool);
     }
 
     @Override
diff --git a/apps/metrics/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java b/apps/metrics/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java
index 78a540c..9a42e9e 100644
--- a/apps/metrics/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java
+++ b/apps/metrics/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java
@@ -107,7 +107,7 @@
     @Override
     public List<IntentEvent> getEvents() {
         synchronized (lastEvents) {
-            return ImmutableList.<IntentEvent>copyOf(lastEvents);
+            return ImmutableList.copyOf(lastEvents);
         }
     }
 
diff --git a/apps/metrics/src/main/java/org/onosproject/metrics/topology/TopologyMetrics.java b/apps/metrics/src/main/java/org/onosproject/metrics/topology/TopologyMetrics.java
index 5785f5f..fb984c9 100644
--- a/apps/metrics/src/main/java/org/onosproject/metrics/topology/TopologyMetrics.java
+++ b/apps/metrics/src/main/java/org/onosproject/metrics/topology/TopologyMetrics.java
@@ -138,7 +138,7 @@
     @Override
     public List<Event> getEvents() {
         synchronized (lastEvents) {
-            return ImmutableList.<Event>copyOf(lastEvents);
+            return ImmutableList.copyOf(lastEvents);
         }
     }