import static java.util.Objects.requireNonNull;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ClassToInstanceMap;
import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableClassToInstanceMap;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableTable;
import org.opendaylight.mdsal.dom.api.DOMActionProviderService;
import org.opendaylight.mdsal.dom.api.DOMActionResult;
import org.opendaylight.mdsal.dom.api.DOMActionService;
-import org.opendaylight.mdsal.dom.api.DOMActionServiceExtension;
import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
import org.opendaylight.mdsal.dom.api.DOMRpcAvailabilityListener;
import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
import org.opendaylight.mdsal.dom.api.DOMRpcImplementationNotAvailableException;
-import org.opendaylight.mdsal.dom.api.DOMRpcImplementationRegistration;
import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
import org.opendaylight.mdsal.dom.api.DOMRpcResult;
import org.opendaylight.mdsal.dom.api.DOMRpcService;
import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.mdsal.dom.spi.AbstractDOMRpcImplementationRegistration;
-import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
import org.opendaylight.yangtools.concepts.AbstractRegistration;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.concepts.ObjectRegistration;
import org.opendaylight.yangtools.concepts.Registration;
import org.opendaylight.yangtools.yang.common.QName;
import org.slf4j.LoggerFactory;
@Singleton
-@Component(immediate = true, service = DOMRpcRouterServices.class)
-public final class DOMRpcRouter extends AbstractRegistration
- implements DOMRpcRouterServices, EffectiveModelContextListener {
+@Component(service = DOMRpcRouter.class)
+public final class DOMRpcRouter extends AbstractRegistration implements EffectiveModelContextListener {
private static final Logger LOG = LoggerFactory.getLogger(DOMRpcRouter.class);
private static final ThreadFactory THREAD_FACTORY = new ThreadFactoryBuilder().setNameFormat(
"DOMRpcRouter-listener-%s").setDaemon(true).build();
private final @NonNull DOMRpcService rpcService = new RpcServiceFacade();
@GuardedBy("this")
- private ImmutableList<RegImpl<?>> listeners = ImmutableList.of();
+ private ImmutableList<RegImpl> listeners = ImmutableList.of();
@GuardedBy("this")
- private ImmutableList<ActionRegistration<?>> actionListeners = ImmutableList.of();
+ private ImmutableList<ActionRegistration> actionListeners = ImmutableList.of();
private volatile DOMRpcRoutingTable routingTable = DOMRpcRoutingTable.EMPTY;
close();
}
- @Override
- public DOMActionService getActionService() {
+ public @NonNull DOMActionService actionService() {
return actionService;
}
- @Override
- public DOMActionProviderService getActionProviderService() {
+ public @NonNull DOMActionProviderService actionProviderService() {
return actionProviderService;
}
- @Override
- public DOMRpcService getRpcService() {
+ public @NonNull DOMRpcService rpcService() {
return rpcService;
}
- @Override
- public DOMRpcProviderService getRpcProviderService() {
+ public @NonNull DOMRpcProviderService rpcProviderService() {
return rpcProviderService;
}
listenerNotifier.execute(() -> notifyActionChanged(newTable, implementation));
}
- private synchronized void removeListener(final ListenerRegistration<? extends DOMRpcAvailabilityListener> reg) {
+ private synchronized void removeListener(final RegImpl reg) {
listeners = ImmutableList.copyOf(Collections2.filter(listeners, input -> !reg.equals(input)));
}
- private synchronized void removeActionListener(final ListenerRegistration<? extends AvailabilityListener> reg) {
+ private synchronized void removeActionListener(final ActionRegistration reg) {
actionListeners = ImmutableList.copyOf(Collections2.filter(actionListeners, input -> !reg.equals(input)));
}
private synchronized void notifyAdded(final DOMRpcRoutingTable newTable, final DOMRpcImplementation impl) {
- for (RegImpl<?> l : listeners) {
+ for (var l : listeners) {
l.addRpc(newTable, impl);
}
}
private synchronized void notifyAdded(final DOMRpcRoutingTable newTable,
final Collection<? extends DOMRpcImplementation> impls) {
- for (RegImpl<?> l : listeners) {
- for (DOMRpcImplementation impl : impls) {
+ for (var l : listeners) {
+ for (var impl : impls) {
l.addRpc(newTable, impl);
}
}
}
private synchronized void notifyRemoved(final DOMRpcRoutingTable newTable, final DOMRpcImplementation impl) {
- for (RegImpl<?> l : listeners) {
+ for (var l : listeners) {
l.removeRpc(newTable, impl);
}
}
private synchronized void notifyRemoved(final DOMRpcRoutingTable newTable,
final Collection<? extends DOMRpcImplementation> impls) {
- for (RegImpl<?> l : listeners) {
+ for (var l : listeners) {
for (DOMRpcImplementation impl : impls) {
l.removeRpc(newTable, impl);
}
private synchronized void notifyActionChanged(final DOMActionRoutingTable newTable,
final DOMActionImplementation impl) {
- for (ActionRegistration<?> l : actionListeners) {
+ for (var l : actionListeners) {
l.actionChanged(newTable, impl);
}
}
return routingTable;
}
- private static final class RegImpl<T extends DOMRpcAvailabilityListener> extends AbstractListenerRegistration<T> {
+ private static final class RegImpl extends AbstractObjectRegistration<DOMRpcAvailabilityListener> {
private Map<QName, Set<YangInstanceIdentifier>> prevRpcs;
private DOMRpcRouter router;
- RegImpl(final DOMRpcRouter router, final T listener, final Map<QName, Set<YangInstanceIdentifier>> rpcs) {
+ RegImpl(final DOMRpcRouter router, final DOMRpcAvailabilityListener listener,
+ final Map<QName, Set<YangInstanceIdentifier>> rpcs) {
super(listener);
this.router = requireNonNull(router);
prevRpcs = requireNonNull(rpcs);
}
void addRpc(final DOMRpcRoutingTable newTable, final DOMRpcImplementation impl) {
- final T l = getInstance();
+ final var l = getInstance();
if (!l.acceptsImplementation(impl)) {
return;
}
}
void removeRpc(final DOMRpcRoutingTable newTable, final DOMRpcImplementation impl) {
- final T l = getInstance();
+ final var l = getInstance();
if (!l.acceptsImplementation(impl)) {
return;
}
}
}
- private static final class ActionRegistration<T extends AvailabilityListener>
- extends AbstractListenerRegistration<T> {
-
+ private static final class ActionRegistration extends AbstractObjectRegistration<AvailabilityListener> {
private Map<Absolute, Set<DOMDataTreeIdentifier>> prevActions;
private DOMRpcRouter router;
- ActionRegistration(final DOMRpcRouter router, final T listener,
+ ActionRegistration(final DOMRpcRouter router, final AvailabilityListener listener,
final Map<Absolute, Set<DOMDataTreeIdentifier>> actions) {
super(listener);
this.router = requireNonNull(router);
}
void initialTable() {
- final List<DOMActionInstance> added = new ArrayList<>();
- for (Entry<Absolute, Set<DOMDataTreeIdentifier>> e : prevActions.entrySet()) {
+ final var added = new ArrayList<DOMActionInstance>();
+ for (var e : prevActions.entrySet()) {
added.addAll(Collections2.transform(e.getValue(), i -> DOMActionInstance.of(e.getKey(), i)));
}
if (!added.isEmpty()) {
}
void actionChanged(final DOMActionRoutingTable newTable, final DOMActionImplementation impl) {
- final T l = getInstance();
+ final var l = getInstance();
if (!l.acceptsImplementation(impl)) {
return;
}
}
@NonNullByDefault
- private final class ActionAvailabilityFacade implements DOMActionAvailabilityExtension {
+ private final class ActionServiceFacade implements DOMActionService, DOMActionAvailabilityExtension {
@Override
- public <T extends AvailabilityListener> ListenerRegistration<T> registerAvailabilityListener(final T listener) {
- synchronized (DOMRpcRouter.this) {
- final ActionRegistration<T> ret = new ActionRegistration<>(DOMRpcRouter.this, listener,
- actionRoutingTable.getOperations(listener));
- actionListeners = ImmutableList.<ActionRegistration<?>>builder()
- .addAll(actionListeners)
- .add(ret)
- .build();
-
- listenerNotifier.execute(ret::initialTable);
- return ret;
- }
- }
- }
-
- @NonNullByDefault
- private final class ActionServiceFacade implements DOMActionService {
- private final ClassToInstanceMap<DOMActionServiceExtension> extensions = ImmutableClassToInstanceMap.of(
- DOMActionAvailabilityExtension.class, new ActionAvailabilityFacade());
-
- @Override
- public ClassToInstanceMap<DOMActionServiceExtension> getExtensions() {
- return extensions;
+ public List<Extension> supportedExtensions() {
+ return List.of(this);
}
@Override
: Futures.immediateFailedFuture(
new DOMActionNotAvailableException("No implementation of Action %s available", type));
}
+
+ @Override
+ public Registration registerAvailabilityListener(final AvailabilityListener listener) {
+ synchronized (DOMRpcRouter.this) {
+ final var ret = new ActionRegistration(DOMRpcRouter.this, listener,
+ actionRoutingTable.getOperations(listener));
+ actionListeners = ImmutableList.<ActionRegistration>builder()
+ .addAll(actionListeners)
+ .add(ret)
+ .build();
+
+ listenerNotifier.execute(ret::initialTable);
+ return ret;
+ }
+ }
}
@NonNullByDefault
private final class RpcServiceFacade implements DOMRpcService {
@Override
public ListenableFuture<? extends DOMRpcResult> invokeRpc(final QName type, final ContainerNode input) {
- final AbstractDOMRpcRoutingTableEntry entry = (AbstractDOMRpcRoutingTableEntry) routingTable.getEntry(type);
+ final var entry = (AbstractDOMRpcRoutingTableEntry) routingTable.getEntry(type);
if (entry == null) {
return Futures.immediateFailedFuture(
new DOMRpcImplementationNotAvailableException("No implementation of RPC %s available", type));
}
@Override
- public <T extends DOMRpcAvailabilityListener> ListenerRegistration<T> registerRpcListener(final T listener) {
+ public Registration registerRpcListener(final DOMRpcAvailabilityListener listener) {
synchronized (DOMRpcRouter.this) {
- final RegImpl<T> ret = new RegImpl<>(DOMRpcRouter.this, listener, routingTable.getOperations(listener));
- listeners = ImmutableList.<RegImpl<?>>builder().addAll(listeners).add(ret).build();
+ final var ret = new RegImpl(DOMRpcRouter.this, listener, routingTable.getOperations(listener));
+ listeners = ImmutableList.<RegImpl>builder().addAll(listeners).add(ret).build();
listenerNotifier.execute(ret::initialTable);
return ret;
private final class RpcProviderServiceFacade implements DOMRpcProviderService {
@Override
- public <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T> registerRpcImplementation(
- final T implementation, final DOMRpcIdentifier... rpcs) {
- return registerRpcImplementation(implementation, ImmutableSet.copyOf(rpcs));
- }
-
- @Override
- public <T extends DOMRpcImplementation> DOMRpcImplementationRegistration<T> registerRpcImplementation(
- final T implementation, final Set<DOMRpcIdentifier> rpcs) {
+ public Registration registerRpcImplementation(final DOMRpcImplementation implementation,
+ final Set<DOMRpcIdentifier> rpcs) {
synchronized (DOMRpcRouter.this) {
final DOMRpcRoutingTable oldTable = routingTable;
listenerNotifier.execute(() -> notifyAdded(newTable, implementation));
}
- return new AbstractDOMRpcImplementationRegistration<>(implementation) {
+ return new AbstractRegistration() {
@Override
protected void removeRegistration() {
- removeRpcImplementation(getInstance(), rpcs);
+ removeRpcImplementation(implementation, rpcs);
}
};
}
@Override
- public org.opendaylight.yangtools.concepts.Registration registerRpcImplementations(
- final Map<DOMRpcIdentifier, DOMRpcImplementation> map) {
+ public Registration registerRpcImplementations(final Map<DOMRpcIdentifier, DOMRpcImplementation> map) {
checkArgument(!map.isEmpty());
final var builder = ImmutableTable.<QName, YangInstanceIdentifier, DOMRpcImplementation>builder();
Code Review / mdsal.git / blobdiff