These RPCs are only used when a listener registers, there is simply
no point to retain them in a transformed collection. We can always
re-create them as needed from the SchemaContext.
Change-Id: Ia47c3163bff5232d079f8768420bfa6360fe3b49
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
*/
package org.opendaylight.netconf.sal.connect.netconf.sal;
*/
package org.opendaylight.netconf.sal.connect.netconf.sal;
+import static java.util.Objects.requireNonNull;
+
import com.google.common.collect.Collections2;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.collect.Collections2;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
-import java.util.Collection;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcAvailabilityListener;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcAvailabilityListener;
private final RemoteDeviceCommunicator<NetconfMessage> communicator;
private final MessageTransformer<NetconfMessage> transformer;
private final RemoteDeviceCommunicator<NetconfMessage> communicator;
private final MessageTransformer<NetconfMessage> transformer;
- private final Collection<DOMRpcIdentifier> availableRpcs;
+ private final SchemaContext schemaContext;
public NetconfDeviceRpc(final SchemaContext schemaContext,
final RemoteDeviceCommunicator<NetconfMessage> communicator,
final MessageTransformer<NetconfMessage> transformer) {
this.communicator = communicator;
this.transformer = transformer;
public NetconfDeviceRpc(final SchemaContext schemaContext,
final RemoteDeviceCommunicator<NetconfMessage> communicator,
final MessageTransformer<NetconfMessage> transformer) {
this.communicator = communicator;
this.transformer = transformer;
-
- availableRpcs = Collections2.transform(schemaContext.getOperations(),
- input -> DOMRpcIdentifier.create(input.getPath()));
+ this.schemaContext = requireNonNull(schemaContext);
public <T extends DOMRpcAvailabilityListener> ListenerRegistration<T> registerRpcListener(
@Nonnull final T listener) {
public <T extends DOMRpcAvailabilityListener> ListenerRegistration<T> registerRpcListener(
@Nonnull final T listener) {
- listener.onRpcAvailable(availableRpcs);
+ listener.onRpcAvailable(Collections2.transform(schemaContext.getOperations(),
+ input -> DOMRpcIdentifier.create(input.getPath())));
return new ListenerRegistration<T>() {
@Override
return new ListenerRegistration<T>() {
@Override