-/**
+/*
* Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
package org.opendaylight.openflowplugin.impl.rpc;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterators;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Semaphore;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration;
-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.mdsal.singleton.common.api.ServiceGroupIdentifier;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
import org.opendaylight.openflowplugin.extension.api.core.extension.ExtensionConverterProvider;
import org.opendaylight.openflowplugin.impl.util.MdSalRegistrationUtils;
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeContext;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
+import org.opendaylight.yangtools.concepts.ObjectRegistration;
import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
import org.opendaylight.yangtools.yang.binding.RpcService;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
class RpcContextImpl implements RpcContext {
private static final Logger LOG = LoggerFactory.getLogger(RpcContextImpl.class);
- private final RpcProviderRegistry rpcProviderRegistry;
+ private final RpcProviderService rpcProviderRegistry;
private final MessageSpy messageSpy;
private final Semaphore tracker;
- private boolean isStatisticsRpcEnabled;
+ private final boolean isStatisticsRpcEnabled;
// TODO: add private Sal salBroker
- private final ConcurrentMap<Class<?>, RoutedRpcRegistration<?>> rpcRegistrations = new ConcurrentHashMap<>();
+ private final ConcurrentMap<Class<?>, ObjectRegistration<? extends RpcService>> rpcRegistrations =
+ new ConcurrentHashMap<>();
private final KeyedInstanceIdentifier<Node, NodeKey> nodeInstanceIdentifier;
private final DeviceInfo deviceInfo;
private final DeviceContext deviceContext;
private final NotificationPublishService notificationPublishService;
private ContextChainMastershipWatcher contextChainMastershipWatcher;
- RpcContextImpl(@Nonnull final RpcProviderRegistry 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,
- boolean statisticsRpcEnabled) {
+ @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();
this.nodeInstanceIdentifier = deviceContext.getDeviceInfo().getNodeInstanceIdentifier();
public <S extends RpcService> void registerRpcServiceImplementation(final Class<S> serviceClass,
final S serviceInstance) {
if (!rpcRegistrations.containsKey(serviceClass)) {
- final RoutedRpcRegistration<S> routedRpcReg =
- rpcProviderRegistry.addRoutedRpcImplementation(serviceClass, serviceInstance);
- routedRpcReg.registerPath(NodeContext.class, nodeInstanceIdentifier);
+ final ObjectRegistration<S> routedRpcReg = rpcProviderRegistry.registerRpcImplementation(serviceClass,
+ serviceInstance, ImmutableSet.of(nodeInstanceIdentifier));
rpcRegistrations.put(serviceClass, routedRpcReg);
if (LOG.isDebugEnabled()) {
LOG.debug("Registration of service {} for device {}.",
@Override
public <S extends RpcService> S lookupRpcService(final Class<S> serviceClass) {
- RoutedRpcRegistration<?> registration = rpcRegistrations.get(serviceClass);
+ ObjectRegistration<? extends RpcService> registration = rpcRegistrations.get(serviceClass);
final RpcService rpcService = registration.getInstance();
return serviceClass.cast(rpcService);
}
}
private void unregisterRPCs() {
- for (final Iterator<Entry<Class<?>, RoutedRpcRegistration<?>>> iterator = Iterators
+ for (final Iterator<Entry<Class<?>, ObjectRegistration<? extends RpcService>>> iterator = Iterators
.consumingIterator(rpcRegistrations.entrySet().iterator()); iterator.hasNext(); ) {
- final RoutedRpcRegistration<?> rpcRegistration = iterator.next().getValue();
- rpcRegistration.unregisterPath(NodeContext.class, nodeInstanceIdentifier);
+ final ObjectRegistration<? extends RpcService> rpcRegistration = iterator.next().getValue();
rpcRegistration.close();
if (LOG.isDebugEnabled()) {
LOG.debug("Closing RPC Registration of service {} for device {}.",
- rpcRegistration.getServiceType().getSimpleName(),
+ rpcRegistration.getInstance().getClass().getSimpleName(),
nodeInstanceIdentifier.getKey().getId().getValue());
}
}
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());
return null;
}
- return new AbstractRequestContext<T>(xid) {
+ return new AbstractRequestContext<>(xid) {
@Override
public void close() {
tracker.release();
- final long xid = getXid().getValue();
- LOG.trace("Removed request context with xid {}", xid);
+ LOG.trace("Removed request context with xid {}", getXid().getValue());
messageSpy.spyMessage(RpcContextImpl.class, MessageSpy.StatisticsGroup.REQUEST_STACK_FREED);
}
};
public <S extends RpcService> void unregisterRpcServiceImplementation(final Class<S> serviceClass) {
LOG.trace("Try to unregister serviceClass {} for Node {}",
serviceClass, nodeInstanceIdentifier.getKey().getId());
- final RoutedRpcRegistration<?> rpcRegistration = rpcRegistrations.remove(serviceClass);
+ final ObjectRegistration<? extends RpcService> rpcRegistration = rpcRegistrations.remove(serviceClass);
if (rpcRegistration != null) {
- rpcRegistration.unregisterPath(NodeContext.class, nodeInstanceIdentifier);
rpcRegistration.close();
LOG.debug("Un-registration serviceClass {} for Node {}", serviceClass.getSimpleName(),
nodeInstanceIdentifier.getKey().getId().getValue());
}
@Override
- public void registerMastershipWatcher(@Nonnull final ContextChainMastershipWatcher newWatcher) {
+ public void registerMastershipWatcher(@NonNull final ContextChainMastershipWatcher newWatcher) {
this.contextChainMastershipWatcher = newWatcher;
}
@Override
public ListenableFuture<Void> closeServiceInstance() {
- return Futures.transform(Futures.immediateFuture(null), new Function<Void, Void>() {
- @Nullable
- @Override
- public Void apply(@Nullable final Void input) {
- unregisterRPCs();
- return null;
- }
+ return Futures.transform(Futures.immediateFuture(null), input -> {
+ unregisterRPCs();
+ return null;
}, MoreExecutors.directExecutor());
}
contextChainMastershipWatcher.onMasterRoleAcquired(deviceInfo, ContextChainMastershipState.RPC_REGISTRATION);
}
- @Nonnull
+ @NonNull
@Override
public ServiceGroupIdentifier getIdentifier() {
return deviceInfo.getServiceIdentifier();
Code Review / openflowplugin.git / blobdiff