From 7853c953c8eafe32460ea076b47ccc5c14e31c30 Mon Sep 17 00:00:00 2001 From: Jozef Gloncak Date: Fri, 27 Mar 2015 10:27:37 +0100 Subject: [PATCH] Added type parameteris. Class type parameter was added to all classes in this change. Change-Id: I7cd27edef23b7b52bcc2d32d42f7feac3e7a9b4c Signed-off-by: Jozef Gloncak --- .../api/openflow/device/RequestContext.java | 3 ++- .../openflow/device/RequestFutureContext.java | 2 +- .../api/openflow/rpc/RpcContext.java | 17 ++++++------ .../impl/rpc/RequestContextImpl.java | 2 +- .../impl/rpc/RpcContextImpl.java | 27 ++++++++++--------- 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestContext.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestContext.java index b206e30a8c..8d9664b3d9 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestContext.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestContext.java @@ -16,8 +16,9 @@ import org.opendaylight.yangtools.yang.binding.DataObject; *

* Created by Martin Bobak on 25.2.2015. */ -public interface RequestContext extends RequestFutureContext, AutoCloseable { +public interface RequestContext extends RequestFutureContext, AutoCloseable { + @Override void close(); diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestFutureContext.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestFutureContext.java index 7ad87ea2b1..dac4ff32a6 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestFutureContext.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestFutureContext.java @@ -23,6 +23,6 @@ public interface RequestFutureContext { * @param * @return */ - SettableFuture> getFuture(); + SettableFuture> getFuture(); } diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcContext.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcContext.java index 14c76bd579..651fe6931d 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcContext.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcContext.java @@ -13,7 +13,6 @@ import org.opendaylight.openflowplugin.api.openflow.device.RequestContext; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.RpcService; import org.opendaylight.yangtools.yang.common.RpcResult; -import java.util.concurrent.Future; /** * This context is registered with MD-SAL as a routed RPC provider for the inventory node backed by this switch and @@ -27,33 +26,35 @@ public interface RpcContext extends AutoCloseable { void registerRpcServiceImplementation(Class serviceClass, S serviceInstance); /** - * Method adds request to request queue which has limited quota. After number of requests exceeds quota limit - * future will be done immediately and will contain information about exceeded request quota. - * + * Method adds request to request queue which has limited quota. After number of requests exceeds quota limit future + * will be done immediately and will contain information about exceeded request quota. + * * @param data */ - SettableFuture> storeOrFail(RequestContext data); + SettableFuture> storeOrFail(RequestContext data); /** * Method for setting request quota value. When the Request Context quota is exceeded, incoming RPCs fail * immediately, with a well-defined error. - * + * * @param maxRequestsPerDevice */ void setRequestContextQuota(int maxRequestsPerDevice); - void forgetRequestContext(RequestContext requestContext); + void forgetRequestContext(RequestContext requestContext); /** * Method provides device context. + * * @return */ DeviceContext getDeviceContext(); /** * Method returns new request context for current request. + * * @return */ - RequestContext createRequestContext(); + RequestContext createRequestContext(); } diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RequestContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RequestContextImpl.java index 0704557f58..d8237c90c2 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RequestContextImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RequestContextImpl.java @@ -16,7 +16,7 @@ import org.opendaylight.yangtools.yang.common.RpcResult; /** * @author joe */ -public class RequestContextImpl implements RequestContext { +public class RequestContextImpl implements RequestContext { private final RpcContext rpcContext; private SettableFuture> rpcResultFuture; diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java index 9a8c19ec3c..047d44dd06 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java @@ -8,6 +8,9 @@ package org.opendaylight.openflowplugin.impl.rpc; import com.google.common.util.concurrent.SettableFuture; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration; import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext; @@ -18,19 +21,17 @@ import org.opendaylight.yangtools.yang.binding.RpcService; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; public class RpcContextImpl implements RpcContext { final ProviderContext providerContext; // TODO: add private Sal salBroker - private final List requestContexts = new ArrayList<>(); - private DeviceContext deviceContext; + private final List> requestContexts = new ArrayList<>(); + private final DeviceContext deviceContext; private final List rpcRegistrations = new ArrayList<>(); - private final List synchronizedRequestsList = Collections.synchronizedList(new ArrayList()); + private final List> synchronizedRequestsList = Collections + .>synchronizedList(new ArrayList>()); private int maxRequestsPerDevice; @@ -41,28 +42,28 @@ public class RpcContextImpl implements RpcContext { /** * @see org.opendaylight.openflowplugin.api.openflow.rpc.RpcContext#registerRpcServiceImplementation(java.lang.Class, - * org.opendaylight.yangtools.yang.binding.RpcService) + * org.opendaylight.yangtools.yang.binding.RpcService) */ @Override public void registerRpcServiceImplementation(final Class serviceClass, - final S serviceInstance) { + final S serviceInstance) { rpcRegistrations.add(providerContext.addRoutedRpcImplementation(serviceClass, serviceInstance)); } @Override - public SettableFuture> storeOrFail(RequestContext requestContext) { + public SettableFuture> storeOrFail(final RequestContext requestContext) { final SettableFuture> rpcResultFuture = requestContext.getFuture(); if (synchronizedRequestsList.size() < maxRequestsPerDevice) { synchronizedRequestsList.add(requestContext); } else { - RpcResult rpcResult = RpcResultBuilder.failed().withError(RpcError.ErrorType.APPLICATION, "", "Device's request queue is full.").build(); + final RpcResult rpcResult = RpcResultBuilder.failed() + .withError(RpcError.ErrorType.APPLICATION, "", "Device's request queue is full.").build(); rpcResultFuture.set(rpcResult); } return rpcResultFuture; } - /** * Unregisters all services. * @@ -84,7 +85,7 @@ public class RpcContextImpl implements RpcContext { } @Override - public void forgetRequestContext(final RequestContext requestContext) { + public void forgetRequestContext(final RequestContext requestContext) { requestContexts.remove(requestContext); } @@ -94,7 +95,7 @@ public class RpcContextImpl implements RpcContext { } @Override - public RequestContext createRequestContext() { + public RequestContext createRequestContext() { return new RequestContextImpl(this); } -- 2.36.6