X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fstore%2Fimpl%2FDataAndMetadataSnapshot.java;h=b540eeaf3aba504102f6d46bf2b208ab05680643;hp=9961fcce8d25e00e42128928062485efcd5db731;hb=8baeda4ab8d240f847cd530ef6af7c7c1c2d4d13;hpb=335a9cfe42385a217ef002e4ab42f9cd958ad202 diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DataAndMetadataSnapshot.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DataAndMetadataSnapshot.java index 9961fcce8d..b540eeaf3a 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DataAndMetadataSnapshot.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DataAndMetadataSnapshot.java @@ -16,7 +16,6 @@ import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import com.google.common.base.Optional; -import com.google.common.primitives.UnsignedLong; class DataAndMetadataSnapshot { @@ -39,22 +38,14 @@ class DataAndMetadataSnapshot { public static DataAndMetadataSnapshot createEmpty(final NodeIdentifier rootNode) { NormalizedNode data = Builders.containerBuilder().withNodeIdentifier(rootNode).build(); - StoreMetadataNode metadata = StoreMetadataNode.builder() - .setNodeVersion(UnsignedLong.ZERO) - .setSubtreeVersion(UnsignedLong.ZERO) - .setData(data) - .build(); + StoreMetadataNode metadata = StoreMetadataNode.createEmpty(data); return new DataAndMetadataSnapshot(metadata,Optional.absent()); } public static DataAndMetadataSnapshot createEmpty(final SchemaContext ctx) { NodeIdentifier rootNodeIdentifier = new NodeIdentifier(ctx.getQName()); NormalizedNode data = Builders.containerBuilder().withNodeIdentifier(rootNodeIdentifier).build(); - StoreMetadataNode metadata = StoreMetadataNode.builder() - .setData(data) - .setNodeVersion(UnsignedLong.ZERO) - .setSubtreeVersion(UnsignedLong.ZERO) - .build(); + StoreMetadataNode metadata = StoreMetadataNode.createEmpty(data); return new DataAndMetadataSnapshot(metadata, Optional.of(ctx)); } @@ -75,14 +66,9 @@ class DataAndMetadataSnapshot { } public static class Builder { - private NormalizedNode dataTree; private StoreMetadataNode metadataTree; private SchemaContext schemaContext; - public NormalizedNode getDataTree() { - return dataTree; - } - public Builder setMetadataTree(final StoreMetadataNode metadataTree) { this.metadataTree = metadataTree; return this;