From 0032cbc207750ee84b76dfc395c29ade7adc76d4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 12 Jan 2024 12:24:34 +0100 Subject: [PATCH] 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 --- .../dom/codec/impl/AugmentationCodecContext.java | 4 ++-- .../binding/dom/codec/impl/CaseCodecContext.java | 5 ----- .../binding/dom/codec/impl/ChoiceCodecContext.java | 2 +- .../mdsal/binding/dom/codec/impl/CodecContext.java | 4 ++-- .../dom/codec/impl/ContainerLikeCodecContext.java | 5 ----- .../dom/codec/impl/DataContainerCodecContext.java | 2 +- .../dom/codec/impl/DataObjectCodecContext.java | 5 +++++ .../binding/dom/codec/impl/ListCodecContext.java | 2 +- .../dom/codec/impl/NotificationCodecContext.java | 5 ----- .../dom/codec/impl/ValueNodeCodecContext.java | 12 ++++++------ 10 files changed, 18 insertions(+), 28 deletions(-) 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 c4250f65a3..484e192f98 100644 --- 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> } @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> } @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 4e3d7482d3..fb7836042d 100644 --- 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 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 918b34c5b6..6fcecaafb5 100644 --- 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> } @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 55205517c6..c0e5dadc04 100644 --- 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 c3fc7ea7e2..22025d034d 100644 --- 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 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 2848884b27..80015eb53b 100644 --- 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 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 324b01f018..9f5bd7ee1a 100644 --- 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 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 311ec98e9c..65c2f512ac 100644 --- 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 -- 2.36.6