Do not use JdkFutureAdapters

[openflowplugin.git] / applications / forwardingrules-manager / src / main / java / org / opendaylight / openflowplugin / applications / frm / impl / TableForwarder.java

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/TableForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/TableForwarder.java
index b2ff5f0ac5e0d700e82a84690a6a90192bc0ffa2..ae050038fa663ee53389418aec2003f1daf5996c 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/TableForwarder.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/TableForwarder.java
@@ -8,8 +8,8 @@
 package org.opendaylight.openflowplugin.applications.frm.impl;
 
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Collections;
-import java.util.concurrent.Future;
 import org.opendaylight.infrautils.utils.concurrent.LoggingFutures;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.openflowplugin.applications.frm.ForwardingRulesManager;
@@ -89,7 +89,7 @@ public class TableForwarder extends AbstractListeningCommiter<TableFeatures> {
     }
 
     @Override
-    public Future<? extends RpcResult<?>> add(final InstanceIdentifier<TableFeatures> identifier,
+    public ListenableFuture<RpcResult<?>> add(final InstanceIdentifier<TableFeatures> identifier,
             final TableFeatures addDataObj, final InstanceIdentifier<FlowCapableNode> nodeIdent) {
         return Futures.immediateFuture(null);
     }
@@ -101,8 +101,8 @@ public class TableForwarder extends AbstractListeningCommiter<TableFeatures> {
     }
 
     @Override
-    public Future<? extends RpcResult<?>> removeWithResult(final InstanceIdentifier<TableFeatures> identifier,
+    public ListenableFuture<RpcResult<?>> removeWithResult(final InstanceIdentifier<TableFeatures> identifier,
             final TableFeatures del, final InstanceIdentifier<FlowCapableNode> nodeIdent) {
-        return null;
+        return Futures.immediateFuture(null);
     }
 }