Decompose RPC implementation classes

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / rpc / RpcManagerImpl.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcManagerImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcManagerImpl.java
index 0ff516da0c1883af7edfb76c2f525f48e7435882..7f86c9b86de2621137ea8db104bc4b6addd48a5f 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcManagerImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcManagerImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -12,9 +12,9 @@ import com.google.common.collect.Iterators;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import javax.annotation.Nonnull;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.rpc.RpcContext;
@@ -29,15 +29,14 @@ public class RpcManagerImpl implements RpcManager {
 
     private static final Logger LOG = LoggerFactory.getLogger(RpcManagerImpl.class);
     private final OpenflowProviderConfig config;
-    private final RpcProviderRegistry rpcProviderRegistry;
+    private final RpcProviderService rpcProviderRegistry;
     private final ConcurrentMap<DeviceInfo, RpcContext> contexts = new ConcurrentHashMap<>();
     private final ExtensionConverterProvider extensionConverterProvider;
     private final ConvertorExecutor convertorExecutor;
     private final NotificationPublishService notificationPublishService;
 
-
     public RpcManagerImpl(final OpenflowProviderConfig config,
-                          final RpcProviderRegistry rpcProviderRegistry,
+                          final RpcProviderService rpcProviderRegistry,
                           final ExtensionConverterProvider extensionConverterProvider,
                           final ConvertorExecutor convertorExecutor,
                           final NotificationPublishService notificationPublishService) {
@@ -57,26 +56,27 @@ public class RpcManagerImpl implements RpcManager {
     }
 
     /**
-     * This method is only for testing
+     * This method is only for testing.
      */
     @VisibleForTesting
-    void addRecordToContexts(DeviceInfo deviceInfo, RpcContext rpcContexts) {
-        if(!contexts.containsKey(deviceInfo)) {
-            this.contexts.put(deviceInfo,rpcContexts);
+    void addRecordToContexts(final DeviceInfo deviceInfo, final RpcContext rpcContexts) {
+        if (!contexts.containsKey(deviceInfo)) {
+            this.contexts.put(deviceInfo, rpcContexts);
         }
     }
 
-    public RpcContext createContext(final @Nonnull DeviceInfo deviceInfo, final @Nonnull DeviceContext deviceContext) {
+    @Override
+    public RpcContext createContext(final @NonNull DeviceContext deviceContext) {
         final RpcContextImpl rpcContext = new RpcContextImpl(
                 rpcProviderRegistry,
-                config.getRpcRequestsQuota().getValue(),
+                config.getRpcRequestsQuota().getValue().toJava(),
                 deviceContext,
                 extensionConverterProvider,
                 convertorExecutor,
                 notificationPublishService,
-                config.isIsStatisticsRpcEnabled());
+                config.getIsStatisticsRpcEnabled());
 
-        contexts.put(deviceInfo, rpcContext);
+        contexts.put(deviceContext.getDeviceInfo(), rpcContext);
         return rpcContext;
     }
 
@@ -84,7 +84,7 @@ public class RpcManagerImpl implements RpcManager {
     public void onDeviceRemoved(final DeviceInfo deviceInfo) {
         contexts.remove(deviceInfo);
         if (LOG.isDebugEnabled()) {
-            LOG.debug("Rpc context removed for node {}", deviceInfo.getLOGValue());
+            LOG.debug("Rpc context removed for node {}", deviceInfo);
         }
     }
 }