diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
index ef836b5..0b4e215 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
@@ -569,7 +569,7 @@
                                         return descs.getPortDesc(input.portNumber()).value();
                                     }
                                 }).toList();
-                merged = new Timestamped<List<PortDescription>>(mergedList, newTimestamp);
+                merged = new Timestamped<>(mergedList, newTimestamp);
             }
 
             if (!deviceEvents.isEmpty()) {
@@ -718,7 +718,7 @@
         Map<ProviderId, DeviceDescriptions> r;
         r = deviceDescs.get(deviceId);
         if (r == null) {
-            r = new HashMap<ProviderId, DeviceDescriptions>();
+            r = new HashMap<>();
             final Map<ProviderId, DeviceDescriptions> concurrentlyAdded;
             concurrentlyAdded = deviceDescs.putIfAbsent(deviceId, r);
             if (concurrentlyAdded != null) {