Merge changes Ibe0145be,I0764bfa9

[controller.git] / opendaylight / md-sal / sal-dom-broker / src / main / java / org / opendaylight / controller / md / sal / dom / store / impl / DataAndMetadataSnapshot.java

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 52f005189722c21c54f834657bcc565f2e58adae..b540eeaf3aba504102f6d46bf2b208ab05680643 100644 (file)
--- 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
@@ -22,9 +22,6 @@ class DataAndMetadataSnapshot {
     private final StoreMetadataNode metadataTree;
     private final Optional<SchemaContext> schemaContext;
 
-
-
-
     private DataAndMetadataSnapshot(final StoreMetadataNode metadataTree, final Optional<SchemaContext> schemaCtx) {
         this.metadataTree = metadataTree;
         this.schemaContext = schemaCtx;
@@ -34,20 +31,21 @@ class DataAndMetadataSnapshot {
         return new Builder();
     }
 
+    public static DataAndMetadataSnapshot createEmpty() {
+        return createEmpty(new NodeIdentifier(SchemaContext.NAME));
+    }
+
+
     public static DataAndMetadataSnapshot createEmpty(final NodeIdentifier rootNode) {
         NormalizedNode<?, ?> data = Builders.containerBuilder().withNodeIdentifier(rootNode).build();
-        StoreMetadataNode metadata = StoreMetadataNode.builder()
-                .setData(data)
-                .build();
+        StoreMetadataNode metadata = StoreMetadataNode.createEmpty(data);
         return new DataAndMetadataSnapshot(metadata,Optional.<SchemaContext>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)
-                .build();
+        StoreMetadataNode metadata = StoreMetadataNode.createEmpty(data);
         return new DataAndMetadataSnapshot(metadata, Optional.of(ctx));
     }
 
@@ -68,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;