From 5321e5f1af4693a9fb5c5e8c55fe5addeaba9f5e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 21 Apr 2023 01:35:12 +0200 Subject: [PATCH] CachingNormalizedNodeSerializer should not be instantiated We only use this class to act as a delegate towards the rest of the infrastructure. Remove its constructor. Change-Id: I245fe5204dc3872703c19df320a77789d5a4c6bb Signed-off-by: Robert Varga (cherry picked from commit 1bccf8759b8e6280d3e744d719b809d6efd64a85) --- .../impl/CachingNormalizedNodeSerializer.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingNormalizedNodeSerializer.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingNormalizedNodeSerializer.java index d746528b96..373577dbe7 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingNormalizedNodeSerializer.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/CachingNormalizedNodeSerializer.java @@ -38,12 +38,31 @@ final class CachingNormalizedNodeSerializer extends ForwardingBindingStreamEvent private final AbstractBindingNormalizedNodeCacheHolder cacheHolder; private final BindingToNormalizedStreamWriter delegate; - CachingNormalizedNodeSerializer(final AbstractBindingNormalizedNodeCacheHolder cacheHolder, + private CachingNormalizedNodeSerializer(final AbstractBindingNormalizedNodeCacheHolder cacheHolder, final DataContainerCodecContext subtreeRoot) { this.cacheHolder = requireNonNull(cacheHolder); delegate = new BindingToNormalizedStreamWriter(subtreeRoot, domWriter); } + /** + * Serializes supplied data using stream writer with child cache enabled. + * + * @param cacheHolder Binding to Normalized Node Cache holder + * @param subtreeRoot Codec Node for provided data object + * @param data Data to be serialized + * @return Normalized Node representation of data. + */ + static NormalizedNode serializeUsingStreamWriter(final AbstractBindingNormalizedNodeCacheHolder cacheHolder, + final DataContainerCodecContext subtreeRoot, final DataObject data) { + final var writer = new CachingNormalizedNodeSerializer(cacheHolder, subtreeRoot); + try { + subtreeRoot.eventStreamSerializer().serialize(data, writer); + } catch (final IOException e) { + throw new IllegalStateException(e); + } + return writer.domResult.getResult(); + } + @Override protected AnydataBindingStreamWriter delegate() { return delegate; @@ -109,23 +128,4 @@ final class CachingNormalizedNodeSerializer extends ForwardingBindingStreamEvent } return null; } - - /** - * Serializes supplied data using stream writer with child cache enabled. - * - * @param cacheHolder Binding to Normalized Node Cache holder - * @param subtreeRoot Codec Node for provided data object - * @param data Data to be serialized - * @return Normalized Node representation of data. - */ - static NormalizedNode serializeUsingStreamWriter(final AbstractBindingNormalizedNodeCacheHolder cacheHolder, - final DataContainerCodecContext subtreeRoot, final DataObject data) { - final var writer = new CachingNormalizedNodeSerializer(cacheHolder, subtreeRoot); - try { - subtreeRoot.eventStreamSerializer().serialize(data, writer); - } catch (final IOException e) { - throw new IllegalStateException(e); - } - return writer.domResult.getResult(); - } } \ No newline at end of file -- 2.36.6