Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Stop SubtreeFitler from rereading reply even if no filter element is present."
[controller.git]
/
opendaylight
/
md-sal
/
sal-clustering-commons
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
node
/
utils
/
stream
/
NormalizedNodeOutputStreamWriter.java
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 088f4dfbe98a1358a980a84e8ad3adaa99736b57..1ea94e9862a455bf7b4b5d2fa976d2c065525aa8 100644
(file)
--- 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
@@
-46,6
+46,9
@@
public class NormalizedNodeOutputStreamWriter implements NormalizedNodeStreamWri
private static final Logger LOG = LoggerFactory.getLogger(NormalizedNodeOutputStreamWriter.class);
private static final Logger LOG = LoggerFactory.getLogger(NormalizedNodeOutputStreamWriter.class);
+ static final byte SIGNATURE_MARKER = (byte) 0xab;
+ static final short CURRENT_VERSION = (short) 1;
+
static final byte IS_CODE_VALUE = 1;
static final byte IS_STRING_VALUE = 2;
static final byte IS_NULL_VALUE = 3;
static final byte IS_CODE_VALUE = 1;
static final byte IS_STRING_VALUE = 2;
static final byte IS_NULL_VALUE = 3;
@@
-56,12
+59,14
@@
public class NormalizedNodeOutputStreamWriter implements NormalizedNodeStreamWri
private NormalizedNodeWriter normalizedNodeWriter;
private NormalizedNodeWriter normalizedNodeWriter;
+ private boolean wroteSignatureMarker;
+
public NormalizedNodeOutputStreamWriter(OutputStream stream) throws IOException {
Preconditions.checkNotNull(stream);
output = new DataOutputStream(stream);
}
public NormalizedNodeOutputStreamWriter(OutputStream stream) throws IOException {
Preconditions.checkNotNull(stream);
output = new DataOutputStream(stream);
}
- public NormalizedNodeOutputStreamWriter(DataOutput output)
throws IOException
{
+ public NormalizedNodeOutputStreamWriter(DataOutput output) {
this.output = Preconditions.checkNotNull(output);
}
this.output = Preconditions.checkNotNull(output);
}
@@
-74,9
+79,18
@@
public class NormalizedNodeOutputStreamWriter implements NormalizedNodeStreamWri
}
public void writeNormalizedNode(NormalizedNode<?, ?> node) throws IOException {
}
public void writeNormalizedNode(NormalizedNode<?, ?> node) throws IOException {
+ writeSignatureMarkerAndVersionIfNeeded();
normalizedNodeWriter().write(node);
}
normalizedNodeWriter().write(node);
}
+ private void writeSignatureMarkerAndVersionIfNeeded() throws IOException {
+ if(!wroteSignatureMarker) {
+ output.writeByte(SIGNATURE_MARKER);
+ output.writeShort(CURRENT_VERSION);
+ wroteSignatureMarker = true;
+ }
+ }
+
@Override
public void leafNode(YangInstanceIdentifier.NodeIdentifier name, Object value) throws IOException, IllegalArgumentException {
Preconditions.checkNotNull(name, "Node identifier should not be null");
@Override
public void leafNode(YangInstanceIdentifier.NodeIdentifier name, Object value) throws IOException, IllegalArgumentException {
Preconditions.checkNotNull(name, "Node identifier should not be null");
@@
-189,6
+203,7
@@
public class NormalizedNodeOutputStreamWriter implements NormalizedNodeStreamWri
@Override
public void close() throws IOException {
@Override
public void close() throws IOException {
+ flush();
}
@Override
}
@Override
@@
-201,6
+216,9
@@
public class NormalizedNodeOutputStreamWriter implements NormalizedNodeStreamWri
private void startNode(final QName qName, byte nodeType) throws IOException {
Preconditions.checkNotNull(qName, "QName of node identifier should not be null.");
private void startNode(final QName qName, byte nodeType) throws IOException {
Preconditions.checkNotNull(qName, "QName of node identifier should not be null.");
+
+ writeSignatureMarkerAndVersionIfNeeded();
+
// First write the type of node
output.writeByte(nodeType);
// Write Start Tag
// First write the type of node
output.writeByte(nodeType);
// Write Start Tag
@@
-247,6
+265,11
@@
public class NormalizedNodeOutputStreamWriter implements NormalizedNodeStreamWri
}
public void writeYangInstanceIdentifier(YangInstanceIdentifier identifier) throws IOException {
}
public void writeYangInstanceIdentifier(YangInstanceIdentifier identifier) throws IOException {
+ writeSignatureMarkerAndVersionIfNeeded();
+ writeYangInstanceIdentifierInternal(identifier);
+ }
+
+ private void writeYangInstanceIdentifierInternal(YangInstanceIdentifier identifier) throws IOException {
Iterable<YangInstanceIdentifier.PathArgument> pathArguments = identifier.getPathArguments();
int size = Iterables.size(pathArguments);
output.writeInt(size);
Iterable<YangInstanceIdentifier.PathArgument> pathArguments = identifier.getPathArguments();
int size = Iterables.size(pathArguments);
output.writeInt(size);
@@
-256,7
+279,7
@@
public class NormalizedNodeOutputStreamWriter implements NormalizedNodeStreamWri
}
}
}
}
- p
rivate
void writePathArgument(YangInstanceIdentifier.PathArgument pathArgument) throws IOException {
+ p
ublic
void writePathArgument(YangInstanceIdentifier.PathArgument pathArgument) throws IOException {
byte type = PathArgumentTypes.getSerializablePathArgumentType(pathArgument);
byte type = PathArgumentTypes.getSerializablePathArgumentType(pathArgument);
@@
-363,7
+386,7
@@
public class NormalizedNodeOutputStreamWriter implements NormalizedNodeStreamWri
output.write(bytes);
break;
case ValueTypes.YANG_IDENTIFIER_TYPE:
output.write(bytes);
break;
case ValueTypes.YANG_IDENTIFIER_TYPE:
- writeYangInstanceIdentifier((YangInstanceIdentifier) value);
+ writeYangInstanceIdentifier
Internal
((YangInstanceIdentifier) value);
break;
case ValueTypes.NULL_TYPE :
break;
break;
case ValueTypes.NULL_TYPE :
break;