Remove and unneeded cast and add Identifiable interface.
Change-Id: Ibd9217402055863461349f8071211a95b3b5e2ae
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
02b122215c505e7eb592b4db1ff0bbc46ebebf19)
import com.google.common.base.Preconditions;
import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
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;
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 final DOMDataTreeIdentifier identifier;
private final CursorAwareDataTreeSnapshot snapshot;
private CursorAwareDataTreeModification modification = null;
private DataTreeModificationCursorAdaptor cursor = null;
private CursorAwareDataTreeModification modification = null;
private DataTreeModificationCursorAdaptor cursor = null;
this.snapshot = Preconditions.checkNotNull(snapshot);
}
this.snapshot = Preconditions.checkNotNull(snapshot);
}
public DOMDataTreeIdentifier getIdentifier() {
return identifier;
}
public DOMDataTreeIdentifier getIdentifier() {
return identifier;
}
DataTreeModificationCursorAdaptor cursor() {
if (cursor == null) {
if (modification == null) {
DataTreeModificationCursorAdaptor cursor() {
if (cursor == null) {
if (modification == null) {
- modification = (CursorAwareDataTreeModification) snapshot.newModification();
+ modification = snapshot.newModification();
}
// FIXME: Should there be non-root path?
}
// 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;
cursor = DataTreeModificationCursorAdaptor.of(dataTreeCursor);
}
return cursor;