From d2794d1ff53103a4e6863325e4eaf9e86da78ce1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 17 Feb 2016 16:17:32 +0100 Subject: [PATCH] Hide NormalizedNodeOutputStreamWriter This is an internal implementation class, hide it. Change-Id: Ib79d5a48dcf967f832b7130b981e5c22a593ef80 Signed-off-by: Robert Varga --- .../NormalizedNodeOutputStreamWriter.java | 8 ++------ .../datastore/DataTreeCandidatePayload.java | 4 ++-- .../datastore/messages/DataChanged.java | 19 +++++++++---------- .../MutableCompositeModification.java | 4 ++-- .../datastore/utils/SerializationUtils.java | 8 ++++---- 5 files changed, 19 insertions(+), 24 deletions(-) diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java index f68e86f1ae..5eaa7fc1b7 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java @@ -28,14 +28,10 @@ import org.opendaylight.yangtools.yang.common.QName; * Based on the each node, the node type is also written to the stream, that helps in reconstructing the object, * while reading. */ -public class NormalizedNodeOutputStreamWriter extends AbstractNormalizedNodeDataOutput { +final class NormalizedNodeOutputStreamWriter extends AbstractNormalizedNodeDataOutput { private final Map stringCodeMap = new HashMap<>(); - /** - * @deprecated Use {@link NormalizedNodeInputOutput#newDataOutput(DataOutput)} instead. - */ - @Deprecated - public NormalizedNodeOutputStreamWriter(final DataOutput output) { + NormalizedNodeOutputStreamWriter(final DataOutput output) { super(output); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCandidatePayload.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCandidatePayload.java index 5df291f327..21083618f0 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCandidatePayload.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCandidatePayload.java @@ -21,7 +21,7 @@ import java.util.Collections; import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataInput; import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataOutput; import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputStreamReader; -import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeOutputStreamWriter; +import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputOutput; import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; @@ -97,7 +97,7 @@ final class DataTreeCandidatePayload extends Payload implements Externalizable { static DataTreeCandidatePayload create(final DataTreeCandidate candidate) { final ByteArrayDataOutput out = ByteStreams.newDataOutput(); - try (final NormalizedNodeOutputStreamWriter writer = new NormalizedNodeOutputStreamWriter(out)) { + try (final NormalizedNodeDataOutput writer = NormalizedNodeInputOutput.newDataOutput(out)) { writer.writeYangInstanceIdentifier(candidate.getRootPath()); final DataTreeCandidateNode node = candidate.getRootNode(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataChanged.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataChanged.java index fe81e27e3d..6867f46e8d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataChanged.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataChanged.java @@ -15,15 +15,15 @@ import java.io.ObjectOutput; import java.util.Map; import java.util.Set; import org.opendaylight.controller.cluster.datastore.DataStoreVersions; +import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataOutput; +import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputOutput; import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputStreamReader; -import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeOutputStreamWriter; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.controller.md.sal.dom.store.impl.DOMImmutableDataChangeEvent; import org.opendaylight.controller.md.sal.dom.store.impl.DOMImmutableDataChangeEvent.Builder; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; public class DataChanged implements Externalizable { private static final long serialVersionUID = 1L; @@ -99,8 +99,7 @@ public class DataChanged implements Externalizable { public void writeExternal(ObjectOutput out) throws IOException { out.writeShort(DataStoreVersions.CURRENT_VERSION); - NormalizedNodeOutputStreamWriter streamWriter = new NormalizedNodeOutputStreamWriter(out); - NormalizedNodeWriter nodeWriter = NormalizedNodeWriter.forStreamWriter(streamWriter); + NormalizedNodeDataOutput streamWriter = NormalizedNodeInputOutput.newDataOutput(out); // Write created data @@ -108,7 +107,7 @@ public class DataChanged implements Externalizable { out.writeInt(createdData.size()); for(Map.Entry> e: createdData.entrySet()) { streamWriter.writeYangInstanceIdentifier(e.getKey()); - nodeWriter.write(e.getValue()); + streamWriter.writeNormalizedNode(e.getValue()); } // Write updated data @@ -118,8 +117,8 @@ public class DataChanged implements Externalizable { out.writeInt(updatedData.size()); for(Map.Entry> e: updatedData.entrySet()) { streamWriter.writeYangInstanceIdentifier(e.getKey()); - nodeWriter.write(originalData.get(e.getKey())); - nodeWriter.write(e.getValue()); + streamWriter.writeNormalizedNode(originalData.get(e.getKey())); + streamWriter.writeNormalizedNode(e.getValue()); } // Write removed data @@ -128,7 +127,7 @@ public class DataChanged implements Externalizable { out.writeInt(removed.size()); for(YangInstanceIdentifier path: removed) { streamWriter.writeYangInstanceIdentifier(path); - nodeWriter.write(originalData.get(path)); + streamWriter.writeNormalizedNode(originalData.get(path)); } // Write original subtree @@ -136,7 +135,7 @@ public class DataChanged implements Externalizable { NormalizedNode originalSubtree = change.getOriginalSubtree(); out.writeBoolean(originalSubtree != null); if(originalSubtree != null) { - nodeWriter.write(originalSubtree); + streamWriter.writeNormalizedNode(originalSubtree); } // Write original subtree @@ -144,7 +143,7 @@ public class DataChanged implements Externalizable { NormalizedNode updatedSubtree = change.getUpdatedSubtree(); out.writeBoolean(updatedSubtree != null); if(updatedSubtree != null) { - nodeWriter.write(updatedSubtree); + streamWriter.writeNormalizedNode(updatedSubtree); } } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModification.java index b594578eb2..c3746e03d2 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModification.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/MutableCompositeModification.java @@ -14,8 +14,8 @@ import java.io.ObjectOutput; import java.util.ArrayList; import java.util.List; import org.opendaylight.controller.cluster.datastore.DataStoreVersions; +import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputOutput; import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputStreamReader; -import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeOutputStreamWriter; import org.opendaylight.controller.cluster.datastore.utils.SerializationUtils; import org.opendaylight.controller.protobuff.messages.persistent.PersistentMessages; import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction; @@ -120,7 +120,7 @@ public class MutableCompositeModification implements CompositeModification { out.writeInt(modifications.size()); if(modifications.size() > 1) { - SerializationUtils.REUSABLE_WRITER_TL.set(new NormalizedNodeOutputStreamWriter(out)); + SerializationUtils.REUSABLE_WRITER_TL.set(NormalizedNodeInputOutput.newDataOutput(out)); } try { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/SerializationUtils.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/SerializationUtils.java index 79772fed5e..b416b922de 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/SerializationUtils.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/SerializationUtils.java @@ -20,8 +20,8 @@ import org.opendaylight.controller.cluster.datastore.node.NormalizedNodeToNodeCo import org.opendaylight.controller.cluster.datastore.node.utils.stream.InvalidNormalizedNodeStreamException; import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataInput; import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataOutput; +import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputOutput; import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputStreamReader; -import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeOutputStreamWriter; import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -32,7 +32,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; * @author Thomas Pantelis */ public final class SerializationUtils { - public static final ThreadLocal REUSABLE_WRITER_TL = new ThreadLocal<>(); + public static final ThreadLocal REUSABLE_WRITER_TL = new ThreadLocal<>(); public static final ThreadLocal REUSABLE_READER_TL = new ThreadLocal<>(); public static interface Applier { @@ -40,9 +40,9 @@ public final class SerializationUtils { } private static NormalizedNodeDataOutput streamWriter(DataOutput out) throws IOException { - NormalizedNodeOutputStreamWriter streamWriter = REUSABLE_WRITER_TL.get(); + NormalizedNodeDataOutput streamWriter = REUSABLE_WRITER_TL.get(); if(streamWriter == null) { - streamWriter = new NormalizedNodeOutputStreamWriter(out); + streamWriter = NormalizedNodeInputOutput.newDataOutput(out); } return streamWriter; -- 2.36.6