X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fstore%2Fimpl%2Ftree%2Fdata%2FStoreMetadataNode.java;h=695a1f1dd3b2becd6088432ab153f220640c9ff9;hb=c6439fe0610d601091dc2ab7b660736cb17e9666;hp=3faeabbdafb5089c60877d5cbc3905b63027e900;hpb=40d66eb2ec89c8f2ce11fb3e10bbe46f720548a5;p=controller.git 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 3faeabbdaf..695a1f1dd3 100644 --- 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 @@ -83,32 +83,17 @@ class StoreMetadataNode implements Immutable, Identifiable { return "StoreMetadataNode [identifier=" + getIdentifier() + ", nodeVersion=" + nodeVersion + "]"; } - public static Optional getVersion(final Optional currentMetadata) { - if (currentMetadata.isPresent()) { - return Optional.of(currentMetadata.get().getNodeVersion()); - } - return Optional.absent(); - } - - public static Optional getChild(final Optional parent, - final PathArgument child) { - if (parent.isPresent()) { - return parent.get().getChild(child); - } - return Optional.absent(); - } - public static final StoreMetadataNode createRecursively(final NormalizedNode node, - final UnsignedLong nodeVersion, final UnsignedLong subtreeVersion) { - Builder builder = builder(nodeVersion) // - .setSubtreeVersion(subtreeVersion) // + final UnsignedLong version) { + Builder builder = builder(version) // + .setSubtreeVersion(version) // .setData(node); if (node instanceof NormalizedNodeContainer) { @SuppressWarnings("unchecked") NormalizedNodeContainer> nodeContainer = (NormalizedNodeContainer>) node; for (NormalizedNode subNode : nodeContainer.getValue()) { - builder.add(createRecursively(subNode, nodeVersion, subtreeVersion)); + builder.add(createRecursively(subNode, version)); } } return builder.build(); @@ -169,7 +154,4 @@ class StoreMetadataNode implements Immutable, Identifiable { } } - public static StoreMetadataNode createRecursively(final NormalizedNode node, final UnsignedLong version) { - return createRecursively(node, version, version); - } }