Use Java declarations instead of Google Collections

[netvirt.git] / openstack / net-virt / src / main / java / org / opendaylight / netvirt / openstack / netvirt / impl / NodeCacheManagerImpl.java

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/NodeCacheManagerImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/NodeCacheManagerImpl.java
index 3ddf7499d186aefb81f6eb0a5a30fe2dc820d1e1..3e4d1c4ee2bce687bb17763e975e23561c0059c2 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/NodeCacheManagerImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/NodeCacheManagerImpl.java
@@ -7,30 +7,27 @@
  */
 package org.opendaylight.netvirt.openstack.netvirt.impl;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-
-import org.opendaylight.netvirt.openstack.netvirt.NodeCacheManagerEvent;
-import org.opendaylight.netvirt.openstack.netvirt.api.NodeCacheManager;
 import org.opendaylight.netvirt.openstack.netvirt.AbstractEvent;
 import org.opendaylight.netvirt.openstack.netvirt.AbstractHandler;
 import org.opendaylight.netvirt.openstack.netvirt.ConfigInterface;
+import org.opendaylight.netvirt.openstack.netvirt.NodeCacheManagerEvent;
 import org.opendaylight.netvirt.openstack.netvirt.api.Action;
 import org.opendaylight.netvirt.openstack.netvirt.api.EventDispatcher;
 import org.opendaylight.netvirt.openstack.netvirt.api.NodeCacheListener;
+import org.opendaylight.netvirt.openstack.netvirt.api.NodeCacheManager;
 import org.opendaylight.netvirt.openstack.netvirt.api.Southbound;
 import org.opendaylight.netvirt.utils.servicehelper.ServiceHelper;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
 import org.osgi.framework.ServiceReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
 /**
  * @author Flavio Fernandes (ffernand@redhat.com)
  * @author Sam Hague (shague@redhat.com)
@@ -38,7 +35,7 @@ import com.google.common.collect.Maps;
 public class NodeCacheManagerImpl extends AbstractHandler implements NodeCacheManager, ConfigInterface {
     private static final Logger LOG = LoggerFactory.getLogger(NodeCacheManagerImpl.class);
     private Map<NodeId, Node> nodeCache = new ConcurrentHashMap<>();
-    private Map<Long, NodeCacheListener> handlers = Maps.newHashMap();
+    private Map<Long, NodeCacheListener> handlers = new HashMap<>();
     private volatile Southbound southbound;
 
     @Override
@@ -161,7 +158,7 @@ public class NodeCacheManagerImpl extends AbstractHandler implements NodeCacheMa
 
     @Override
     public List<Node> getBridgeNodes() {
-        List<Node> nodes = Lists.newArrayList();
+        List<Node> nodes = new ArrayList<>();
         for (Node node : nodeCache.values()) {
             if (southbound.getBridge(node) != null) {
                 nodes.add(node);
@@ -172,7 +169,7 @@ public class NodeCacheManagerImpl extends AbstractHandler implements NodeCacheMa
 
     @Override
     public List <Long> getBridgeDpids(final String bridgeName) {
-        List<Long> dpids = Lists.newArrayList();
+        List<Long> dpids = new ArrayList<>();
         for (Node node : nodeCache.values()) {
             if (bridgeName == null || southbound.getBridge(node, bridgeName) != null) {
                 long dpid = southbound.getDataPathId(node);
@@ -186,11 +183,7 @@ public class NodeCacheManagerImpl extends AbstractHandler implements NodeCacheMa
 
     @Override
     public List<Node> getNodes() {
-        List<Node> nodes = Lists.newArrayList();
-        for (Node node : nodeCache.values()) {
-            nodes.add(node);
-        }
-        return nodes;
+        return new ArrayList<>(nodeCache.values());
     }
 
     private void populateNodeCache() {