Cleanup RequestContextStack

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / statistics / StatisticsContextImpl.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpl.java
index 073e9be456abe1f810a59dee622642df98bcefa0..27ee72b5cd8e3d2ebc4b61f474db49c1a2e330fc 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsContextImpl.java
@@ -12,19 +12,19 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceState;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
 import org.opendaylight.openflowplugin.api.openflow.statistics.StatisticsContext;
-import org.opendaylight.openflowplugin.impl.rpc.RequestContextImpl;
+import org.opendaylight.openflowplugin.impl.rpc.AbstractRequestContext;
 import org.opendaylight.openflowplugin.impl.services.RequestContextUtil;
 import org.opendaylight.openflowplugin.impl.statistics.services.dedicated.StatisticsGatheringService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
-import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,23 +34,21 @@ import org.slf4j.LoggerFactory;
 public class StatisticsContextImpl implements StatisticsContext {
 
     private static final Logger LOG = LoggerFactory.getLogger(StatisticsContextImpl.class);
-    public static final String CONNECTION_CLOSED = "Connection closed.";
-    private final List<RequestContext> requestContexts = new ArrayList();
+    private static final String CONNECTION_CLOSED = "Connection closed.";
+    private final Collection<RequestContext<?>> requestContexts = new HashSet<>();
     private final DeviceContext deviceContext;
 
-
     private final StatisticsGatheringService statisticsGatheringService;
 
     public StatisticsContextImpl(final DeviceContext deviceContext) {
         this.deviceContext = deviceContext;
         statisticsGatheringService = new StatisticsGatheringService(this, deviceContext);
-
     }
 
     @Override
     public ListenableFuture<Boolean> gatherDynamicData() {
 
-        final SettableFuture settableResultingFuture = SettableFuture.create();
+        final SettableFuture<Boolean> settableResultingFuture = SettableFuture.create();
         ListenableFuture<Boolean> resultingFuture = settableResultingFuture;
 
 
@@ -103,25 +101,21 @@ public class StatisticsContextImpl implements StatisticsContext {
         return resultingFuture;
     }
 
-    @Override
-    public <T> void forgetRequestContext(final RequestContext<T> requestContext) {
-        requestContexts.remove(requestContext);
-    }
-
-    @Override
-    public <T> SettableFuture<RpcResult<T>> storeOrFail(final RequestContext<T> data) {
-        requestContexts.add(data);
-        return data.getFuture();
-    }
-
     @Override
     public <T> RequestContext<T> createRequestContext() {
-        return new RequestContextImpl<>(this);
+        final AbstractRequestContext<T> ret = new AbstractRequestContext<T>() {
+            @Override
+            public void close() {
+                requestContexts.remove(this);
+            }
+        };
+        requestContexts.add(ret);
+        return ret;
     }
 
     @Override
-    public void close() throws Exception {
-        for (final RequestContext requestContext : requestContexts) {
+    public void close() {
+        for (final RequestContext<?> requestContext : requestContexts) {
             RequestContextUtil.closeRequestContextWithRpcError(requestContext, CONNECTION_CLOSED);
         }
     }