From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 24 Jul 2017 12:10:51 +0000 (+0200)
Subject: Cleanup ShardRootModificationContext
X-Git-Tag: release/carbon-sr2~31
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=02b122215c505e7eb592b4db1ff0bbc46ebebf19;hp=b7c1f342d201c944265e1328fc62c6c045f585af;p=mdsal.git

Cleanup ShardRootModificationContext

Remove and unneeded cast and add Identifiable interface.

Change-Id: Ibd9217402055863461349f8071211a95b3b5e2ae
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardRootModificationContext.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardRootModificationContext.java
index 41bd1cef99..11f03d993d 100644
--- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardRootModificationContext.java
+++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardRootModificationContext.java
@@ -10,16 +10,19 @@ package org.opendaylight.mdsal.dom.store.inmemory;
 
 import com.google.common.base.Preconditions;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
+import org.opendaylight.yangtools.concepts.Identifiable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.CursorAwareDataTreeModification;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.CursorAwareDataTreeSnapshot;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModificationCursor;
 
-class ShardRootModificationContext {
+// Non-final for mocking
+class ShardRootModificationContext implements Identifiable<DOMDataTreeIdentifier> {
 
     private final DOMDataTreeIdentifier identifier;
     private final CursorAwareDataTreeSnapshot snapshot;
+
     private CursorAwareDataTreeModification modification = null;
     private DataTreeModificationCursorAdaptor cursor = null;
 
@@ -29,6 +32,7 @@ class ShardRootModificationContext {
         this.snapshot = Preconditions.checkNotNull(snapshot);
     }
 
+    @Override
     public DOMDataTreeIdentifier getIdentifier() {
         return identifier;
     }
@@ -36,12 +40,11 @@ class ShardRootModificationContext {
     DataTreeModificationCursorAdaptor cursor() {
         if (cursor == null) {
             if (modification == null) {
-                modification = (CursorAwareDataTreeModification) snapshot.newModification();
+                modification = snapshot.newModification();
             }
 
             // FIXME: Should there be non-root path?
-            DataTreeModificationCursor dataTreeCursor =
-                    modification.createCursor(YangInstanceIdentifier.EMPTY);
+            DataTreeModificationCursor dataTreeCursor = modification.createCursor(YangInstanceIdentifier.EMPTY);
             cursor = DataTreeModificationCursorAdaptor.of(dataTreeCursor);
         }
         return cursor;