Bug 2358 - Decrease Technical Debt

fix compilation eclipse ID error

Change-Id: I39398878338a9c02d6cc8219aa76d1c9e15c8e10
Signed-off-by: Jakub Toth <jatoth@cisco.com>
(cherry picked from commit d7b5e0619787f99844e19b9ef36f0a1793044f33)

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonNormalizedNodeBodyReader.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonNormalizedNodeBodyReader.java
index bacd38720cc1d83196acc652dbe5f0c4cdfc5e92..265811a86b006ab50c70dc75a780100a2712f9d1 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonNormalizedNodeBodyReader.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonNormalizedNodeBodyReader.java
@@ -93,8 +93,8 @@ public class JsonNormalizedNodeBodyReader extends AbstractIdentifierAwareJaxRsPr
             jsonParser.parse(reader);
 
             NormalizedNode<?, ?> result = resultHolder.getResult();
-            List<YangInstanceIdentifier.PathArgument> iiToDataList = new ArrayList<>();
-            InstanceIdentifierContext<SchemaNode> newIIContext;
+            final List<YangInstanceIdentifier.PathArgument> iiToDataList = new ArrayList<>();
+            InstanceIdentifierContext<? extends SchemaNode> newIIContext;
 
             if (isPost()) {
                 while (result instanceof AugmentationNode || result instanceof ChoiceNode) {
@@ -114,7 +114,7 @@ public class JsonNormalizedNodeBodyReader extends AbstractIdentifierAwareJaxRsPr
                 }
             }
 
-            YangInstanceIdentifier fullIIToData = YangInstanceIdentifier.create(Iterables.concat(
+            final YangInstanceIdentifier fullIIToData = YangInstanceIdentifier.create(Iterables.concat(
                             path.getInstanceIdentifier().getPathArguments(), iiToDataList));
 
             newIIContext = new InstanceIdentifierContext<>(fullIIToData, path.getSchemaNode(), path.getMountPoint(),

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/XmlNormalizedNodeBodyReader.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/XmlNormalizedNodeBodyReader.java
index 817d25847a479ba9df38d905d4df1d05fc548911..d2c75f7e0ccfb6b8f4d82d78e7ea0b0a1e0c7971 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/XmlNormalizedNodeBodyReader.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/XmlNormalizedNodeBodyReader.java
@@ -133,7 +133,7 @@ public class XmlNormalizedNodeBodyReader extends AbstractIdentifierAwareJaxRsPro
 
         final String docRootElm = doc.getDocumentElement().getLocalName();
         final List<YangInstanceIdentifier.PathArgument> iiToDataList = new ArrayList<>();
-        InstanceIdentifierContext<SchemaNode> outIIContext;
+        InstanceIdentifierContext<? extends SchemaNode> outIIContext;
 
 
         // FIXME the factory instance should be cached if the schema context is the same