From b06619ad1809697c37777a150522409d36e70153 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 7 Nov 2014 18:23:44 +0100 Subject: [PATCH] Fix non-generic references to ArrayList This patch adds the proper type specification. Change-Id: I2482a37cc7517e2a08846f8401a9d0104bebea3f Signed-off-by: Robert Varga --- .../org/opendaylight/controller/xml/codec/XmlUtilsTest.java | 2 +- .../controller/md/sal/dom/xsql/jdbc/JDBCResultSet.java | 2 +- .../controller/md/sal/dom/xsql/jdbc/JDBCStatement.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 60dbcb0516..9a9dd2f9b3 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 @@ -104,7 +104,7 @@ public class XmlUtilsTest { @Test public void testInputCompositeNodeToXML() { CompositeNode input = XmlUtils.inputXmlToCompositeNode(testRpc.getQName(), XML_CONTENT, schema); - List> childNodes = new ArrayList(); + List> childNodes = new ArrayList<>(); childNodes.add(input); QName rpcQName = schema.getOperations().iterator().next().getQName(); CompositeNode node = new ImmutableCompositeNode(rpcQName, input.getValue(), ModifyAction.REPLACE); diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCResultSet.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCResultSet.java index e47bf870cc..5abe8a3165 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCResultSet.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCResultSet.java @@ -207,7 +207,7 @@ public class JDBCResultSet implements Serializable, ResultSet, } } - public void addRecord(ArrayList hierarchy) { + public void addRecord(ArrayList hierarchy) { Map rec = new HashMap(); for (int i = hierarchy.size() - 1; i >= 0; i--) { Object element = hierarchy.get(i); diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCStatement.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCStatement.java index b71b015351..27e2196970 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCStatement.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCStatement.java @@ -89,7 +89,7 @@ public class JDBCStatement implements PreparedStatement { return true; } - public void addRecord(ArrayList hierarchy) { + public void addRecord(ArrayList hierarchy) { rs.addRecord(hierarchy); } -- 2.36.6