BUG-3128: Extract abstract shard implementations.

[mdsal.git] / dom / mdsal-dom-broker / src / test / java / org / opendaylight / mdsal / dom / broker / TestUtils.java

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/TestUtils.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/TestUtils.java
index 07dd433b4ad3b4c84a4b6a54c0b2eba330904bc1..1a717d51c13a6ff4ddef31be19110212462c62f0 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/TestUtils.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/TestUtils.java
@@ -19,7 +19,7 @@ import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementationNotAvailableException;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
-import org.opendaylight.mdsal.dom.broker.test.util.TestModel;
+import org.opendaylight.mdsal.dom.broker.util.TestModel;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
@@ -40,7 +40,7 @@ abstract class TestUtils {
     private static final QName TOP_LEVEL_LIST_QNAME = QName.create(TOP_QNAME, "top-level-list");
     private static final QName TOP_LEVEL_LIST_KEY_QNAME = QName.create(TOP_QNAME, "name");
 
-    private final static MapEntryNode topLevelListNormalized = ImmutableMapEntryNodeBuilder.create()
+    private static final MapEntryNode TOP_LEVEL_LIST_NODE = ImmutableMapEntryNodeBuilder.create()
             .withNodeIdentifier(
                     new YangInstanceIdentifier.NodeIdentifierWithPredicates(
                             TOP_LEVEL_LIST_QNAME, TOP_LEVEL_LIST_KEY_QNAME, TOP_LEVEL_LIST_FOO_KEY_VALUE))
@@ -49,7 +49,7 @@ abstract class TestUtils {
 
     private static final DataContainerChild<?, ?> CHILD_LIST = ImmutableNodes.mapNodeBuilder(TestModel.TEST_QNAME)
             .withNodeIdentifier(NodeIdentifier.create(TestModel.TEST_QNAME))
-            .withChild(topLevelListNormalized)
+            .withChild(TOP_LEVEL_LIST_NODE)
             .build();
 
     static final NormalizedNode<?, ?> TEST_CONTAINER = Builders.containerBuilder()
@@ -64,7 +64,7 @@ abstract class TestUtils {
 
     static final String EXCEPTION_TEXT = "TestRpcImplementationException";
 
-    static TestRpcImplementation getTestRpcImplementation(){
+    static TestRpcImplementation getTestRpcImplementation() {
         return new TestRpcImplementation();
     }
 
@@ -78,7 +78,7 @@ abstract class TestUtils {
 
         @Nonnull
         public CheckedFuture<DOMRpcResult, DOMRpcException> invokeRpc(
-                @Nonnull DOMRpcIdentifier rpc, @Nullable NormalizedNode<?, ?> input) {
+                @Nonnull final DOMRpcIdentifier rpc, @Nullable final NormalizedNode<?, ?> input) {
             return unknownRpc;
         }
     }