Rework NormalizedNode type hierarchy

[yangtools.git] / yang / yang-data-codec-binfmt / src / main / java / org / opendaylight / yangtools / yang / data / codec / binfmt / NormalizedNodeDataInput.java

diff --git a/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeDataInput.java b/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeDataInput.java
index 5e4c4cda9040c8ed1d714b56d4a0f9ade18d80ee..c7c73793f0fe754715157a55dbe7d7c14389f47f 100644 (file)
--- a/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeDataInput.java
+++ b/yang/yang-data-codec-binfmt/src/main/java/org/opendaylight/yangtools/yang/data/codec/binfmt/NormalizedNodeDataInput.java
@@ -45,7 +45,7 @@ public interface NormalizedNodeDataInput extends DataInput {
      * @throws IOException if an error occurs
      * @throws IllegalStateException if the dictionary has been detached
      */
-    default NormalizedNode<?, ?> readNormalizedNode() throws IOException {
+    default NormalizedNode readNormalizedNode() throws IOException {
         return readNormalizedNode(ReusableImmutableNormalizedNodeStreamWriter.create());
     }
 
@@ -57,7 +57,7 @@ public interface NormalizedNodeDataInput extends DataInput {
      * @throws IOException if an error occurs
      * @throws IllegalStateException if the dictionary has been detached
      */
-    default NormalizedNode<?, ?> readNormalizedNode(final ReusableStreamReceiver receiver) throws IOException {
+    default NormalizedNode readNormalizedNode(final ReusableStreamReceiver receiver) throws IOException {
         try {
             streamNormalizedNode(receiver);
             return receiver.getResult();
@@ -85,7 +85,7 @@ public interface NormalizedNodeDataInput extends DataInput {
      */
     NormalizedNodeStreamVersion getVersion() throws IOException;
 
-    default Optional<NormalizedNode<?, ?>> readOptionalNormalizedNode() throws IOException {
+    default Optional<NormalizedNode> readOptionalNormalizedNode() throws IOException {
         return readBoolean() ? Optional.of(readNormalizedNode()) : Optional.empty();
     }