Hide CodecContext methods

There is no point having these protected, just make them
package-private.

While we are here, also centralize implementations, as otherwise we have
duplicates.

JIRA: MDSAL-815
Change-Id: I7d708c5d508f49fb8c3224463d8c36fd9cf5e021
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/AugmentationCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/AugmentationCodecContext.java
index c4250f65a36cf99a1f538057475054dc1742842b..484e192f98bc32460ad3ce8d53dd7dc1db087672 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/AugmentationCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/AugmentationCodecContext.java
@@ -92,7 +92,7 @@ final class AugmentationCodecContext<D extends DataObject & Augmentation<?>>
     }
 
     @Override
-    protected Object deserializeObject(final NormalizedNode normalizedNode) {
+    Object deserializeObject(final NormalizedNode normalizedNode) {
         return filterFrom(checkDataArgument(DataContainerNode.class, normalizedNode));
     }
 
@@ -102,7 +102,7 @@ final class AugmentationCodecContext<D extends DataObject & Augmentation<?>>
     }
 
     @Override
-    protected NodeIdentifier getDomPathArgument() {
+    NodeIdentifier getDomPathArgument() {
         return null;
     }
 

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CaseCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CaseCodecContext.java
index 4e3d7482d38477d9988e225af8a35a3aca64f7ad..fb7836042dbe6dc289b0d8daa1782330bd833709 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CaseCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CaseCodecContext.java
@@ -30,11 +30,6 @@ final class CaseCodecContext<D extends DataObject> extends DataObjectCodecContex
         return createBindingProxy(checkDataArgument(ChoiceNode.class, data));
     }
 
-    @Override
-    protected Object deserializeObject(final NormalizedNode normalizedNode) {
-        return deserialize(normalizedNode);
-    }
-
     @Override
     public PathArgument serializePathArgument(final DataObjectStep<?> step) {
         if (step != null) {

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceCodecContext.java
index 918b34c5b65393ed070e818f033ac1de7555c4aa..6fcecaafb50d8bbf77ded8d923105b2404dd8ddc 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceCodecContext.java
@@ -226,7 +226,7 @@ final class ChoiceCodecContext<T extends ChoiceIn<?>>
     }
 
     @Override
-    protected T deserializeObject(final NormalizedNode normalizedNode) {
+    T deserializeObject(final NormalizedNode normalizedNode) {
         final var casted = checkDataArgument(ChoiceNode.class, normalizedNode);
         final var it = casted.body().iterator();
         if (!it.hasNext()) {

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecContext.java
index 55205517c65ef7bb6beacba8f740d8bad1fb83a6..c0e5dadc04631bd45d9ee60018d05073ca429c55 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecContext.java
@@ -31,7 +31,7 @@ abstract sealed class CodecContext implements BindingCodecTreeNode
      *
      * @return NodeIdentifier of node, or {@code null} if not applicable
      */
-    protected abstract @Nullable NodeIdentifier getDomPathArgument();
+    abstract @Nullable NodeIdentifier getDomPathArgument();
 
     /**
      * Return the default value object. Implementations of this method are explicitly allowed to throw unchecked
@@ -43,5 +43,5 @@ abstract sealed class CodecContext implements BindingCodecTreeNode
         return null;
     }
 
-    protected abstract Object deserializeObject(NormalizedNode normalizedNode);
+    abstract Object deserializeObject(NormalizedNode normalizedNode);
 }

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ContainerLikeCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ContainerLikeCodecContext.java
index c3fc7ea7e232e5b0f678c88e4fee8c9111306b20..22025d034d01737ada771740fa7f05f8b35a840a 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ContainerLikeCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ContainerLikeCodecContext.java
@@ -29,9 +29,4 @@ sealed class ContainerLikeCodecContext<D extends DataObject>
     public final D deserialize(final NormalizedNode data) {
         return createBindingProxy(checkDataArgument(ContainerNode.class, data));
     }
-
-    @Override
-    protected final Object deserializeObject(final NormalizedNode normalizedNode) {
-        return deserialize(normalizedNode);
-    }
 }

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java
index 2848884b277148ce1a9343210324234ea3e7b4f6..80015eb53be9eaf63d27ade5466a5e838ed13daa 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataContainerCodecContext.java
@@ -103,7 +103,7 @@ abstract sealed class DataContainerCodecContext<D extends DataContainer, R exten
 
     // overridden in AugmentationCodecContext
     @Override
-    protected NodeIdentifier getDomPathArgument() {
+    NodeIdentifier getDomPathArgument() {
         return prototype.yangArg();
     }
 

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java
index 91fe183ec45b87966ff4ea9964ecee8ae3c3cf60..d99da25ddc04f21dd914376af14c9089ea26dcc5 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java
@@ -342,4 +342,9 @@ public abstract sealed class DataObjectCodecContext<D extends DataObject, T exte
             throw new IllegalStateException(e);
         }
     }
+
+    @Override
+    Object deserializeObject(final NormalizedNode normalizedNode) {
+        return deserialize(normalizedNode);
+    }
 }

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ListCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ListCodecContext.java
index 4023e0d4ae81949dd017c7d0f0e66e1151fee29f..67c40502f3bcc1983dd12b9058bd53feca15436d 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ListCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ListCodecContext.java
@@ -49,7 +49,7 @@ sealed class ListCodecContext<D extends DataObject> extends DataObjectCodecConte
     }
 
     @Override
-    protected Object deserializeObject(final NormalizedNode node) {
+    Object deserializeObject(final NormalizedNode node) {
         if (node instanceof MapNode map) {
             return fromMap(map);
         } else if (node instanceof MapEntryNode mapEntry) {

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java
index 324b01f01863a48e3ffeac72c32740de9ca5587f..9f5bd7ee1a262e970d20715c55a801c2bf03eb05 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NotificationCodecContext.java
@@ -117,11 +117,6 @@ final class NotificationCodecContext<D extends DataObject & BaseNotification>
         return verifyNotNull(ret);
     }
 
-    @Override
-    protected Object deserializeObject(final NormalizedNode normalizedNode) {
-        return deserialize(normalizedNode);
-    }
-
     /**
      * Prototype for a {@code notification}. This class only exists because DataContainerCodecContext requires a
      * prototype.

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ValueNodeCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ValueNodeCodecContext.java
index 311ec98e9cd3964d03a4ea4d2d916b282a220ea1..65c2f512ace729d8664f6fd77662c40d35ccbaa0 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ValueNodeCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ValueNodeCodecContext.java
@@ -36,19 +36,19 @@ abstract sealed class ValueNodeCodecContext extends CodecContext implements Code
     }
 
     private final @NonNull NodeIdentifier yangIdentifier;
+    private final @NonNull DataSchemaNode dataSchema;
     private final @NonNull String getterName;
-    private final @NonNull DataSchemaNode schema;
     private final Object defaultObject;
 
-    ValueNodeCodecContext(final DataSchemaNode schema, final String getterName, final Object defaultObject) {
-        yangIdentifier = NodeIdentifier.create(schema.getQName());
+    ValueNodeCodecContext(final DataSchemaNode dataSchema, final String getterName, final Object defaultObject) {
         this.getterName = requireNonNull(getterName);
-        this.schema = requireNonNull(schema);
+        this.dataSchema = requireNonNull(dataSchema);
+        yangIdentifier = NodeIdentifier.create(dataSchema.getQName());
         this.defaultObject = defaultObject;
     }
 
     @Override
-    protected final NodeIdentifier getDomPathArgument() {
+    final NodeIdentifier getDomPathArgument() {
         return yangIdentifier;
     }
 
@@ -65,7 +65,7 @@ abstract sealed class ValueNodeCodecContext extends CodecContext implements Code
 
     @Override
     public final DataSchemaNode getSchema() {
-        return schema;
+        return dataSchema;
     }
 
     @Override