import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.Serializable;
+import java.io.StreamCorruptedException;
import java.util.Map;
-import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataInput;
+import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataOutput;
+import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private static final Logger LOG = LoggerFactory.getLogger(MetadataShardDataTreeSnapshot.class);
private Map<Class<? extends ShardDataTreeSnapshotMetadata<?>>, ShardDataTreeSnapshotMetadata<?>> metadata;
- private NormalizedNode<?, ?> rootNode;
+ private NormalizedNodeStreamVersion version;
+ private NormalizedNode rootNode;
// checkstyle flags the public modifier as redundant which really doesn't make sense since it clearly isn't
// redundant. It is explicitly needed for Java serialization to be able to create instances via reflection.
Proxy(final MetadataShardDataTreeSnapshot snapshot) {
this.rootNode = snapshot.getRootNode().get();
this.metadata = snapshot.getMetadata();
+ this.version = snapshot.version().getStreamVersion();
}
@Override
for (ShardDataTreeSnapshotMetadata<?> m : metadata.values()) {
out.writeObject(m);
}
-
- SerializationUtils.writeNormalizedNode(out, rootNode);
+ out.writeBoolean(true);
+ try (NormalizedNodeDataOutput stream = version.newDataOutput(out)) {
+ stream.writeNormalizedNode(rootNode);
+ }
}
@Override
}
metadata = metaBuilder.build();
- rootNode = SerializationUtils.readNormalizedNode(in).get();
+ final boolean present = in.readBoolean();
+ if (!present) {
+ throw new StreamCorruptedException("Unexpected missing root node");
+ }
+
+ final NormalizedNodeDataInput stream = NormalizedNodeDataInput.newDataInput(in);
+ version = stream.getVersion();
+ rootNode = stream.readNormalizedNode();
}
private Object readResolve() {
private final Map<Class<? extends ShardDataTreeSnapshotMetadata<?>>, ShardDataTreeSnapshotMetadata<?>> metadata;
@SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "See above justification.")
- private final NormalizedNode<?, ?> rootNode;
+ private final NormalizedNode rootNode;
- public MetadataShardDataTreeSnapshot(final NormalizedNode<?, ?> rootNode) {
+ public MetadataShardDataTreeSnapshot(final NormalizedNode rootNode) {
this(rootNode, ImmutableMap.of());
}
- public MetadataShardDataTreeSnapshot(final NormalizedNode<?, ?> rootNode,
+ public MetadataShardDataTreeSnapshot(final NormalizedNode rootNode,
final Map<Class<? extends ShardDataTreeSnapshotMetadata<?>>, ShardDataTreeSnapshotMetadata<?>> metadata) {
this.rootNode = requireNonNull(rootNode);
this.metadata = ImmutableMap.copyOf(metadata);
}
@Override
- NormalizedNode<?, ?> rootNode() {
+ NormalizedNode rootNode() {
return rootNode;
}
@Override
PayloadVersion version() {
- return PayloadVersion.NEON_SR2;
+ return PayloadVersion.MAGNESIUM;
}
private Object writeReplace() {