InstanceIdentifierContext does not take generics

[netconf.git] / restconf / restconf-nb-bierman02 / src / main / java / org / opendaylight / netconf / sal / rest / impl / NormalizedNodeJsonBodyWriter.java

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java
index f70768d11ddae798da93bde4e2489deb873e3c9c..a797215ac3f411638b39af4f2b03a8a70253ff1a 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java
@@ -91,9 +91,7 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter<Normalize
             return;
         }
 
-        @SuppressWarnings("unchecked")
-        final InstanceIdentifierContext<SchemaNode> identifierCtx =
-                (InstanceIdentifierContext<SchemaNode>) context.getInstanceIdentifierContext();
+        final InstanceIdentifierContext identifierCtx = context.getInstanceIdentifierContext();
 
         try (JsonWriter jsonWriter = createJsonWriter(entityStream, context.getWriterParameters().isPrettyPrint())) {
             jsonWriter.beginObject();
@@ -103,9 +101,9 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter<Normalize
         }
     }
 
-    private static void writeNormalizedNode(final JsonWriter jsonWriter,
-            final InstanceIdentifierContext<SchemaNode> context, NormalizedNode data,
-            final @Nullable Integer depth) throws IOException {
+    private static void writeNormalizedNode(final JsonWriter jsonWriter, final InstanceIdentifierContext context,
+            // Note: mutable argument
+            NormalizedNode data, final @Nullable Integer depth) throws IOException {
         SchemaPath path = context.getSchemaNode().getPath();
         final RestconfNormalizedNodeWriter nnWriter;
         if (SchemaPath.ROOT.equals(path)) {
@@ -158,7 +156,7 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter<Normalize
     }
 
     private static RestconfNormalizedNodeWriter createNormalizedNodeWriter(
-            final InstanceIdentifierContext<SchemaNode> context, final SchemaPath path, final JsonWriter jsonWriter,
+            final InstanceIdentifierContext context, final SchemaPath path, final JsonWriter jsonWriter,
             final @Nullable Integer depth) {
 
         final SchemaNode schema = context.getSchemaNode();
@@ -189,7 +187,7 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter<Normalize
         return JsonWriterFactory.createJsonWriter(new OutputStreamWriter(entityStream, StandardCharsets.UTF_8));
     }
 
-    private static JSONCodecFactory getCodecFactory(final InstanceIdentifierContext<?> context) {
+    private static JSONCodecFactory getCodecFactory(final InstanceIdentifierContext context) {
         // TODO: Performance: Cache JSON Codec factory and schema context
         return JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.getShared(context.getSchemaContext());
     }