From ad0bc524d0143b93a15b1ce906f79c8192f77412 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 27 Jun 2023 21:04:40 +0200 Subject: [PATCH] Rename ContainerNodeCodecContext A better name is 'ContainerLikeCodecContext', mirroring binding to ContainerLikeRuntimeType. Change-Id: Ie2579010a4b7da15df8192c0bd8690b84d769ccd Signed-off-by: Robert Varga --- ...deCodecContext.java => ContainerLikeCodecContext.java} | 4 ++-- .../binding/dom/codec/impl/DataObjectCodecContext.java | 2 +- .../binding/dom/codec/impl/DataObjectCodecPrototype.java | 2 +- .../mdsal/binding/dom/codec/impl/RootCodecContext.java | 8 ++++---- .../mdsal/binding/dom/codec/impl/RpcInputCodec.java | 2 +- .../dom/codec/impl/StructuralContainerCodecContext.java | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) rename binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/{ContainerNodeCodecContext.java => ContainerLikeCodecContext.java} (90%) 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 7369244a4f..cef279a5c5 100644 --- 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 +sealed class ContainerLikeCodecContext extends DataObjectCodecContext> implements RpcInputCodec permits StructuralContainerCodecContext { - ContainerNodeCodecContext(final DataContainerCodecPrototype> prototype) { + ContainerLikeCodecContext(final DataContainerCodecPrototype> 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 a430a25251..4c9b0c5a8d 100644 --- 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 extends AbstractDataObjectCodecContext implements BindingDataObjectCodecTreeNode - 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 964f0296f8..21d8acde3e 100644 --- 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 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) 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 6008732b64..fcf8a03ba0 100644 --- 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 extends DataContainerCodecCon } }); - private final LoadingCache, ContainerNodeCodecContext> rpcDataByClass = CacheBuilder.newBuilder() + private final LoadingCache, ContainerLikeCodecContext> rpcDataByClass = CacheBuilder.newBuilder() .build(new CacheLoader<>() { @Override - public ContainerNodeCodecContext load(final Class key) { + public ContainerLikeCodecContext load(final Class key) { final BiFunction>> lookup; if (RpcInput.class.isAssignableFrom(key)) { lookup = BindingRuntimeTypes::findRpcInput; @@ -163,7 +163,7 @@ final class RootCodecContext 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 extends DataContainerCodecCon return getOrRethrow(notificationsByClass, notification); } - ContainerNodeCodecContext getRpc(final Class rpcInputOrOutput) { + ContainerLikeCodecContext getRpc(final Class 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 c1ddcfdea6..3af4821057 100644 --- 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()}. * *

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 fc39e259b2..3a79531807 100644 --- 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 extends ContainerNodeCodecContext { +final class StructuralContainerCodecContext extends ContainerLikeCodecContext { private static final VarHandle EMPTY_OBJECT; static { -- 2.36.6