Merge "Fix raw references to SimpleNode"

diff --combined opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/xml/codec/XmlUtilsTest.java
index 9a9dd2f9b3c789fc5353fa2b2932841d1da53142,2fb44d3d6566b2e9fbd65c8060a43de8c94dafe6..2574bd681eeaf72762a8ff8c047fd0d5567f3390
--- 1/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/xml/codec/XmlUtilsTest.java
--- 2/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
@@@ -81,13 -81,13 +81,13 @@@ public class XmlUtilsTest 
    @Test
    public void testInputXmlToCompositeNode() {
      CompositeNode node = XmlUtils.inputXmlToCompositeNode(testRpc.getQName(), XML_CONTENT, schema);
-     ImmutableList<SimpleNode> input = (ImmutableList)node.getValue().get(0).getValue();
-     SimpleNode firstNode = input.get(0);
+     ImmutableList<SimpleNode<?>> input = (ImmutableList<SimpleNode<?>>)node.getValue().get(0).getValue();
+     SimpleNode<?> firstNode = input.get(0);
  
      Assert.assertEquals("id", firstNode.getNodeType().getLocalName());
      Assert.assertEquals("flowid", firstNode.getValue());
  
-     SimpleNode secondNode = input.get(1);
+     SimpleNode<?> secondNode = input.get(1);
      Assert.assertEquals("flow", secondNode.getNodeType().getLocalName());
  
      YangInstanceIdentifier instance = (YangInstanceIdentifier) secondNode.getValue();
@@@ -104,7 -104,7 +104,7 @@@
    @Test
    public void testInputCompositeNodeToXML() {
      CompositeNode input = XmlUtils.inputXmlToCompositeNode(testRpc.getQName(), XML_CONTENT, schema);
 -    List<Node<?>> childNodes = new ArrayList();
 +    List<Node<?>> childNodes = new ArrayList<>();
      childNodes.add(input);
      QName rpcQName = schema.getOperations().iterator().next().getQName();
      CompositeNode node = new ImmutableCompositeNode(rpcQName, input.getValue(), ModifyAction.REPLACE);