InstanceIdentifierContext does not take generics

[netconf.git] / restconf / restconf-nb-bierman02 / src / main / java / org / opendaylight / netconf / sal / restconf / impl / BrokerFacade.java

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java
index ab321f6cf531d8fcc6bd893662c03c334c54b07c..4ce925f7f5a9160edda3529900a6384b7eb22443 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java
@@ -156,7 +156,7 @@ public class BrokerFacade implements Closeable {
      * @return read date
      */
     public NormalizedNode readConfigurationData(final YangInstanceIdentifier path, final String withDefa) {
-        try (DOMDataTreeReadTransaction tx = this.domDataBroker.newReadOnlyTransaction()) {
+        try (DOMDataTreeReadTransaction tx = domDataBroker.newReadOnlyTransaction()) {
             return readDataViaTransaction(tx, CONFIGURATION, path, withDefa);
         }
     }
@@ -204,7 +204,7 @@ public class BrokerFacade implements Closeable {
      * @return read data
      */
     public NormalizedNode readOperationalData(final YangInstanceIdentifier path) {
-        try (DOMDataTreeReadTransaction tx = this.domDataBroker.newReadOnlyTransaction()) {
+        try (DOMDataTreeReadTransaction tx = domDataBroker.newReadOnlyTransaction()) {
             return readDataViaTransaction(tx, OPERATIONAL, path);
         }
     }
@@ -254,7 +254,7 @@ public class BrokerFacade implements Closeable {
         requireNonNull(payload);
 
         isMounted.set(false);
-        final DOMDataTreeReadWriteTransaction newReadWriteTransaction = this.domDataBroker.newReadWriteTransaction();
+        final DOMDataTreeReadWriteTransaction newReadWriteTransaction = domDataBroker.newReadWriteTransaction();
         final Status status = readDataViaTransaction(newReadWriteTransaction, CONFIGURATION, path) != null ? Status.OK
                 : Status.CREATED;
         final FluentFuture<? extends CommitInfo> future = putDataViaTransaction(
@@ -314,7 +314,7 @@ public class BrokerFacade implements Closeable {
         final DOMDataTreeReadWriteTransaction patchTransaction;
         if (mountPoint == null) {
             schemaContext = patchContext.getInstanceIdentifierContext().getSchemaContext();
-            patchTransaction = this.domDataBroker.newReadWriteTransaction();
+            patchTransaction = domDataBroker.newReadWriteTransaction();
         } else {
             schemaContext = modelContext(mountPoint);
 
@@ -464,7 +464,7 @@ public class BrokerFacade implements Closeable {
             final NormalizedNode payload, final String insert, final String point) {
         isMounted.set(false);
         FluentFuture<? extends CommitInfo> future =
-                postDataViaTransaction(this.domDataBroker.newReadWriteTransaction(), CONFIGURATION, path, payload,
+                postDataViaTransaction(domDataBroker.newReadWriteTransaction(), CONFIGURATION, path, payload,
                                        globalSchema, insert, point);
         isMounted.remove();
         return future;
@@ -488,7 +488,7 @@ public class BrokerFacade implements Closeable {
 
     // DELETE configuration
     public FluentFuture<? extends CommitInfo> commitConfigurationDataDelete(final YangInstanceIdentifier path) {
-        return deleteDataViaTransaction(this.domDataBroker.newReadWriteTransaction(), CONFIGURATION, path);
+        return deleteDataViaTransaction(domDataBroker.newReadWriteTransaction(), CONFIGURATION, path);
     }
 
     public FluentFuture<? extends CommitInfo> commitConfigurationDataDelete(
@@ -503,11 +503,11 @@ public class BrokerFacade implements Closeable {
     // RPC
     public ListenableFuture<? extends DOMRpcResult> invokeRpc(final @NonNull QName type,
             final @NonNull NormalizedNode input) {
-        if (this.rpcService == null) {
+        if (rpcService == null) {
             throw new RestconfDocumentedException(Status.SERVICE_UNAVAILABLE);
         }
         LOG.trace("Invoke RPC {} with input: {}", type, input);
-        return this.rpcService.invokeRpc(type, input);
+        return rpcService.invokeRpc(type, input);
     }
 
     public void registerToListenDataChanges(final LogicalDatastoreType datastore, final Scope scope,
@@ -517,11 +517,11 @@ public class BrokerFacade implements Closeable {
         }
 
         final YangInstanceIdentifier path = listener.getPath();
-        DOMDataTreeChangeService changeService = this.domDataBroker.getExtensions()
+        DOMDataTreeChangeService changeService = domDataBroker.getExtensions()
                 .getInstance(DOMDataTreeChangeService.class);
         if (changeService == null) {
             throw new UnsupportedOperationException("DOMDataBroker does not support the DOMDataTreeChangeService"
-                                                        + this.domDataBroker);
+                                                        + domDataBroker);
         }
         DOMDataTreeIdentifier root = new DOMDataTreeIdentifier(datastore, path);
         ListenerRegistration<ListenerAdapter> registration =
@@ -795,7 +795,7 @@ public class BrokerFacade implements Closeable {
             final SchemaContext schemaContext, final String point, final UserLeafSetNode<?> readLeafList,
             final boolean before) {
         rwTransaction.delete(datastore, path.getParent().getParent());
-        final InstanceIdentifierContext<?> instanceIdentifier = controllerContext.toInstanceIdentifier(point);
+        final InstanceIdentifierContext instanceIdentifier = controllerContext.toInstanceIdentifier(point);
         int lastItemPosition = 0;
         for (final LeafSetEntryNode<?> nodeChild : readLeafList.body()) {
             if (nodeChild.getIdentifier().equals(instanceIdentifier.getInstanceIdentifier().getLastPathArgument())) {
@@ -826,7 +826,7 @@ public class BrokerFacade implements Closeable {
             final YangInstanceIdentifier path, final NormalizedNode payload, final SchemaContext schemaContext,
             final String point, final MapNode readList, final boolean before) {
         rwTransaction.delete(datastore, path.getParent().getParent());
-        final InstanceIdentifierContext<?> instanceIdentifier = controllerContext.toInstanceIdentifier(point);
+        final InstanceIdentifierContext instanceIdentifier = controllerContext.toInstanceIdentifier(point);
         int lastItemPosition = 0;
         for (final MapEntryNode mapEntryNode : readList.body()) {
             if (mapEntryNode.getIdentifier()
@@ -1111,7 +1111,7 @@ public class BrokerFacade implements Closeable {
             final SchemaContext schemaContext, final String point, final UserLeafSetNode<?> readLeafList,
             final boolean before) {
         tx.delete(datastore, path.getParent());
-        final InstanceIdentifierContext<?> instanceIdentifier = controllerContext.toInstanceIdentifier(point);
+        final InstanceIdentifierContext instanceIdentifier = controllerContext.toInstanceIdentifier(point);
         int index1 = 0;
         for (final LeafSetEntryNode<?> nodeChild : readLeafList.body()) {
             if (nodeChild.getIdentifier().equals(instanceIdentifier.getInstanceIdentifier().getLastPathArgument())) {
@@ -1139,7 +1139,7 @@ public class BrokerFacade implements Closeable {
             final YangInstanceIdentifier path, final NormalizedNode payload, final SchemaContext schemaContext,
             final String point, final UserMapNode readList, final boolean before) {
         tx.delete(datastore, path.getParent());
-        final InstanceIdentifierContext<?> instanceIdentifier = controllerContext.toInstanceIdentifier(point);
+        final InstanceIdentifierContext instanceIdentifier = controllerContext.toInstanceIdentifier(point);
         int index1 = 0;
         for (final MapEntryNode mapEntryNode : readList.body()) {
             if (mapEntryNode.getIdentifier().equals(instanceIdentifier.getInstanceIdentifier().getLastPathArgument())) {
@@ -1220,7 +1220,7 @@ public class BrokerFacade implements Closeable {
         }
 
         final SchemaPath path = listener.getSchemaPath();
-        final ListenerRegistration<DOMNotificationListener> registration = this.domNotification
+        final ListenerRegistration<DOMNotificationListener> registration = domNotification
                 .registerNotificationListener(listener, Absolute.of(ImmutableList.copyOf(path.getPathFromRoot())));
 
         listener.setRegistration(registration);
@@ -1269,7 +1269,7 @@ public class BrokerFacade implements Closeable {
         PatchStatusContext status;
 
         public PatchStatusContext getStatus() {
-            return this.status;
+            return status;
         }
 
         public void setStatus(final PatchStatusContext status) {