From 02b122215c505e7eb592b4db1ff0bbc46ebebf19 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 24 Jul 2017 14:10:51 +0200 Subject: [PATCH 1/1] Cleanup ShardRootModificationContext Remove and unneeded cast and add Identifiable interface. Change-Id: Ibd9217402055863461349f8071211a95b3b5e2ae Signed-off-by: Robert Varga --- .../store/inmemory/ShardRootModificationContext.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 { 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; -- 2.36.6