From db9f267b3930a28054e967c75db228e27663aedc Mon Sep 17 00:00:00 2001 From: highstreetherbert Date: Thu, 29 Apr 2021 19:06:54 +0200 Subject: migrate features to silicon migrate features to silicon Issue-ID: CCSDK-3278 Signed-off-by: highstreetherbert Change-Id: Icabe6bd5b760438eedd8c6b78a70197c287c5199 Signed-off-by: highstreetherbert --- .../impl/access/dom/NetconfDomAccessorImpl.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'sdnr/wt/netconfnode-state-service/provider/src/main/java') diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/dom/NetconfDomAccessorImpl.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/dom/NetconfDomAccessorImpl.java index caf3da1a7..3212eac82 100644 --- a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/dom/NetconfDomAccessorImpl.java +++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/dom/NetconfDomAccessorImpl.java @@ -68,7 +68,7 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -77,8 +77,6 @@ public class NetconfDomAccessorImpl extends NetconfAccessorImpl implements Netco private static final Logger LOG = LoggerFactory.getLogger(NetconfDomAccessorImpl.class); private static final QName CREATE_SUBSCRIPTION = QName.create(CreateSubscriptionInput.QNAME, "create-subscription"); - private static final SchemaPath RPC_PATH_CREATE_SUBSCRIPTION = - NetconfMessageTransformUtil.toPath(CREATE_SUBSCRIPTION); private static final YangInstanceIdentifier STREAMS_PATH = YangInstanceIdentifier.builder().node(Netconf.QNAME).node(Streams.QNAME).build(); @@ -174,7 +172,7 @@ public class NetconfDomAccessorImpl extends NetconfAccessorImpl implements Netco @Override public @NonNull ListenerRegistration doRegisterNotificationListener( - @NonNull T listener, Collection types) { + @NonNull T listener, Collection types) { LOG.info("Begin register listener for Mountpoint {}", mountpoint.getIdentifier().toString()); final ListenerRegistration ranListenerRegistration = @@ -188,14 +186,14 @@ public class NetconfDomAccessorImpl extends NetconfAccessorImpl implements Netco @Override public @NonNull ListenerRegistration doRegisterNotificationListener( - @NonNull T listener, SchemaPath[] types) { + @NonNull T listener, Absolute[] types) { return doRegisterNotificationListener(listener, Arrays.asList(types)); } @Override public @NonNull ListenerRegistration doRegisterNotificationListener( @NonNull T listener, QName[] types) { - List schemaPathList = Arrays.stream(types).map(qname -> NetconfMessageTransformUtil.toPath(qname)).collect(toList()); + List schemaPathList = Arrays.stream(types).map(qname -> Absolute.of(qname)).collect(toList()); return doRegisterNotificationListener(listener, schemaPathList); } @@ -203,7 +201,7 @@ public class NetconfDomAccessorImpl extends NetconfAccessorImpl implements Netco @Override public ListenableFuture invokeCreateSubscription(CreateSubscriptionInput input) { final ContainerNode nnInput = serializer.toNormalizedNodeRpcData(input); - return rpcService.invokeRpc(RPC_PATH_CREATE_SUBSCRIPTION, nnInput); + return rpcService.invokeRpc(CREATE_SUBSCRIPTION, nnInput); } @Override -- cgit 1.2.3-korg