From 22e56e002ad216fcb194343dfa8b1216525b1d00 Mon Sep 17 00:00:00 2001
From: Martin Bobak <mbobak@cisco.com>
Date: Tue, 31 Mar 2015 21:02:34 +0200
Subject: [PATCH] DeviceContext API cleanup

- removed comments
- removed method sendRequest()

Change-Id: I9b2c9ce5c087066663ee293afdafbbec23b9fd91
Signed-off-by: Martin Bobak <mbobak@cisco.com>
---
 .../api/openflow/device/DeviceContext.java    |  2 --
 .../impl/device/DeviceContextImpl.java        | 22 +++++--------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceContext.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceContext.java
index b1923e127c..704b1e6e19 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceContext.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceContext.java
@@ -99,8 +99,6 @@ public interface DeviceContext extends MessageHandler {
 
     Xid getNextXid();
 
-    <T extends DataObject> Future<RpcResult<T>> sendRequest(Xid xid);
-
     /**
      * Method provides requests map
      * @return
diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java
index e4d9dfda21..b3b12af5de 100644
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/DeviceContextImpl.java
@@ -10,11 +10,6 @@ package org.opendaylight.openflowplugin.impl.device;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.SettableFuture;
-import java.math.BigInteger;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.Future;
-import javax.annotation.Nonnull;
 import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
@@ -35,9 +30,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableFeatures;
 import org.opendaylight.yangtools.yang.binding.ChildOf;
 import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import javax.annotation.Nonnull;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  *
@@ -57,7 +55,7 @@ public class DeviceContextImpl implements DeviceContext, TransactionChainListene
 
     @VisibleForTesting
     DeviceContextImpl(@Nonnull final ConnectionContext primaryConnectionContext,
-            @Nonnull final DeviceState deviceState, @Nonnull final DataBroker dataBroker) {
+                      @Nonnull final DeviceState deviceState, @Nonnull final DataBroker dataBroker) {
         this.primaryConnectionContext = Preconditions.checkNotNull(primaryConnectionContext);
         this.deviceState = Preconditions.checkNotNull(deviceState);
         this.dataBroker = Preconditions.checkNotNull(dataBroker);
@@ -123,33 +121,25 @@ public class DeviceContextImpl implements DeviceContext, TransactionChainListene
         return xidGenerator.generate();
     }
 
-    @Override
-    public <T extends DataObject> Future<RpcResult<T>> sendRequest(final Xid xid) {
-        return null;
-    }
-
     @Override
     public Map<Xid, RequestFutureContext> getRequests() {
-        // TODO Auto-generated method stub
         return requests;
     }
 
     @Override
     public void hookRequestCtx(final Xid xid, final RequestFutureContext requestFutureContext) {
-        // TODO Auto-generated method stub
         requests.put(xid, requestFutureContext);
     }
 
     @Override
     public void processReply(final Xid xid, final OfHeader ofHeader) {
-        // TODO Auto-generated method stub
         final SettableFuture replyFuture = getRequests().get(xid).getFuture();
         replyFuture.set(ofHeader);
     }
 
     @Override
     public void onTransactionChainFailed(final TransactionChain<?, ?> chain,
-            final AsyncTransaction<?, ?> transaction, final Throwable cause) {
+                                         final AsyncTransaction<?, ?> transaction, final Throwable cause) {
         txChainFactory.close();
         txChainFactory = dataBroker.createTransactionChain(DeviceContextImpl.this);
     }
-- 
2.36.6