Rename NonPresenceContainerNodeCodecContext

'StructuralContainerCodecContext' is a better name overall.

Change-Id: I8cec640b209b96929f1a9bc33bbfa6af3dde81e1
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/CodecDataObject.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObject.java
index f61dc2c50a76fa58e4668e8437257827e7497b5d..2377d7f2e639d941154b41de901aaeb5dd52c013 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObject.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CodecDataObject.java
@@ -90,8 +90,8 @@ public abstract class CodecDataObject<T extends DataObject> implements DataObjec
 
     private @NonNull Object emptyObject(final @NonNull Class<? extends DataObject> bindingClass) {
         final var childContext = context.getStreamChild(bindingClass);
-        if (childContext instanceof NonPresenceContainerNodeCodecContext<?> nonPresence) {
-            return nonPresence.emptyObject();
+        if (childContext instanceof StructuralContainerCodecContext<?> structural) {
+            return structural.emptyObject();
         }
         throw new VerifyException("Unexpected context " + childContext);
     }

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ContainerNodeCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ContainerNodeCodecContext.java
index 42806b014a0b56d4340958b45705ca2c766214d2..7369244a4f65af44d9c753b3382bb1aa9a42c511 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ContainerNodeCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ContainerNodeCodecContext.java
@@ -14,7 +14,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
 sealed class ContainerNodeCodecContext<D extends DataObject>
         extends DataObjectCodecContext<D, ContainerLikeRuntimeType<?, ?>> implements RpcInputCodec<D>
-        permits NonPresenceContainerNodeCodecContext {
+        permits StructuralContainerCodecContext {
     ContainerNodeCodecContext(final DataContainerCodecPrototype<ContainerLikeRuntimeType<?, ?>> prototype) {
         super(prototype);
     }

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecPrototype.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecPrototype.java
index ab6080409f96e9ab6bf31a8c5bfe74025df52ca1..964f0296f82727b3badb77d9f73890aeb64b1846 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecPrototype.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecPrototype.java
@@ -50,7 +50,7 @@ non-sealed class DataObjectCodecPrototype<T extends RuntimeTypeContainer> extend
             if (containerLike instanceof ContainerRuntimeType container
                 && container.statement().findFirstEffectiveSubstatement(PresenceEffectiveStatement.class)
                     .isEmpty()) {
-                return new NonPresenceContainerNodeCodecContext(this);
+                return new StructuralContainerCodecContext(this);
             }
             return new ContainerNodeCodecContext(this);
         } else if (type instanceof ListRuntimeType) {

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NonPresenceContainerNodeCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/StructuralContainerCodecContext.java
similarity index 86%
rename from binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NonPresenceContainerNodeCodecContext.java
rename to binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/StructuralContainerCodecContext.java
index 07fe4cb36775641beedc393053f3503ec9172c0a..fc39e259b27c366bb0352cbcda382e6ac6c4d50a 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/NonPresenceContainerNodeCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/StructuralContainerCodecContext.java
@@ -17,12 +17,12 @@ import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 /**
  * A {@link ContainerNodeCodecContext} specialized for {@code container}s which do not have a presence statement.
  */
-final class NonPresenceContainerNodeCodecContext<D extends DataObject> extends ContainerNodeCodecContext<D> {
+final class StructuralContainerCodecContext<D extends DataObject> extends ContainerNodeCodecContext<D> {
     private static final VarHandle EMPTY_OBJECT;
 
     static {
         try {
-            EMPTY_OBJECT = MethodHandles.lookup().findVarHandle(NonPresenceContainerNodeCodecContext.class,
+            EMPTY_OBJECT = MethodHandles.lookup().findVarHandle(StructuralContainerCodecContext.class,
                 "emptyObject", DataObject.class);
         } catch (NoSuchFieldException | IllegalAccessException e) {
             throw new ExceptionInInitializerError(e);
@@ -32,7 +32,7 @@ final class NonPresenceContainerNodeCodecContext<D extends DataObject> extends C
     @SuppressWarnings("unused")
     private volatile D emptyObject;
 
-    NonPresenceContainerNodeCodecContext(final DataContainerCodecPrototype<ContainerLikeRuntimeType<?, ?>> prototype) {
+    StructuralContainerCodecContext(final DataContainerCodecPrototype<ContainerLikeRuntimeType<?, ?>> prototype) {
         super(prototype);
     }