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=6bb12e7e4b19e083bf6aa6c0748f7c36375650c2;hb=476cc2164a06b77e7dd38859e0124d82cd2c8847;hp=72d2b391a2c32276768789774c9bddde053c455e;hpb=4198af3bf54526fa0b2ca4e4e1e1f8b0c81eb281;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 72d2b391a2..6bb12e7e4b 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 @@ -11,7 +11,6 @@ import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTr 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.Charsets; import com.google.common.base.Function; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; @@ -22,6 +21,7 @@ import com.google.common.util.concurrent.ListenableFuture; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import javax.xml.transform.dom.DOMSource; import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; import org.opendaylight.controller.md.sal.dom.api.DOMRpcService; @@ -31,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.mon import org.opendaylight.yangtools.util.concurrent.ExceptionMapper; import org.opendaylight.yangtools.yang.common.QName; 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; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; @@ -54,8 +55,8 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource private static final ExceptionMapper MAPPER = new ExceptionMapper( "schemaDownload", SchemaSourceException.class) { @Override - protected SchemaSourceException newWithCause(final String s, final Throwable throwable) { - return new SchemaSourceException(s, throwable); + protected SchemaSourceException newWithCause(final String message, final Throwable throwable) { + return new SchemaSourceException(message, throwable); } }; @@ -67,26 +68,31 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource this.rpc = Preconditions.checkNotNull(rpc); } - public static ContainerNode createGetSchemaRequest(final String moduleName, final Optional revision) { - final QName identifierQName = QName.cachedReference(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "identifier")); - final YangInstanceIdentifier.NodeIdentifier identifierId = new YangInstanceIdentifier.NodeIdentifier(identifierQName); - final LeafNode identifier = Builders.leafBuilder().withNodeIdentifier(identifierId).withValue(moduleName).build(); - - final QName formatQName = QName.cachedReference(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "format")); - final YangInstanceIdentifier.NodeIdentifier formatId = new YangInstanceIdentifier.NodeIdentifier(formatQName); - final LeafNode format = Builders.leafBuilder().withNodeIdentifier(formatId).withValue(Yang.QNAME).build(); + private static final NodeIdentifier FORMAT_PATHARG = + new NodeIdentifier(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "format").intern()); + private static final NodeIdentifier GET_SCHEMA_PATHARG = + new NodeIdentifier(NetconfMessageTransformUtil.GET_SCHEMA_QNAME); + private static final NodeIdentifier IDENTIFIER_PATHARG = + new NodeIdentifier(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "identifier").intern()); + private static final NodeIdentifier VERSION_PATHARG = + new NodeIdentifier(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "version").intern()); - final DataContainerNodeAttrBuilder builder = Builders.containerBuilder(); + private static final LeafNode FORMAT_LEAF = + Builders.leafBuilder().withNodeIdentifier(FORMAT_PATHARG).withValue(Yang.QNAME).build(); - builder.withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(NetconfMessageTransformUtil.GET_SCHEMA_QNAME)) - .withChild(identifier).withChild(format); + 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); - if(revision.isPresent()) { - final QName revisionQName = QName.cachedReference(QName.create(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, "version")); - final YangInstanceIdentifier.NodeIdentifier revisionId = new YangInstanceIdentifier.NodeIdentifier(revisionQName); - final LeafNode revisionNode = Builders.leafBuilder().withNodeIdentifier(revisionId).withValue(revision.get()).build(); - - builder.withChild(revisionNode); + 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() + .withNodeIdentifier(GET_SCHEMA_PATHARG).withChild(identifier).withChild(FORMAT_LEAF); + + if (revision.isPresent()) { + builder.withChild(Builders.leafBuilder() + .withNodeIdentifier(VERSION_PATHARG).withValue(revision.get()).build()); } return builder.build(); @@ -97,12 +103,12 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource return Optional.absent(); } - final QName schemaWrapperNode = QName.cachedReference(QName.create(GET_SCHEMA_QNAME, NETCONF_DATA_QNAME.getLocalName())); - final Optional> child = ((ContainerNode) result).getChild(toId(schemaWrapperNode)); + final Optional> child = + ((ContainerNode) result).getChild(NETCONF_DATA_PATHARG); Preconditions.checkState(child.isPresent() && child.get() instanceof AnyXmlNode, "%s Unexpected response to get-schema, expected response with one child %s, but was %s", id, - schemaWrapperNode, result); + NETCONF_DATA, result); final DOMSource wrappedNode = ((AnyXmlNode) child.get()).getValue(); Preconditions.checkNotNull(wrappedNode.getNode()); @@ -112,11 +118,13 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource } @Override - public CheckedFuture getSource(final SourceIdentifier sourceIdentifier) { + public CheckedFuture getSource( + final SourceIdentifier sourceIdentifier) { final String moduleName = sourceIdentifier.getName(); // If formatted revision is SourceIdentifier.NOT_PRESENT_FORMATTED_REVISION, we have to omit it from request - final String formattedRevision = sourceIdentifier.getRevision().equals(SourceIdentifier.NOT_PRESENT_FORMATTED_REVISION) ? null : sourceIdentifier.getRevision(); + final String badRev = sourceIdentifier.getRevision(); + final String formattedRevision = SourceIdentifier.NOT_PRESENT_FORMATTED_REVISION.equals(badRev) ? null : badRev; final Optional revision = Optional.fromNullable(formattedRevision); final NormalizedNode getSchemaRequest = createGetSchemaRequest(moduleName, revision); @@ -127,13 +135,14 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource rpc.invokeRpc(SchemaPath.create(true, NetconfMessageTransformUtil.GET_SCHEMA_QNAME), getSchemaRequest), new ResultToYangSourceTransformer(id, sourceIdentifier, moduleName, revision)); - final CheckedFuture checked = Futures.makeChecked(transformed, MAPPER); + final CheckedFuture checked = + Futures.makeChecked(transformed, MAPPER); return checked; } /** - * Transform composite node to string schema representation and then to ASTSchemaSource + * Transform composite node to string schema representation and then to ASTSchemaSource. */ private static final class ResultToYangSourceTransformer implements Function { @@ -143,7 +152,7 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource private final String moduleName; private final Optional revision; - public ResultToYangSourceTransformer(final RemoteDeviceId id, final SourceIdentifier sourceIdentifier, + ResultToYangSourceTransformer(final RemoteDeviceId id, final SourceIdentifier sourceIdentifier, final String moduleName, final Optional revision) { this.id = id; this.sourceIdentifier = sourceIdentifier; @@ -159,7 +168,8 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource 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); + "%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); @@ -177,12 +187,13 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource } - private static class NetconfYangTextSchemaSource extends YangTextSchemaSource { + static class NetconfYangTextSchemaSource extends YangTextSchemaSource { private final RemoteDeviceId id; private final Optional schemaString; - public NetconfYangTextSchemaSource(final RemoteDeviceId id, final SourceIdentifier sId, final Optional schemaString) { - super(sId); + NetconfYangTextSchemaSource(final RemoteDeviceId id, final SourceIdentifier sourceIdentifier, + final Optional schemaString) { + super(sourceIdentifier); this.id = id; this.schemaString = schemaString; } @@ -194,7 +205,7 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource @Override public InputStream openStream() throws IOException { - return new ByteArrayInputStream(schemaString.get().getBytes(Charsets.UTF_8)); + return new ByteArrayInputStream(schemaString.get().getBytes(StandardCharsets.UTF_8)); } } }