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 "Bug 992 - Fix broken netconf xml serialization."
[controller.git]
/
opendaylight
/
md-sal
/
sal-dom-broker
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
md
/
sal
/
dom
/
store
/
impl
/
tree
/
data
/
StoreMetadataNode.java
diff --git
a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/data/StoreMetadataNode.java
b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/data/StoreMetadataNode.java
index 8addb89bd1ae2180959ba458b2d0762f998d7f21..77186a6509913742c97a9606f2e89f7691e941a8 100644
(file)
--- a/
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/data/StoreMetadataNode.java
+++ b/
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/data/StoreMetadataNode.java
@@
-13,7
+13,6
@@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.HashMap;
import java.util.Map;
-import org.opendaylight.controller.md.sal.dom.store.impl.tree.StoreTreeNode;
import org.opendaylight.yangtools.concepts.Identifiable;
import org.opendaylight.yangtools.concepts.Immutable;
import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.concepts.Identifiable;
import org.opendaylight.yangtools.concepts.Immutable;
import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument;
@@
-24,15
+23,12
@@
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.primitives.UnsignedLong;
import com.google.common.base.Preconditions;
import com.google.common.primitives.UnsignedLong;
-// FIXME: this should not be public
-public class StoreMetadataNode implements Immutable, Identifiable<PathArgument>, StoreTreeNode<StoreMetadataNode> {
-
+class StoreMetadataNode implements Immutable, Identifiable<PathArgument> {
+ private final Map<PathArgument, StoreMetadataNode> children;
private final UnsignedLong nodeVersion;
private final UnsignedLong subtreeVersion;
private final NormalizedNode<?, ?> data;
private final UnsignedLong nodeVersion;
private final UnsignedLong subtreeVersion;
private final NormalizedNode<?, ?> data;
- private final Map<PathArgument, StoreMetadataNode> children;
-
/**
*
* @param data
/**
*
* @param data
@@
-40,11
+36,11
@@
public class StoreMetadataNode implements Immutable, Identifiable<PathArgument>,
* @param subtreeVersion
* @param children Map of children, must not be modified externally
*/
* @param subtreeVersion
* @param children Map of children, must not be modified externally
*/
- pr
otected
StoreMetadataNode(final NormalizedNode<?, ?> data, final UnsignedLong nodeVersion,
+ pr
ivate
StoreMetadataNode(final NormalizedNode<?, ?> data, final UnsignedLong nodeVersion,
final UnsignedLong subtreeVersion, final Map<PathArgument, StoreMetadataNode> children) {
final UnsignedLong subtreeVersion, final Map<PathArgument, StoreMetadataNode> children) {
- this.nodeVersion =
nodeVersion
;
- this.subtreeVersion =
subtreeVersion
;
- this.data =
data
;
+ this.nodeVersion =
Preconditions.checkNotNull(nodeVersion)
;
+ this.subtreeVersion =
Preconditions.checkNotNull(subtreeVersion)
;
+ this.data =
Preconditions.checkNotNull(data)
;
this.children = Preconditions.checkNotNull(children);
}
this.children = Preconditions.checkNotNull(children);
}
@@
-53,11
+49,6
@@
public class StoreMetadataNode implements Immutable, Identifiable<PathArgument>,
Collections.<PathArgument, StoreMetadataNode>emptyMap());
}
Collections.<PathArgument, StoreMetadataNode>emptyMap());
}
- public StoreMetadataNode(final NormalizedNode<?, ?> data, final UnsignedLong nodeVersion,
- final UnsignedLong subtreeVersion) {
- this(data, nodeVersion, subtreeVersion, Collections.<PathArgument, StoreMetadataNode>emptyMap());
- }
-
public static Builder builder() {
return new Builder();
}
public static Builder builder() {
return new Builder();
}
@@
-83,8
+74,7
@@
public class StoreMetadataNode implements Immutable, Identifiable<PathArgument>,
return this.data;
}
return this.data;
}
- @Override
- public Optional<StoreMetadataNode> getChild(final PathArgument key) {
+ Optional<StoreMetadataNode> getChild(final PathArgument key) {
return Optional.fromNullable(children.get(key));
}
return Optional.fromNullable(children.get(key));
}
@@
-137,7
+127,7
@@
public class StoreMetadataNode implements Immutable, Identifiable<PathArgument>,
children = new HashMap<>();
}
children = new HashMap<>();
}
- p
ublic
Builder(StoreMetadataNode node) {
+ p
rivate
Builder(StoreMetadataNode node) {
children = new HashMap<>(node.children);
}
children = new HashMap<>(node.children);
}