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%2FStoreNodeCompositeBuilder.java;h=19debbb990b527844a3bd68b34915d5ba37190b4;hb=f0c8b7e497b66a57cc6e24bc953b0ad336fe0785;hp=6bce4fff0ce03f2b770959db007bd4695a01cc67;hpb=c3c49eaef5b1435b871f97eb060f8abdba5a6671;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/StoreNodeCompositeBuilder.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/data/StoreNodeCompositeBuilder.java index 6bce4fff0c..19debbb990 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/data/StoreNodeCompositeBuilder.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/data/StoreNodeCompositeBuilder.java @@ -26,12 +26,12 @@ class StoreNodeCompositeBuilder { private final NormalizedNodeContainerBuilder data; - private StoreNodeCompositeBuilder(final NormalizedNodeContainerBuilder nodeBuilder) { - this.metadata = StoreMetadataNode.builder(); + private StoreNodeCompositeBuilder(final UnsignedLong version, final NormalizedNodeContainerBuilder nodeBuilder) { + this.metadata = StoreMetadataNode.builder(version); this.data = Preconditions.checkNotNull(nodeBuilder); } - public StoreNodeCompositeBuilder(NormalizedNodeContainerBuilder nodeBuilder, StoreMetadataNode currentMeta) { + private StoreNodeCompositeBuilder(final NormalizedNodeContainerBuilder nodeBuilder, final StoreMetadataNode currentMeta) { this.metadata = StoreMetadataNode.builder(currentMeta); this.data = Preconditions.checkNotNull(nodeBuilder); } @@ -44,7 +44,7 @@ class StoreNodeCompositeBuilder { } @SuppressWarnings("unchecked") - public StoreNodeCompositeBuilder remove(PathArgument id) { + public StoreNodeCompositeBuilder remove(final PathArgument id) { metadata.remove(id); data.removeChild(id); return this; @@ -54,11 +54,11 @@ class StoreNodeCompositeBuilder { return metadata.setData(data.build()).build(); } - public static StoreNodeCompositeBuilder from(final NormalizedNodeContainerBuilder nodeBuilder) { - return new StoreNodeCompositeBuilder(nodeBuilder); + public static StoreNodeCompositeBuilder create(final UnsignedLong version, final NormalizedNodeContainerBuilder nodeBuilder) { + return new StoreNodeCompositeBuilder(version, nodeBuilder); } - public static StoreNodeCompositeBuilder from(final NormalizedNodeContainerBuilder nodeBuilder, StoreMetadataNode currentMeta) { + public static StoreNodeCompositeBuilder create(final NormalizedNodeContainerBuilder nodeBuilder, final StoreMetadataNode currentMeta) { return new StoreNodeCompositeBuilder(nodeBuilder, currentMeta); } @@ -68,11 +68,6 @@ class StoreNodeCompositeBuilder { return this; } - public StoreNodeCompositeBuilder setNodeVersion(final UnsignedLong nodeVersion) { - metadata.setNodeVersion(nodeVersion); - return this; - } - public StoreNodeCompositeBuilder setSubtreeVersion(final UnsignedLong updatedSubtreeVersion) { metadata.setSubtreeVersion(updatedSubtreeVersion); return this;