Revert "WIP: Bump upstreams"

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

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 d329bf8c9ae3a4249ce483dba869339f233961e5..3ac23e840cd720070dbf5f4cb6d10291ea9de22b 100644 (file)
--- 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
@@ -18,7 +18,7 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Semaphore;
-import javax.annotation.Nonnull;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
@@ -59,12 +59,12 @@ class RpcContextImpl implements RpcContext {
     private final NotificationPublishService notificationPublishService;
     private ContextChainMastershipWatcher contextChainMastershipWatcher;
 
-    RpcContextImpl(@Nonnull final RpcProviderService rpcProviderRegistry,
+    RpcContextImpl(@NonNull final RpcProviderService rpcProviderRegistry,
                    final int maxRequests,
-                   @Nonnull final DeviceContext deviceContext,
-                   @Nonnull final ExtensionConverterProvider extensionConverterProvider,
-                   @Nonnull final ConvertorExecutor convertorExecutor,
-                   @Nonnull final NotificationPublishService notificationPublishService,
+                   @NonNull final DeviceContext deviceContext,
+                   @NonNull final ExtensionConverterProvider extensionConverterProvider,
+                   @NonNull final ConvertorExecutor convertorExecutor,
+                   @NonNull final NotificationPublishService notificationPublishService,
                    final boolean statisticsRpcEnabled) {
         this.deviceContext = deviceContext;
         this.deviceInfo = deviceContext.getDeviceInfo();
@@ -129,7 +129,7 @@ class RpcContextImpl implements RpcContext {
                     nodeInstanceIdentifier.getKey().getId().getValue(), tracker.availablePermits());
         }
 
-        final Long xid = deviceInfo.reserveXidForDeviceMessage();
+        final Uint32 xid = deviceInfo.reserveXidForDeviceMessage();
         if (xid == null) {
             LOG.warn("Xid cannot be reserved for new RequestContext, node:{}",
                     nodeInstanceIdentifier.getKey().getId().getValue());
@@ -137,7 +137,7 @@ class RpcContextImpl implements RpcContext {
             return null;
         }
 
-        return new AbstractRequestContext<>(Uint32.valueOf(xid)) {
+        return new AbstractRequestContext<>(xid) {
             @Override
             public void close() {
                 tracker.release();
@@ -170,7 +170,7 @@ class RpcContextImpl implements RpcContext {
     }
 
     @Override
-    public void registerMastershipWatcher(@Nonnull final ContextChainMastershipWatcher newWatcher) {
+    public void registerMastershipWatcher(@NonNull final ContextChainMastershipWatcher newWatcher) {
         this.contextChainMastershipWatcher = newWatcher;
     }
 
@@ -197,7 +197,7 @@ class RpcContextImpl implements RpcContext {
         contextChainMastershipWatcher.onMasterRoleAcquired(deviceInfo, ContextChainMastershipState.RPC_REGISTRATION);
     }
 
-    @Nonnull
+    @NonNull
     @Override
     public ServiceGroupIdentifier getIdentifier() {
         return deviceInfo.getServiceIdentifier();