Code cleanup: use collection interfaces in declarations

Replace HashMap with Map and HashSet with Set in
variable declarations

Change-Id: I364d3673351a273b84ab0daef8bc0a59ecda63d8
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
index 66c6e97e24c1f861b0a0c3b2b40afc2b978673bb..a3ac7f886ca4af13120a1aec12d4dfcb79feefe0 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
@@ -12,6 +12,7 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -56,7 +57,7 @@ public class NeutronRouter implements Serializable, INeutronObject {
     /* Holds a map of OpenStackRouterInterfaces by subnet UUID
      * used for internal mapping to DOVE
      */
-    HashMap<String, NeutronRouter_Interface> interfaces;
+    Map<String, NeutronRouter_Interface> interfaces;
 
     public NeutronRouter() {
         interfaces = new HashMap<String, NeutronRouter_Interface>();
@@ -188,7 +189,7 @@ public class NeutronRouter implements Serializable, INeutronObject {
         return ans;
     }
 
-    public HashMap<String, NeutronRouter_Interface> getInterfaces() {
+    public Map<String, NeutronRouter_Interface> getInterfaces() {
         return interfaces;
     }
 

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java
index 14b57fa34d89271236d650e34418457989142606..a4c4837979eb7a769face3067f1205f8869dab9f 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java
@@ -32,6 +32,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Neutron Northbound REST APIs for Firewall.<br>
@@ -216,7 +217,7 @@ public class NeutronFirewallNorthbound {
         } else {
             List<NeutronFirewall> bulk = input.getBulk();
             Iterator<NeutronFirewall> i = bulk.iterator();
-            HashMap<String, NeutronFirewall> testMap = new HashMap<String, NeutronFirewall>();
+            Map<String, NeutronFirewall> testMap = new HashMap<String, NeutronFirewall>();
             Object[] instances = NeutronUtil.getInstances(INeutronFirewallAware.class, this);
             while (i.hasNext()) {
                 NeutronFirewall test = i.next();

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java
index 8f2f2685bec0b7d028adb2681c019c3d8971b8ee..57d785c2f407683cdb138bb73bdb35707ec2a67d 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -215,7 +216,7 @@ public class NeutronFirewallPolicyNorthbound {
         } else {
             List<NeutronFirewallPolicy> bulk = input.getBulk();
             Iterator<NeutronFirewallPolicy> i = bulk.iterator();
-            HashMap<String, NeutronFirewallPolicy> testMap = new HashMap<String, NeutronFirewallPolicy>();
+            Map<String, NeutronFirewallPolicy> testMap = new HashMap<String, NeutronFirewallPolicy>();
             Object[] instances = NeutronUtil.getInstances(INeutronFirewallPolicyAware.class, this);
             while (i.hasNext()) {
                 NeutronFirewallPolicy test = i.next();

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java
index 62d997916cba83fe00bc0f0c200694672983d2ae..bc8695b5c5bd28e95a129de936149a3875c3bc87 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -246,7 +247,7 @@ public class NeutronFirewallRulesNorthbound {
         } else {
             List<NeutronFirewallRule> bulk = input.getBulk();
             Iterator<NeutronFirewallRule> i = bulk.iterator();
-            HashMap<String, NeutronFirewallRule> testMap = new HashMap<String, NeutronFirewallRule>();
+            Map<String, NeutronFirewallRule> testMap = new HashMap<String, NeutronFirewallRule>();
             Object[] instances = NeutronUtil.getInstances(INeutronFirewallRuleAware.class, this);
             while (i.hasNext()) {
                 NeutronFirewallRule test = i.next();

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java
index 9ffcc559462c65386a84087cf966beddc585e4de..823bd5b0a083fc78f103e7203ce263a4a3deb486 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -233,7 +234,7 @@ public class NeutronLoadBalancerHealthMonitorNorthbound {
         } else {
             List<NeutronLoadBalancerHealthMonitor> bulk = input.getBulk();
             Iterator<NeutronLoadBalancerHealthMonitor> i = bulk.iterator();
-            HashMap<String, NeutronLoadBalancerHealthMonitor> testMap = new HashMap<String, NeutronLoadBalancerHealthMonitor>();
+            Map<String, NeutronLoadBalancerHealthMonitor> testMap = new HashMap<String, NeutronLoadBalancerHealthMonitor>();
             Object[] instances = NeutronUtil.getInstances(INeutronLoadBalancerHealthMonitorAware.class, this);
             while (i.hasNext()) {
                 NeutronLoadBalancerHealthMonitor test = i.next();

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
index 64004b57adbfbe93dda6e64086c345fdf2f992d8..53f7501b7b110a9bf0561798ec6c0e0171915483 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -218,7 +219,7 @@ public class NeutronLoadBalancerListenerNorthbound {
         } else {
             List<NeutronLoadBalancerListener> bulk = input.getBulk();
             Iterator<NeutronLoadBalancerListener> i = bulk.iterator();
-            HashMap<String, NeutronLoadBalancerListener> testMap = new HashMap<String, NeutronLoadBalancerListener>();
+            Map<String, NeutronLoadBalancerListener> testMap = new HashMap<String, NeutronLoadBalancerListener>();
             Object[] instances = NeutronUtil.getInstances(INeutronLoadBalancerListenerAware.class, this);
             while (i.hasNext()) {
                 NeutronLoadBalancerListener test = i.next();

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java
index be3eba99f1f972e6c5f543f494513af9f9052ebf..1a17bf21c3f2039ef3a71cc2e11143f45c3affb7 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -214,7 +215,7 @@ public class NeutronLoadBalancerNorthbound {
         } else {
             List<NeutronLoadBalancer> bulk = input.getBulk();
             Iterator<NeutronLoadBalancer> i = bulk.iterator();
-            HashMap<String, NeutronLoadBalancer> testMap = new HashMap<String, NeutronLoadBalancer>();
+            Map<String, NeutronLoadBalancer> testMap = new HashMap<String, NeutronLoadBalancer>();
             Object[] instances = NeutronUtil.getInstances(INeutronLoadBalancerAware.class, this);
             while (i.hasNext()) {
                 NeutronLoadBalancer test = i.next();

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMembersNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMembersNorthbound.java
index 2f63f0a5b8fdb2c092dce98fd25712594bcd07f1..673acfd655e385b8bf6693a7992dcfbe255abd2c 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMembersNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMembersNorthbound.java
@@ -16,6 +16,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -239,7 +240,7 @@ public Response createLoadBalancerPoolMember(
     } else {
         List<NeutronLoadBalancerPoolMember> bulk = input.getBulk();
         Iterator<NeutronLoadBalancerPoolMember> i = bulk.iterator();
-        HashMap<String, NeutronLoadBalancerPoolMember> testMap = new HashMap<String, NeutronLoadBalancerPoolMember>();
+        Map<String, NeutronLoadBalancerPoolMember> testMap = new HashMap<String, NeutronLoadBalancerPoolMember>();
         Object[] instances = NeutronUtil.getInstances(INeutronLoadBalancerPoolMemberAware.class, this);
         while (i.hasNext()) {
             NeutronLoadBalancerPoolMember test = i.next();

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
index 983153677efed4aa082622b6e2f1319532e76c45..ddcaab730db15bf6d173840591a9d29b43bb3057 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
@@ -16,6 +16,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -227,7 +228,7 @@ public class NeutronLoadBalancerPoolNorthbound {
         } else {
             List<NeutronLoadBalancerPool> bulk = input.getBulk();
             Iterator<NeutronLoadBalancerPool> i = bulk.iterator();
-            HashMap<String, NeutronLoadBalancerPool> testMap = new HashMap<String, NeutronLoadBalancerPool>();
+            Map<String, NeutronLoadBalancerPool> testMap = new HashMap<String, NeutronLoadBalancerPool>();
             Object[] instances = NeutronUtil.getInstances(INeutronLoadBalancerPoolAware.class, this);
             while (i.hasNext()) {
                 NeutronLoadBalancerPool test = i.next();

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java
index f6e0bc8d4025cbd81e7d397738b9a3c38d3c673a..09f2d3cc8e6dfaad70a45ce2cf193cbfe37d8b5d 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -245,7 +246,7 @@ public class NeutronNetworksNorthbound {
         } else {
             List<NeutronNetwork> bulk = input.getBulk();
             Iterator<NeutronNetwork> i = bulk.iterator();
-            HashMap<String, NeutronNetwork> testMap = new HashMap<String, NeutronNetwork>();
+            Map<String, NeutronNetwork> testMap = new HashMap<String, NeutronNetwork>();
             Object[] instances = NeutronUtil.getInstances(INeutronNetworkAware.class, this);
             while (i.hasNext()) {
                 NeutronNetwork test = i.next();

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNorthboundRSApplication.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNorthboundRSApplication.java
index 4059a6ed3f00c0091442d7720e793ed76065ad53..451903e7bec10730ecab1c1ecfa146538ca6783e 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNorthboundRSApplication.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNorthboundRSApplication.java
@@ -74,7 +74,7 @@ public class NeutronNorthboundRSApplication extends Application {
         moxyJsonProvider.setNamespacePrefixMapper(namespacePrefixMapper);
         moxyJsonProvider.setNamespaceSeparator(':');
 
-        HashSet<Object> set = new HashSet<Object>(1);
+        Set<Object> set = new HashSet<Object>(1);
         set.add(moxyJsonProvider);
         return set;
     }

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java
index 23e9b0448c0e58f210013f2e23c0411ba07af22e..fe23680aeac47376b034b03e7505443aaeef7b52 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -303,7 +304,7 @@ public class NeutronPortsNorthbound {
         } else {
             List<NeutronPort> bulk = input.getBulk();
             Iterator<NeutronPort> i = bulk.iterator();
-            HashMap<String, NeutronPort> testMap = new HashMap<String, NeutronPort>();
+            Map<String, NeutronPort> testMap = new HashMap<String, NeutronPort>();
             Object[] instances = NeutronUtil.getInstances(INeutronPortAware.class, this);
             while (i.hasNext()) {
                 NeutronPort test = i.next();

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java
index 4be51dbbd5e86db63cba50846349b09ce16cecd0..3a969e5a3663638b5de85099576dded6fcab6b47 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java
@@ -12,7 +12,6 @@ package org.opendaylight.neutron.northbound.api;
 import java.net.HttpURLConnection;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java
index 26145c8cf7259ccd2d24adb051f38548829f06bc..80d999d2e13fda3a1ffdeda983a794d813c73ef4 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -227,7 +228,7 @@ public class NeutronSecurityRulesNorthbound {
         } else {
             List<NeutronSecurityRule> bulk = input.getBulk();
             Iterator<NeutronSecurityRule> i = bulk.iterator();
-            HashMap<String, NeutronSecurityRule> testMap = new HashMap<String, NeutronSecurityRule>();
+            Map<String, NeutronSecurityRule> testMap = new HashMap<String, NeutronSecurityRule>();
             Object[] instances = NeutronUtil.getInstances(INeutronSecurityRuleAware.class, this);
             while (i.hasNext()) {
                 NeutronSecurityRule test = i.next();

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java
index ae70035b82f1502731fb9100afd620207d706a96..3e317e3615517c417d17cfab60cf632847915142 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -255,7 +256,7 @@ public class NeutronSubnetsNorthbound {
         } else {
             List<NeutronSubnet> bulk = input.getBulk();
             Iterator<NeutronSubnet> i = bulk.iterator();
-            HashMap<String, NeutronSubnet> testMap = new HashMap<String, NeutronSubnet>();
+            Map<String, NeutronSubnet> testMap = new HashMap<String, NeutronSubnet>();
             Object[] instances = NeutronUtil.getInstances(INeutronSubnetAware.class, this);
             while (i.hasNext()) {
                 NeutronSubnet test = i.next();

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVPNServicesNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVPNServicesNorthbound.java
index 9c61ba56c4cac2eb3a2e784c69eb42fe38deb363..b8ae4676764b6217747c56886481273440a8e08f 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVPNServicesNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVPNServicesNorthbound.java
@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -213,7 +214,7 @@ public class NeutronVPNServicesNorthbound {
         } else {
             List<NeutronVPNService> bulk = input.getBulk();
             Iterator<NeutronVPNService> i = bulk.iterator();
-            HashMap<String, NeutronVPNService> testMap = new HashMap<String, NeutronVPNService>();
+            Map<String, NeutronVPNService> testMap = new HashMap<String, NeutronVPNService>();
             Object[] instances = NeutronUtil.getInstances(INeutronVPNServiceAware.class, this);
             while (i.hasNext()) {
                 NeutronVPNService test = i.next();

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
index 150691f48f80d27393113bcdbc2d922846adf398..50d7d3ffd1c6097b0a6a4a9eda581bb7effbff41 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
@@ -12,6 +12,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -162,7 +163,7 @@ public class NeutronRouterInterface extends  AbstractNeutronInterface<Router, Ne
             routerBuilder.setExternalGatewayInfo(externalGatewayInfo);
         }
         if (router.getInterfaces() != null) {
-            HashMap<String, NeutronRouter_Interface> mapInterfaces = new HashMap<String, NeutronRouter_Interface>();
+            Map<String, NeutronRouter_Interface> mapInterfaces = new HashMap<String, NeutronRouter_Interface>();
             List<Interfaces> interfaces = new ArrayList<Interfaces>();
             for (Entry<String, NeutronRouter_Interface> entry : mapInterfaces.entrySet()) {
                 interfaces.add((Interfaces) entry.getValue());