Migrate sli to sulfur sr1

Migrate sli to OpenDaylight Sulfur release

Issue-ID: CCSDK-3693
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I3ca6fb12a03038a9447747650ea2a6e6d6e71d9d

11 files changed, 58 insertions, 47 deletions

diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml
index 451c4057d..876b7ddf4 100755
--- a/plugins/restconf-client/installer/pom.xml
+++ b/plugins/restconf-client/installer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restconf-client/pom.xml b/plugins/restconf-client/pom.xml
index b9888d8dd..56c93b148 100755
--- a/plugins/restconf-client/pom.xml
+++ b/plugins/restconf-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml
index 242603f72..bf0d18e1f 100755
--- a/plugins/restconf-client/provider/pom.xml
+++ b/plugins/restconf-client/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.4.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
@@ -69,6 +69,16 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-parser-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-repo-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java
index 4a2e18198..2e4a6c34c 100644
--- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java
+++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java
@@ -87,8 +87,9 @@ import org.opendaylight.restconf.nb.rfc8040.utils.parser.ParserIdentifier;
 import org.opendaylight.yangtools.yang.common.XMLNamespace;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
-import org.opendaylight.yangtools.yang.model.parser.api.YangParserException;
-import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory;
+
+import org.opendaylight.yangtools.yang.parser.api.YangParserException;
+import org.opendaylight.yangtools.yang.parser.api.YangParserFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -185,7 +186,7 @@ public class RestconfApiCallNode implements SvcLogicJavaPlugin {
             String pp = p.responsePrefix != null ? p.responsePrefix + '.' : "";
             Map<String, String> props = new HashMap<>((Map)ctx.toProperties());
             String uri = parseUrl(p.restapiUrl, p.httpMethod);
-            InstanceIdentifierContext<?> insIdCtx = getInsIdCtx(p, uri);
+            InstanceIdentifierContext insIdCtx = getInsIdCtx(p, uri);
 
             String req = null;
             if (p.httpMethod != GET && p.httpMethod != DELETE) {
@@ -311,7 +312,7 @@ public class RestconfApiCallNode implements SvcLogicJavaPlugin {
      * @return instance identifier context
      * @throws SvcLogicException when getting schema context fails
      */
-    private InstanceIdentifierContext<?> getInsIdCtx(YangParameters params,
+    private InstanceIdentifierContext getInsIdCtx(YangParameters params,
                                                      String uri)
             throws SvcLogicException {
         EffectiveModelContext context = getSchemaContext(params);
@@ -394,7 +395,7 @@ public class RestconfApiCallNode implements SvcLogicJavaPlugin {
      * @throws SvcLogicException when the data format type is wrong
      */
     public String updateReq(String req, YangParameters p,
-                             InstanceIdentifierContext<?> insIdCtx)
+                             InstanceIdentifierContext insIdCtx)
             throws SvcLogicException {
 
         SchemaNode schemaNode = insIdCtx.getSchemaNode();
diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java
index 134868c15..ee5dacdce 100644
--- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java
+++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java
@@ -25,7 +25,6 @@ package org.onap.ccsdk.sli.plugins.restconfapicall;
 
 import static org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode.getParameters;
 import static org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode.parseParam;
-import static org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource.forFile;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -39,10 +38,11 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.plugins.restapicall.HttpMethod;
 import org.onap.ccsdk.sli.plugins.yangserializers.dfserializer.YangParameters;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
-import org.opendaylight.yangtools.yang.model.parser.api.YangParser;
-import org.opendaylight.yangtools.yang.model.parser.api.YangParserException;
-import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory;
-import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException;
+import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
+import org.opendaylight.yangtools.yang.parser.api.YangParser;
+import org.opendaylight.yangtools.yang.parser.api.YangParserException;
+import org.opendaylight.yangtools.yang.parser.api.YangParserFactory;
+import org.opendaylight.yangtools.yang.parser.api.YangSyntaxErrorException;
 
 /**
  * Utilities for restconf api call node.
@@ -193,7 +193,7 @@ public final class RestconfApiUtils {
         YangParser parser = parserFactory.createParser();
         for (File file : yangFiles) {
             try {
-                parser.addSource(forFile(file));
+                parser.addSource(YangTextSchemaSource.forPath(file.toPath()));
             } catch (IOException | YangSyntaxErrorException e) {
                 throw new SvcLogicException(YANG_FILE_ERR + e.getMessage(), e);
             }
diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java
index 9b0a31d09..efbbc0458 100644
--- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java
+++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java
@@ -262,7 +262,7 @@ public final class MdsalPropertiesNodeUtils {
 
         String uri1 = uri.replaceAll(UNDERSCORE, COLON);
         try {
-            InstanceIdentifierContext<?> id = toInstanceIdentifier(
+            InstanceIdentifierContext id = toInstanceIdentifier(
                     uri1, context, Optional.ofNullable(null));
             return new SchemaPathHolder(id, uri1);
         } catch (IllegalArgumentException | RestconfDocumentedException
@@ -335,7 +335,7 @@ public final class MdsalPropertiesNodeUtils {
         if (node.contains(UNDERSCORE)) {
             secondHalf = node.substring(values[0].length()+1);
         }
-        InstanceIdentifierContext<?> id;
+        InstanceIdentifierContext id;
         for (int i = 0; i< values.length-1; i++) {
             val = values[i];
             val = firstHalf + val + COLON + secondHalf;
diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfapicall/TestRestconfApiUtils.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfapicall/TestRestconfApiUtils.java
index a76bb52bf..153f6c2ad 100644
--- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfapicall/TestRestconfApiUtils.java
+++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfapicall/TestRestconfApiUtils.java
@@ -6,8 +6,8 @@ import static org.junit.Assert.assertNull;
 import org.junit.Test;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
-import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory;
-import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl;
+import org.opendaylight.yangtools.yang.parser.api.YangParserFactory;
+import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory;
 
 /*-
  * ============LICENSE_START=======================================================
@@ -34,7 +34,7 @@ public class TestRestconfApiUtils {
     @Test 
     public void testGetSchemaCtxFromDir() throws SvcLogicException {
 
-        YangParserFactory factory = new YangParserFactoryImpl();
+        YangParserFactory factory = new DefaultYangParserFactory();
         
 
         // Test with valid subdirectories
diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java
index 64173306d..02d52d215 100644
--- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java
+++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java
@@ -29,7 +29,7 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode;
 import org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode;
-import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl;
+import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory;
 
 import java.io.IOException;
 import java.net.URI;
@@ -38,7 +38,7 @@ import java.util.Map;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -107,7 +107,7 @@ public class TestRestconfDiscoveryNode {
         Map<String, String> p = new HashMap<>();
 
         RestconfDiscoveryNode rdn = new RestconfDiscoveryNode(
-                new RestconfApiCallNode(new RestapiCallNode(), new YangParserFactoryImpl()));
+                new RestconfApiCallNode(new RestapiCallNode(), new DefaultYangParserFactory()));
         rdn.establishSubscription(p, ctx);
     }
 
@@ -117,7 +117,7 @@ public class TestRestconfDiscoveryNode {
         ctx.setAttribute("restapi-result.response-code", "200");
         ctx.setAttribute("response-code", "404");
         RestconfDiscoveryNode rdn = new RestconfDiscoveryNode(
-                new RestconfApiCallNode(new RestapiCallNode(), new YangParserFactoryImpl()));
+                new RestconfApiCallNode(new RestapiCallNode(), new DefaultYangParserFactory()));
         assertThat(rdn.getResponseCode("restapi-result", ctx),
                    is("200"));
         assertThat(rdn.getResponseCode(null, ctx),
@@ -133,7 +133,7 @@ public class TestRestconfDiscoveryNode {
         ctx.setAttribute("ietf-subscribed-notifications:establish-subscripti" +
                                  "on.output.identifier", "89");
         RestconfDiscoveryNode rdn = new RestconfDiscoveryNode(
-                new RestconfApiCallNode(new RestapiCallNode(), new YangParserFactoryImpl()));
+                new RestconfApiCallNode(new RestapiCallNode(), new DefaultYangParserFactory()));
         assertThat(rdn.getOutputIdentifier("restapi-result", ctx),
                    is("89"));
     }
@@ -144,7 +144,7 @@ public class TestRestconfDiscoveryNode {
                 "futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarny" +
                 "le3sdcqq9hftc4lebz464b5ffxmlbvg9";
         RestconfDiscoveryNode rdn = new RestconfDiscoveryNode(
-                new RestconfApiCallNode(new RestapiCallNode(), new YangParserFactoryImpl()));
+                new RestconfApiCallNode(new RestapiCallNode(), new DefaultYangParserFactory()));
 
         assertThat(rdn.getTokenId(customHttpHeaders),
                    is("x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqkt" +
diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java
index a5353fad4..7f04bbaa9 100644
--- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java
+++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java
@@ -33,12 +33,12 @@ import org.onap.ccsdk.sli.plugins.restapicall.HttpResponse;
 import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode;
 import org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode;
 import org.opendaylight.restconf.common.context.InstanceIdentifierContext;
-import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory;
-import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl;
+import org.opendaylight.yangtools.yang.parser.api.YangParserFactory;
+import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.doReturn;
@@ -94,7 +94,7 @@ public class DataFormatSerializerTest {
         p.put("responsePrefix", "response");
         p.put("skipSending", "true");
         restApi = new RestapiCallNode();
-        parserFactory = new YangParserFactoryImpl();
+        parserFactory = new DefaultYangParserFactory();
         restconf = mock(RestconfApiCallNode.class);
         dfCaptor = new DfCaptor();
         createMethodMocks();
diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java
index 9abbb16b7..ca148033b 100644
--- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java
+++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java
@@ -33,12 +33,12 @@ import org.onap.ccsdk.sli.plugins.restapicall.HttpResponse;
 import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode;
 import org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode;
 import org.opendaylight.restconf.common.context.InstanceIdentifierContext;
-import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory;
-import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl;
+import org.opendaylight.yangtools.yang.parser.api.YangParserFactory;
+import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doCallRealMethod;
 import static org.mockito.Mockito.doReturn;
@@ -83,7 +83,7 @@ public class IdentifierValidationTest {
         p.put("responsePrefix", "response");
         p.put("skipSending", "true");
         restApi = new RestapiCallNode();
-        parserFactory = new YangParserFactoryImpl();
+        parserFactory = new DefaultYangParserFactory();
         restconf = mock(RestconfApiCallNode.class);
         dfCaptor = new DfCaptor();
         createMethodMocks();
diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java
index 2bcd45e2b..ff5871519 100644
--- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java
+++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java
@@ -83,7 +83,7 @@ public final class PropertiesSerializerTest {
         params.put("test-yang_cont1.cont2.ll3[1]", "abc");
         params.put("test-yang_cont1.cont2.ll4[0]", "abc");
         params.put("test-yang_cont1.cont2.ll4[1]", "abc");
-        InstanceIdentifierContext<?> iCtx = ParserIdentifier
+        InstanceIdentifierContext iCtx = ParserIdentifier
                 .toInstanceIdentifier(uri, context, null);
 
         PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer(
@@ -293,7 +293,7 @@ public final class PropertiesSerializerTest {
         params.put("test-yang_cont1.cont2.ll5[0]", "abc");
         params.put("test-yang_cont1.cont2.ll5[1]", "abc");
 
-        InstanceIdentifierContext<?> iCtx = ParserIdentifier
+        InstanceIdentifierContext iCtx = ParserIdentifier
                 .toInstanceIdentifier(uri, context, null);
         PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer(
                 iCtx.getSchemaNode(), context, uri);
@@ -401,7 +401,7 @@ public final class PropertiesSerializerTest {
         params.put("test-yang_cont8.ll7[0]", "abc");
         params.put("test-yang_cont8.ll7[1]", "abc");
 
-        InstanceIdentifierContext<?> iCtx = ParserIdentifier
+        InstanceIdentifierContext iCtx = ParserIdentifier
                 .toInstanceIdentifier(uri, context, null);
         PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer(
                 iCtx.getSchemaNode(), context, uri);
@@ -460,7 +460,7 @@ public final class PropertiesSerializerTest {
         params.put("test-yang_cont9.ll8[0]", "abc");
         params.put("test-yang_cont9.cont11.leaf25", "abc");
 
-        InstanceIdentifierContext<?> iCtx = ParserIdentifier
+        InstanceIdentifierContext iCtx = ParserIdentifier
                 .toInstanceIdentifier(uri, context, null);
         PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer(
                 iCtx.getSchemaNode(), context, uri);
@@ -498,7 +498,7 @@ public final class PropertiesSerializerTest {
         Map<String, String> params = new HashMap<>();
         params.put("test-yang_cont8.cont6.test-augment_leaf21", "abc");
 
-        InstanceIdentifierContext<?> iCtx = ParserIdentifier
+        InstanceIdentifierContext iCtx = ParserIdentifier
                 .toInstanceIdentifier(uri, context, null);
         PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer(
                 iCtx.getSchemaNode(), context, uri);
@@ -540,7 +540,7 @@ public final class PropertiesSerializerTest {
         params.put("test-yang_cont13.leaf28", "abc");
         params.put("test-yang_cont13.ll9[0]", "abc");
 
-        InstanceIdentifierContext<?> iCtx = ParserIdentifier
+        InstanceIdentifierContext iCtx = ParserIdentifier
                 .toInstanceIdentifier(uri, context, null);
         PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer(
                 iCtx.getSchemaNode(), context, uri);
@@ -589,7 +589,7 @@ public final class PropertiesSerializerTest {
         params.put("test-yang_cont9.cont11.cont13.list9[0].leaf27", "abc");
         params.put("test-yang_cont9.cont11.cont13.leaf28", "abc");
         params.put("test-yang_cont9.cont11.cont13.ll9[0]", "abc");
-        InstanceIdentifierContext<?> iCtx = ParserIdentifier
+        InstanceIdentifierContext iCtx = ParserIdentifier
                 .toInstanceIdentifier(uri, context, null);
         PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer(
                 iCtx.getSchemaNode(), context, uri);
@@ -643,7 +643,7 @@ public final class PropertiesSerializerTest {
         params.put("test-augment_cont13.list9[0].leaf27", "abc");
         params.put("test-augment_cont13.leaf28", "abc");
         params.put("test-augment_cont13.ll9[0]", "abc");
-        InstanceIdentifierContext<?> iCtx = ParserIdentifier
+        InstanceIdentifierContext iCtx = ParserIdentifier
                 .toInstanceIdentifier(uri, context, null);
         PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer(
                 iCtx.getSchemaNode(), context, uri);
@@ -695,7 +695,7 @@ public final class PropertiesSerializerTest {
         params.put("test-yang_cont1.cont2.cont4.test-augment_cont13.leaf28", "abc");
         params.put("test-yang_cont1.cont2.cont4.test-augment_cont13.ll9[0]", "abc");
 
-        InstanceIdentifierContext<?> iCtx = ParserIdentifier
+        InstanceIdentifierContext iCtx = ParserIdentifier
                 .toInstanceIdentifier(uri, context, null);
         PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer(
                 iCtx.getSchemaNode(), context, uri);
@@ -763,7 +763,7 @@ public final class PropertiesSerializerTest {
         params.put("test-yang_create-sfc.input.cont13.ll9[0]", "abc");
         params.put("test-yang_create-sfc.input.test-augment_leaf36", "abc");
 
-        InstanceIdentifierContext<?> iCtx = ParserIdentifier
+        InstanceIdentifierContext iCtx = ParserIdentifier
                 .toInstanceIdentifier(uri, context, null);
         PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer(
                 iCtx.getSchemaNode(), context, uri);
@@ -877,7 +877,7 @@ public final class PropertiesSerializerTest {
         params.put("test-yang_create-sfc.output.cont13.ll9[0]", "abc");
         params.put("test-yang_create-sfc.output.test-augment_leaf37", "abc");
 
-        InstanceIdentifierContext<?> iCtx = ParserIdentifier
+        InstanceIdentifierContext iCtx = ParserIdentifier
                 .toInstanceIdentifier(uri, context, null);
         PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer(
                 iCtx.getSchemaNode(), context, uri);
@@ -985,7 +985,7 @@ public final class PropertiesSerializerTest {
         params.put("test-yang_cont18.cont18.list12[1].list12[0].leaf36", "xyz");
         params.put("test-yang_cont18.cont18.list12[1].list12[1].leaf36", "hey!");
 
-        InstanceIdentifierContext<?> iCtx = ParserIdentifier
+        InstanceIdentifierContext iCtx = ParserIdentifier
                 .toInstanceIdentifier(uri, context, null);
         PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer(
                 iCtx.getSchemaNode(), context, uri);
@@ -1056,7 +1056,7 @@ public final class PropertiesSerializerTest {
         params.put("leaf41", "hi");
         params.put("test-yang_cont18.leaf41", "abc");
 
-        InstanceIdentifierContext<?> iCtx = ParserIdentifier
+        InstanceIdentifierContext iCtx = ParserIdentifier
                 .toInstanceIdentifier(uri, context, null);
         PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer(
                 iCtx.getSchemaNode(), context, uri);
@@ -1078,7 +1078,7 @@ public final class PropertiesSerializerTest {
         params.put("identity-test_test.con1.interfaces.int-list[0].available.ll[0]", "identity-types:Loopback");
         params.put("identity-test_test.con1.interfaces.int-list[0].available.leaf1", "identity-types-second:Ethernet");
         params.put("identity-test_test.con1.interfaces.int-list[0].available.leaf2", "identity-types-second:iden2");
-        InstanceIdentifierContext<?> iCtx = ParserIdentifier
+        InstanceIdentifierContext iCtx = ParserIdentifier
                 .toInstanceIdentifier(uri, context, null);
 
         PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer(