X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Fconnect%2Fnetconf%2Fschema%2FNetconfRemoteSchemaYangSourceProvider.java;h=3ffc556abdb25956ff4909af48986c312310dd29;hb=refs%2Fchanges%2F19%2F81419%2F2;hp=8cfc267ecd9e0c73ecf65beceecdd1f5c1bae93b;hpb=1e174be6002940e17aee31d15f8914273d30f25c;p=netconf.git diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java index 8cfc267ecd..3ffc556abd 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java @@ -7,30 +7,26 @@ */ package org.opendaylight.netconf.sal.connect.netconf.schema; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.GET_SCHEMA_QNAME; import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_DATA_QNAME; -import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.toId; -import com.google.common.base.Function; import com.google.common.base.MoreObjects; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import javax.annotation.Nonnull; +import java.util.Optional; import javax.xml.transform.dom.DOMSource; -import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; -import org.opendaylight.controller.md.sal.dom.api.DOMRpcService; +import org.opendaylight.mdsal.dom.api.DOMRpcService; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil; import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.Yang; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; @@ -38,7 +34,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; @@ -48,37 +44,33 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Element; public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSourceProvider { - private static final Logger LOG = LoggerFactory.getLogger(NetconfRemoteSchemaYangSourceProvider.class); - - private final DOMRpcService rpc; - private final RemoteDeviceId id; - - public NetconfRemoteSchemaYangSourceProvider(final RemoteDeviceId id, final DOMRpcService rpc) { - this.id = id; - this.rpc = Preconditions.checkNotNull(rpc); - } - private static final NodeIdentifier FORMAT_PATHARG = - new NodeIdentifier(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "format").intern()); + NodeIdentifier.create(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "format").intern()); private static final NodeIdentifier GET_SCHEMA_PATHARG = - new NodeIdentifier(NetconfMessageTransformUtil.GET_SCHEMA_QNAME); + NodeIdentifier.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME); private static final NodeIdentifier IDENTIFIER_PATHARG = - new NodeIdentifier(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "identifier").intern()); + NodeIdentifier.create(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "identifier").intern()); private static final NodeIdentifier VERSION_PATHARG = - new NodeIdentifier(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "version").intern()); - + NodeIdentifier.create(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "version").intern()); private static final LeafNode FORMAT_LEAF = Builders.leafBuilder().withNodeIdentifier(FORMAT_PATHARG).withValue(Yang.QNAME).build(); - private static final QName NETCONF_DATA = QName.create(GET_SCHEMA_QNAME, NETCONF_DATA_QNAME.getLocalName()).intern(); - private static final NodeIdentifier NETCONF_DATA_PATHARG = toId(NETCONF_DATA); + private static final NodeIdentifier NETCONF_DATA_PATHARG = NodeIdentifier.create(NETCONF_DATA); + + private final DOMRpcService rpc; + private final RemoteDeviceId id; + + public NetconfRemoteSchemaYangSourceProvider(final RemoteDeviceId id, final DOMRpcService rpc) { + this.id = id; + this.rpc = requireNonNull(rpc); + } public static ContainerNode createGetSchemaRequest(final String moduleName, final Optional revision) { final LeafNode identifier = Builders.leafBuilder().withNodeIdentifier(IDENTIFIER_PATHARG).withValue(moduleName).build(); - final DataContainerNodeAttrBuilder builder = Builders.containerBuilder() + final DataContainerNodeBuilder builder = Builders.containerBuilder() .withNodeIdentifier(GET_SCHEMA_PATHARG).withChild(identifier).withChild(FORMAT_LEAF); if (revision.isPresent()) { @@ -91,19 +83,16 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource private static Optional getSchemaFromRpc(final RemoteDeviceId id, final NormalizedNode result) { if (result == null) { - return Optional.absent(); + return Optional.empty(); } - final java.util.Optional> child = - ((ContainerNode) result).getChild(NETCONF_DATA_PATHARG); - - Preconditions.checkState(child.isPresent() && child.get() instanceof AnyXmlNode, + final Optional> child = ((ContainerNode) result).getChild(NETCONF_DATA_PATHARG); + checkState(child.isPresent() && child.get() instanceof AnyXmlNode, "%s Unexpected response to get-schema, expected response with one child %s, but was %s", id, NETCONF_DATA, result); final DOMSource wrappedNode = ((AnyXmlNode) child.get()).getValue(); - Preconditions.checkNotNull(wrappedNode.getNode()); - final Element dataNode = (Element) wrappedNode.getNode(); + final Element dataNode = (Element) requireNonNull(wrappedNode.getNode()); return Optional.of(dataNode.getTextContent().trim()); } @@ -112,62 +101,28 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource public ListenableFuture getSource(final SourceIdentifier sourceIdentifier) { final String moduleName = sourceIdentifier.getName(); - final Optional revision = Optional.fromJavaUtil(sourceIdentifier.getRevision().map(Revision::toString)); + final Optional revision = sourceIdentifier.getRevision().map(Revision::toString); final NormalizedNode getSchemaRequest = createGetSchemaRequest(moduleName, revision); - - LOG.trace("{}: Loading YANG schema source for {}:{}", id, moduleName, - revision); - + LOG.trace("{}: Loading YANG schema source for {}:{}", id, moduleName, revision); return Futures.transform( rpc.invokeRpc(SchemaPath.create(true, NetconfMessageTransformUtil.GET_SCHEMA_QNAME), getSchemaRequest), - new ResultToYangSourceTransformer(id, sourceIdentifier, moduleName, revision), - MoreExecutors.directExecutor()); - } - - /** - * Transform composite node to string schema representation and then to ASTSchemaSource. - */ - private static final class ResultToYangSourceTransformer implements - Function { - - private final RemoteDeviceId id; - private final SourceIdentifier sourceIdentifier; - private final String moduleName; - private final Optional revision; - - ResultToYangSourceTransformer(final RemoteDeviceId id, final SourceIdentifier sourceIdentifier, - final String moduleName, final Optional revision) { - this.id = id; - this.sourceIdentifier = sourceIdentifier; - this.moduleName = moduleName; - this.revision = revision; - } - - @Override - public YangTextSchemaSource apply(@Nonnull final DOMRpcResult input) { - - if (input.getErrors().isEmpty()) { - - final Optional schemaString = getSchemaFromRpc(id, input.getResult()); - - Preconditions.checkState(schemaString.isPresent(), - "%s: Unexpected response to get-schema, schema not present in message for: %s", - id, sourceIdentifier); - - LOG.debug("{}: YANG Schema successfully retrieved for {}:{}", - id, moduleName, revision); - return new NetconfYangTextSchemaSource(id, sourceIdentifier, schemaString); - } - - LOG.warn( - "{}: YANG schema was not successfully retrieved for {}. Errors: {}", - id, sourceIdentifier, input.getErrors()); - - throw new IllegalStateException(String.format( + input -> { + // Transform composite node to string schema representation and then to ASTSchemaSource. + if (input.getErrors().isEmpty()) { + final Optional schemaString = getSchemaFromRpc(id, input.getResult()); + checkState(schemaString.isPresent(), + "%s: Unexpected response to get-schema, schema not present in message for: %s", id, + sourceIdentifier); + LOG.debug("{}: YANG Schema successfully retrieved for {}:{}", id, moduleName, revision); + return new NetconfYangTextSchemaSource(id, sourceIdentifier, schemaString); + } + + LOG.warn("{}: YANG schema was not successfully retrieved for {}. Errors: {}", id, sourceIdentifier, + input.getErrors()); + throw new IllegalStateException(String.format( "%s: YANG schema was not successfully retrieved for %s. Errors: %s", id, sourceIdentifier, input.getErrors())); - } - + }, MoreExecutors.directExecutor()); } static class NetconfYangTextSchemaSource extends YangTextSchemaSource { @@ -175,7 +130,7 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource private final Optional schemaString; NetconfYangTextSchemaSource(final RemoteDeviceId id, final SourceIdentifier sourceIdentifier, - final Optional schemaString) { + final Optional schemaString) { super(sourceIdentifier); this.id = id; this.schemaString = schemaString;