diff --git a/eureka-client/src/main/java/com/netflix/appinfo/PropertiesInstanceConfig.java b/eureka-client/src/main/java/com/netflix/appinfo/PropertiesInstanceConfig.java
index 85fdeb0d4..4c73dfdf0 100644
--- a/eureka-client/src/main/java/com/netflix/appinfo/PropertiesInstanceConfig.java
+++ b/eureka-client/src/main/java/com/netflix/appinfo/PropertiesInstanceConfig.java
@@ -211,7 +211,7 @@ public String getASGName() {
     @Override
     public Map<String, String> getMetadataMap() {
         String metadataNamespace = namespace + INSTANCE_METADATA_PREFIX + ".";
-        Map<String, String> metadataMap = new LinkedHashMap<String, String>();
+        Map<String, String> metadataMap = new LinkedHashMap<>();
         Configuration config = (Configuration) configInstance.getBackingConfigurationSource();
         String subsetPrefix = metadataNamespace.charAt(metadataNamespace.length() - 1) == '.'
                 ? metadataNamespace.substring(0, metadataNamespace.length() - 1)
diff --git a/eureka-client/src/main/java/com/netflix/appinfo/RefreshableAmazonInfoProvider.java b/eureka-client/src/main/java/com/netflix/appinfo/RefreshableAmazonInfoProvider.java
index 41e73a712..29bbae25f 100644
--- a/eureka-client/src/main/java/com/netflix/appinfo/RefreshableAmazonInfoProvider.java
+++ b/eureka-client/src/main/java/com/netflix/appinfo/RefreshableAmazonInfoProvider.java
@@ -61,7 +61,7 @@ private static AmazonInfo init(AmazonInfoConfig amazonInfoConfig, FallbackAddres
                 // The property to not validate instance ids may be set for
                 // development and in that scenario, populate instance id
                 // and public hostname with the hostname of the machine
-                Map<String, String> metadataMap = new HashMap<String, String>();
+                Map<String, String> metadataMap = new HashMap<>();
                 metadataMap.put(AmazonInfo.MetaDataKey.instanceId.getName(), fallbackAddressProvider.getFallbackIp());
                 metadataMap.put(AmazonInfo.MetaDataKey.publicHostname.getName(), fallbackAddressProvider.getFallbackHostname());
                 info.setMetadata(metadataMap);
diff --git a/eureka-client/src/main/java/com/netflix/discovery/converters/Converters.java b/eureka-client/src/main/java/com/netflix/discovery/converters/Converters.java
index 9133522cb..6cb0ad0b4 100644
--- a/eureka-client/src/main/java/com/netflix/discovery/converters/Converters.java
+++ b/eureka-client/src/main/java/com/netflix/discovery/converters/Converters.java
@@ -512,7 +512,7 @@ public Name getName() {
                     if (info.getName() == Name.Amazon) {
                         Map<String, String> metadataMap = (Map<String, String>) context
                                 .convertAnother(info, Map.class);
-                        Map<String, String> metadataMapInter = new HashMap<String, String>(metadataMap.size());
+                        Map<String, String> metadataMapInter = new HashMap<>(metadataMap.size());
                         for (Map.Entry<String, String> entry : metadataMap.entrySet()) {
                             metadataMapInter.put(StringCache.intern(entry.getKey()), StringCache.intern(entry.getValue()));
                         }