From 435092d4c83d9be5cc36c3e9fe86239955e88b19 Mon Sep 17 00:00:00 2001 From: Colin Dixon Date: Thu, 11 Apr 2013 15:26:37 -0700 Subject: [PATCH] fixing warnings Change-Id: Iae2f073fb9733d0b1bdedd2aa05815fc25063e9a Signed-off-by: Colin Dixon --- .../clustering/services/IClusterServices.java | 2 +- .../stub/internal/ClusterManagerCommon.java | 2 +- .../clustering/test/internal/SimpleClient.java | 13 +++++++++---- .../controller/hosttracker/HostTracker.java | 1 + .../hosttracker/hostAware/HostNodeConnector.java | 1 + .../sal/core/ContainerServiceDependency.java | 5 +++++ .../org/opendaylight/controller/sal/core/Node.java | 6 +++--- .../controller/sal/core/NodeConnector.java | 6 +++--- .../controller/topology/web/Topology.java | 2 +- 9 files changed, 25 insertions(+), 13 deletions(-) diff --git a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServices.java b/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServices.java index 031434f8e8..68960baa07 100644 --- a/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServices.java +++ b/opendaylight/clustering/services/src/main/java/org/opendaylight/controller/clustering/services/IClusterServices.java @@ -118,7 +118,7 @@ public interface IClusterServices { * * @return ConcurrentHashMap to be used to modify the data structure */ - ConcurrentMap getCache(String containerName, String cacheName); + ConcurrentMap getCache(String containerName, String cacheName); /** * Destroy a cachename given containerName/cachename, if doesn't exist diff --git a/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java b/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java index 13d05bb7be..6fa0d6e96e 100644 --- a/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java +++ b/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java @@ -88,7 +88,7 @@ abstract public class ClusterManagerCommon implements IClusterServicesCommon { CacheConfigException { ConcurrentMap res = this.caches.get(cacheName); if (res == null) { - res = new ConcurrentHashMap(); + res = new ConcurrentHashMap(); this.caches.put(cacheName, res); return res; } diff --git a/opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/SimpleClient.java b/opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/SimpleClient.java index 3e9717fa62..b6ab95db33 100644 --- a/opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/SimpleClient.java +++ b/opendaylight/clustering/test/src/main/java/org/opendaylight/controller/clustering/test/internal/SimpleClient.java @@ -243,6 +243,7 @@ public class SimpleClient implements CommandProvider { } } + @SuppressWarnings("deprecation") //IGetUpdates intentionally deprecated public void _unlisten(CommandInterpreter ci) { if (this.icluster == null) { ci.println("\nNo Clustering services available"); @@ -370,7 +371,7 @@ public class SimpleClient implements CommandProvider { } public void _dumper(CommandInterpreter ci) { - ConcurrentMap c; + ConcurrentMap c; String containerName = ci.nextArgument(); if (containerName == null) { ci.println("containerName not supplied"); @@ -381,10 +382,10 @@ public class SimpleClient implements CommandProvider { ci.println("Cache not supplied"); return; } - c = (ConcurrentMap) this.icluster.getCache(containerName, cacheName); + c = (ConcurrentMap) this.icluster.getCache(containerName, cacheName); if (c != null) { - for (Object e : c.entrySet()) { - Map.Entry entry = (Map.Entry) e; + for (Map.Entry e : c.entrySet()) { + Map.Entry entry = e; Object v = entry.getValue(); String res = ""; if (v != null) { @@ -437,6 +438,7 @@ public class SimpleClient implements CommandProvider { } } + @SuppressWarnings("deprecation") //TODO: remove call to deprecated amIStandby public void _getRole(CommandInterpreter ci) { if (this.icluster == null) { ci.println("\nNo Clustering services available"); @@ -449,6 +451,7 @@ public class SimpleClient implements CommandProvider { ci.println("My role is: " + role); } + @SuppressWarnings("deprecation") //TODO: remove call to deprecated getActiveAddres public void _getActive(CommandInterpreter ci) { if (this.icluster == null) { ci.println("\nNo Clustering services available"); @@ -458,6 +461,7 @@ public class SimpleClient implements CommandProvider { + this.icluster.getActiveAddress()); } + @SuppressWarnings("deprecation") //TODO: remove use of deprecated listenRoleChange public void _listenActive(CommandInterpreter ci) { if (this.icluster == null) { ci.println("\nNo Clustering services available"); @@ -473,6 +477,7 @@ public class SimpleClient implements CommandProvider { ci.println("Register listenRoleChanges"); } + @SuppressWarnings("deprecation") //TODO: remove deprecated call to unlistenRoleChange public void _unlistenActive(CommandInterpreter ci) { if (this.icluster == null) { ci.println("\nNo Clustering services available"); diff --git a/opendaylight/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/HostTracker.java b/opendaylight/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/HostTracker.java index 96b6c05934..42802d324c 100644 --- a/opendaylight/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/HostTracker.java +++ b/opendaylight/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/HostTracker.java @@ -956,6 +956,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, } private class ARPRefreshHandler extends TimerTask { + @SuppressWarnings("deprecation") public void run() { if ((clusterContainerService != null) && !clusterContainerService.amICoordinator()) { diff --git a/opendaylight/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java b/opendaylight/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java index d18070d222..c83dc3d408 100644 --- a/opendaylight/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java +++ b/opendaylight/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java @@ -43,6 +43,7 @@ public class HostNodeConnector extends Host { /** * Private constructor used for JAXB mapping */ + @SuppressWarnings("unused") private HostNodeConnector() { } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ContainerServiceDependency.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ContainerServiceDependency.java index 29e9dfabb1..f37d0133e1 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ContainerServiceDependency.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ContainerServiceDependency.java @@ -46,6 +46,7 @@ public class ContainerServiceDependency implements ServiceDependency, this.containerName = containerName; } + @SuppressWarnings("rawtypes") // can't change org.apache.felix.dm.ServiceDependency @Override public ServiceDependency setService(Class serviceName) { this.m_dep.setService(serviceName, "(containerName=" @@ -53,6 +54,7 @@ public class ContainerServiceDependency implements ServiceDependency, return this; } + @SuppressWarnings("rawtypes") // can't change org.apache.felix.dm.ServiceDependency @Override public ServiceDependency setService(Class serviceName, String serviceFilter) { this.m_dep.setService(serviceName, "(&(containerName=" @@ -67,6 +69,7 @@ public class ContainerServiceDependency implements ServiceDependency, return this; } + @SuppressWarnings("rawtypes") // can't change org.apache.felix.dm.ServiceDependency @Override public ServiceDependency setService(Class serviceName, ServiceReference serviceReference) { @@ -163,6 +166,7 @@ public class ContainerServiceDependency implements ServiceDependency, .createCopy(), this.containerName); } + @SuppressWarnings("rawtypes") // can't change org.apache.felix.dm.ServiceDependency @Override public Dictionary getProperties() { return this.m_dep.getProperties(); @@ -193,6 +197,7 @@ public class ContainerServiceDependency implements ServiceDependency, return this.m_dep.isAutoConfig(); } + @SuppressWarnings("rawtypes") // can't change org.apache.felix.dm.ServiceDependency @Override public Class getAutoConfigType() { return this.m_dep.getAutoConfigType(); diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java index 206b3928ea..5c21294f46 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java @@ -53,8 +53,8 @@ public class Node implements Serializable { * surround. */ public static final class NodeIDType { - private static final ConcurrentHashMap compatibleType = - new ConcurrentHashMap(); + private static final ConcurrentHashMap> compatibleType = + new ConcurrentHashMap>(); /** * Identifier for an OpenFlow node */ @@ -113,7 +113,7 @@ public class Node implements Serializable { * @return true if registered, false otherwise */ public static boolean registerIDType(String type, - Class compatibleID) { + Class compatibleID) { if (compatibleType.get(type) != null) { return false; } else { diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeConnector.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeConnector.java index 86baaade02..59a184e573 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeConnector.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/NodeConnector.java @@ -50,8 +50,8 @@ public class NodeConnector implements Serializable { */ public static class NodeConnectorIDType { private static final - ConcurrentHashMap> compatibleType = - new ConcurrentHashMap>(); + ConcurrentHashMap, String>> compatibleType = + new ConcurrentHashMap, String>>(); /** * Represent a special port pointing toward the controller, * this is to send data packets toward the controller from @@ -175,7 +175,7 @@ public class NodeConnector implements Serializable { * @return true if registered, false otherwise */ public static boolean registerIDType(String type, - Class compatibleID, + Class compatibleID, String compatibleNode) { if (compatibleType.get(type) != null) { return false; diff --git a/opendaylight/web/topology/src/main/java/org/opendaylight/controller/topology/web/Topology.java b/opendaylight/web/topology/src/main/java/org/opendaylight/controller/topology/web/Topology.java index 51cdcfb434..285e33f53b 100644 --- a/opendaylight/web/topology/src/main/java/org/opendaylight/controller/topology/web/Topology.java +++ b/opendaylight/web/topology/src/main/java/org/opendaylight/controller/topology/web/Topology.java @@ -259,7 +259,7 @@ public class Topology { } } - CircleLayout layout = new CircleLayout(graph); + CircleLayout layout = new CircleLayout(graph); layout.setSize(new Dimension(1200, 365)); for (Map.Entry> v : newNodes.entrySet()) { Double x = layout.transform(v.getKey()).getX(); -- 2.36.6