Rename ContainerNodeCodecContext

A better name is 'ContainerLikeCodecContext', mirroring binding to
ContainerLikeRuntimeType.

Change-Id: Ie2579010a4b7da15df8192c0bd8690b84d769ccd
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/ContainerNodeCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ContainerLikeCodecContext.java
similarity index 90%
rename from binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ContainerNodeCodecContext.java
rename to binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ContainerLikeCodecContext.java
index 7369244a4f65af44d9c753b3382bb1aa9a42c511..cef279a5c5043ab9251179929371479321dbed40 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/ContainerLikeCodecContext.java
@@ -12,10 +12,10 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
-sealed class ContainerNodeCodecContext<D extends DataObject>
+sealed class ContainerLikeCodecContext<D extends DataObject>
         extends DataObjectCodecContext<D, ContainerLikeRuntimeType<?, ?>> implements RpcInputCodec<D>
         permits StructuralContainerCodecContext {
-    ContainerNodeCodecContext(final DataContainerCodecPrototype<ContainerLikeRuntimeType<?, ?>> prototype) {
+    ContainerLikeCodecContext(final DataContainerCodecPrototype<ContainerLikeRuntimeType<?, ?>> prototype) {
         super(prototype);
     }
 

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 a430a25251a8cd66fd95680ec60d51b390576f2d..4c9b0c5a8d908ef76b843547fc9df6117d6c6111 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
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
 @Beta
 public abstract sealed class DataObjectCodecContext<D extends DataObject, T extends CompositeRuntimeType>
         extends AbstractDataObjectCodecContext<D, T> implements BindingDataObjectCodecTreeNode<D>
-        permits CaseNodeCodecContext, ContainerNodeCodecContext, ListNodeCodecContext, NotificationCodecContext {
+        permits CaseNodeCodecContext, ContainerLikeCodecContext, ListNodeCodecContext, NotificationCodecContext {
     private static final Logger LOG = LoggerFactory.getLogger(DataObjectCodecContext.class);
 
     private static final VarHandle MISMATCHED_AUGMENTED;

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 964f0296f82727b3badb77d9f73890aeb64b1846..21d8acde3e4e907712728bd8a72fb35d65a5fad0 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
@@ -52,7 +52,7 @@ non-sealed class DataObjectCodecPrototype<T extends RuntimeTypeContainer> extend
                     .isEmpty()) {
                 return new StructuralContainerCodecContext(this);
             }
-            return new ContainerNodeCodecContext(this);
+            return new ContainerLikeCodecContext(this);
         } else if (type instanceof ListRuntimeType) {
             return KeyAware.class.isAssignableFrom(getBindingClass())
                     ? KeyedListNodeCodecContext.create((DataContainerCodecPrototype<ListRuntimeType>) this)

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/RootCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/RootCodecContext.java
index 6008732b64aa43710c6d49ef14e30ea83d197b2c..fcf8a03ba092652f1a0561943052f999c778a728 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/RootCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/RootCodecContext.java
@@ -125,10 +125,10 @@ final class RootCodecContext<D extends DataObject> extends DataContainerCodecCon
             }
         });
 
-    private final LoadingCache<Class<?>, ContainerNodeCodecContext<?>> rpcDataByClass = CacheBuilder.newBuilder()
+    private final LoadingCache<Class<?>, ContainerLikeCodecContext<?>> rpcDataByClass = CacheBuilder.newBuilder()
         .build(new CacheLoader<>() {
             @Override
-            public ContainerNodeCodecContext<?> load(final Class<?> key) {
+            public ContainerLikeCodecContext<?> load(final Class<?> key) {
                 final BiFunction<BindingRuntimeTypes, QName, Optional<? extends ContainerLikeRuntimeType<?, ?>>> lookup;
                 if (RpcInput.class.isAssignableFrom(key)) {
                     lookup = BindingRuntimeTypes::findRpcInput;
@@ -163,7 +163,7 @@ final class RootCodecContext<D extends DataObject> extends DataContainerCodecCon
                         final ContainerLikeRuntimeType<?, ?> type = lookup.apply(context.getTypes(), potentialQName)
                             .orElseThrow(() -> new IllegalArgumentException("Cannot find runtime type for " + key));
 
-                        return (ContainerNodeCodecContext) DataContainerCodecPrototype.from(key,
+                        return (ContainerLikeCodecContext) DataContainerCodecPrototype.from(key,
                             (ContainerLikeRuntimeType<?, ?>) type, factory).get();
                     }
                 }
@@ -277,7 +277,7 @@ final class RootCodecContext<D extends DataObject> extends DataContainerCodecCon
         return getOrRethrow(notificationsByClass, notification);
     }
 
-    ContainerNodeCodecContext<?> getRpc(final Class<? extends DataContainer> rpcInputOrOutput) {
+    ContainerLikeCodecContext<?> getRpc(final Class<? extends DataContainer> rpcInputOrOutput) {
         return getOrRethrow(rpcDataByClass, rpcInputOrOutput);
     }
 

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/RpcInputCodec.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/RpcInputCodec.java
index c1ddcfdea60b1e35ea8fdee68ccf85e46449d7ad..3af4821057478630474150b5f0d62a5825810c52 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/RpcInputCodec.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/RpcInputCodec.java
@@ -13,7 +13,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 
 /**
  * Marker interface for codecs dealing with RPC input being potentially unmapped. We use this interface to mark both
- * {@link UnmappedRpcInputCodec} and {@link ContainerNodeCodecContext}, which results in bimorphic invocation in
+ * {@link UnmappedRpcInputCodec} and {@link ContainerLikeCodecContext}, which results in bimorphic invocation in
  * {@link BindingNormalizedNodeSerializer#fromNormalizedNodeRpcData()}.
  *
  * <p>

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/StructuralContainerCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/StructuralContainerCodecContext.java
index fc39e259b27c366bb0352cbcda382e6ac6c4d50a..3a7953180752a28fd70daa4c0981dddd923d4ced 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/StructuralContainerCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/StructuralContainerCodecContext.java
@@ -15,9 +15,9 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 
 /**
- * A {@link ContainerNodeCodecContext} specialized for {@code container}s which do not have a presence statement.
+ * A {@link ContainerLikeCodecContext} specialized for {@code container}s which do not have a presence statement.
  */
-final class StructuralContainerCodecContext<D extends DataObject> extends ContainerNodeCodecContext<D> {
+final class StructuralContainerCodecContext<D extends DataObject> extends ContainerLikeCodecContext<D> {
     private static final VarHandle EMPTY_OBJECT;
 
     static {