From de4ef13b0a23eeec25e3cdd6461864d486707023 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 7 Nov 2014 18:45:21 +0100 Subject: [PATCH] Fix raw references to Iterator Adds type declarations to fix eclipse warnings. Change-Id: I33c9303bda2d5dd42632de2ec191e294d496e09b Signed-off-by: Robert Varga --- .../node/utils/serialization/NormalizedNodeSerializer.java | 2 +- .../org/opendaylight/controller/xml/codec/XmlUtilsTest.java | 2 +- .../controller/md/sal/dom/xsql/jdbc/JDBCServer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java index fae7eb1a33..c7bf7d1f7a 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java @@ -179,7 +179,7 @@ public class NormalizedNodeSerializer { ValueSerializer.serialize(builder, this, value); } else if (value instanceof Iterable) { - Iterable iterable = (Iterable) value; + Iterable iterable = (Iterable) value; for (Object o : iterable) { if (o instanceof NormalizedNode) { diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/xml/codec/XmlUtilsTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/xml/codec/XmlUtilsTest.java index 2574bd681e..cac58587a5 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/xml/codec/XmlUtilsTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/xml/codec/XmlUtilsTest.java @@ -92,7 +92,7 @@ public class XmlUtilsTest { YangInstanceIdentifier instance = (YangInstanceIdentifier) secondNode.getValue(); Iterable iterable = instance.getPathArguments(); - Iterator it = iterable.iterator(); + Iterator it = iterable.iterator(); YangInstanceIdentifier.NodeIdentifier firstPath = (YangInstanceIdentifier.NodeIdentifier) it.next(); Assert.assertEquals("node", firstPath.getNodeType().getLocalName()); YangInstanceIdentifier.NodeIdentifierWithPredicates secondPath = (YangInstanceIdentifier.NodeIdentifierWithPredicates)it.next(); diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java index 5be701f82e..5979771d28 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java @@ -121,7 +121,7 @@ public class JDBCServer extends Thread { while (entry.getValue().next()) { Map rec = entry.getValue().getCurrent(); Map newRec = new HashMap(); - for (Iterator iter = rec.entrySet().iterator(); iter.hasNext();) { + for (Iterator iter = rec.entrySet().iterator(); iter.hasNext();) { Map.Entry e = (Map.Entry) iter.next(); String key = (String) e.getKey(); Object value = e.getValue(); -- 2.36.6