Bump MRI upstreams

[netconf.git] / restconf / restconf-nb-bierman02 / src / test / java / org / opendaylight / controller / sal / restconf / impl / test / BrokerFacadeTest.java

diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java
index 090d5dee87ec1e20c02e7caf2d9087c8b1ff16db..01d08a12aadf583247240b6ac49111beda335683 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java
@@ -108,8 +108,8 @@ public class BrokerFacadeTest {
     private DOMDataTreeReadWriteTransaction rwTransaction;
 
     private BrokerFacade brokerFacade;
-    private final NormalizedNode<?, ?> dummyNode = createDummyNode("test:module", "2014-01-09", "interfaces");
-    private final FluentFuture<Optional<NormalizedNode<?, ?>>> dummyNodeInFuture = wrapDummyNode(this.dummyNode);
+    private final NormalizedNode dummyNode = createDummyNode("test:module", "2014-01-09", "interfaces");
+    private final FluentFuture<Optional<NormalizedNode>> dummyNodeInFuture = wrapDummyNode(this.dummyNode);
     private final QName qname = TestUtils.buildQName("interfaces","test:module", "2014-01-09");
     private final YangInstanceIdentifier instanceID = YangInstanceIdentifier.builder().node(this.qname).build();
     private ControllerContext controllerContext;
@@ -127,7 +127,7 @@ public class BrokerFacadeTest {
             DOMDataTreeChangeService.class, Mockito.mock(DOMDataTreeChangeService.class)));
     }
 
-    private static FluentFuture<Optional<NormalizedNode<?, ?>>> wrapDummyNode(final NormalizedNode<?, ?> dummyNode) {
+    private static FluentFuture<Optional<NormalizedNode>> wrapDummyNode(final NormalizedNode dummyNode) {
         return immediateFluentFuture(Optional.of(dummyNode));
     }
 
@@ -138,10 +138,10 @@ public class BrokerFacadeTest {
     /**
      * Value of this node shouldn't be important for testing purposes.
      */
-    private static NormalizedNode<?, ?> createDummyNode(final String namespace, final String date,
-            final String localName) {
+    private static NormalizedNode createDummyNode(final String namespace, final String date, final String localName) {
         return Builders.containerBuilder()
-                .withNodeIdentifier(new NodeIdentifier(QName.create(namespace, date, localName))).build();
+                .withNodeIdentifier(new NodeIdentifier(QName.create(namespace, date, localName)))
+                .build();
     }
 
     @Test
@@ -149,7 +149,7 @@ public class BrokerFacadeTest {
         when(this.readTransaction.read(any(LogicalDatastoreType.class), any(YangInstanceIdentifier.class))).thenReturn(
                 this.dummyNodeInFuture);
 
-        final NormalizedNode<?, ?> actualNode = this.brokerFacade.readConfigurationData(this.instanceID);
+        final NormalizedNode actualNode = this.brokerFacade.readConfigurationData(this.instanceID);
 
         assertSame("readConfigurationData", this.dummyNode, actualNode);
     }
@@ -159,7 +159,7 @@ public class BrokerFacadeTest {
         when(this.readTransaction.read(any(LogicalDatastoreType.class), any(YangInstanceIdentifier.class))).thenReturn(
                 this.dummyNodeInFuture);
 
-        final NormalizedNode<?, ?> actualNode = this.brokerFacade.readOperationalData(this.instanceID);
+        final NormalizedNode actualNode = this.brokerFacade.readOperationalData(this.instanceID);
 
         assertSame("readOperationalData", this.dummyNode, actualNode);
     }