+++ /dev/null
-/*
- * Copyright (c) 2024 PANTHEON.tech, s.r.o. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.restconf.server.api;
-
-import static java.util.Objects.requireNonNull;
-
-import com.google.common.base.MoreObjects.ToStringHelper;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.restconf.api.FormattableBody;
-
-/**
- * A {@link FormattableBody} which has an attached {@link DatabindPath}.
- */
-@NonNullByDefault
-public abstract class DatabindPathFormattableBody<P extends DatabindPath> extends FormattableBody {
- private final @NonNull P path;
-
- protected DatabindPathFormattableBody(final P path) {
- this.path = requireNonNull(path);
- }
-
- public final P path() {
- return path;
- }
-
- @Override
- protected ToStringHelper addToStringAttributes(final ToStringHelper helper) {
- return helper.add("path", path).add("body", bodyAttribute());
- }
-
- protected abstract @Nullable Object bodyAttribute();
-}
+++ /dev/null
-/*
- * Copyright (c) 2024 PANTHEON.tech, s.r.o. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.restconf.server.spi;
-
-import static java.util.Objects.requireNonNull;
-
-import com.google.common.annotations.VisibleForTesting;
-import java.io.IOException;
-import java.io.OutputStream;
-import javax.xml.XMLConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.opendaylight.restconf.api.FormattableBody;
-import org.opendaylight.restconf.api.query.PrettyPrintParam;
-import org.opendaylight.restconf.server.api.DatabindPath.OperationPath;
-import org.opendaylight.restconf.server.api.DatabindPathFormattableBody;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
-import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter;
-import org.opendaylight.yangtools.yang.data.codec.gson.JSONNormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.codec.xml.XMLStreamNormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack;
-
-/**
- * A {@link FormattableBody} corresponding to a {@code rpc} or {@code action} invocation.
- */
-@NonNullByDefault
-public final class OperationOutputBody extends DatabindPathFormattableBody<OperationPath> {
- private final ContainerNode output;
-
- public OperationOutputBody(final OperationPath path, final ContainerNode output) {
- super(path);
- this.output = requireNonNull(output);
- if (output.isEmpty()) {
- throw new IllegalArgumentException("output may not be empty");
- }
- }
-
- @VisibleForTesting
- public ContainerNode output() {
- return output;
- }
-
- @Override
- public void formatToJSON(final PrettyPrintParam prettyPrint, final OutputStream out) throws IOException {
- final var stack = prepareStack();
-
- // RpcDefinition/ActionDefinition is not supported as initial codec in JSONStreamWriter, so we need to emit
- // initial output declaration
- try (var jsonWriter = FormattableBodySupport.createJsonWriter(out, prettyPrint)) {
- final var module = stack.currentModule();
- jsonWriter.beginObject().name(module.argument().getLocalName() + ":output").beginObject();
-
- final var nnWriter = NormalizedNodeWriter.forStreamWriter(
- JSONNormalizedNodeStreamWriter.createNestedWriter(path().databind().jsonCodecs(), stack.toInference(),
- module.namespace().argument(), jsonWriter));
- for (var child : output.body()) {
- nnWriter.write(child);
- }
- nnWriter.flush();
-
- jsonWriter.endObject().endObject();
- }
- }
-
- @Override
- public void formatToXML(final PrettyPrintParam prettyPrint, final OutputStream out) throws IOException {
- final var stack = prepareStack();
-
- // RpcDefinition/ActionDefinition is not supported as initial codec in XMLStreamWriter, so we need to emit
- // initial output declaration.
- final var xmlWriter = FormattableBodySupport.createXmlWriter(out, prettyPrint);
- final var nnWriter = NormalizedNodeWriter.forStreamWriter(
- XMLStreamNormalizedNodeStreamWriter.create(xmlWriter, stack.toInference()));
-
- writeElements(xmlWriter, nnWriter, output);
- nnWriter.flush();
- }
-
- @Override
- protected @NonNull Object bodyAttribute() {
- return output.prettyTree();
- }
-
- private SchemaInferenceStack prepareStack() {
- final var path = path();
- final var stack = path.inference().toSchemaInferenceStack();
- stack.enterSchemaTree(path.outputStatement().argument());
- return stack;
- }
-
- private static void writeElements(final XMLStreamWriter xmlWriter, final NormalizedNodeWriter nnWriter,
- final ContainerNode data) throws IOException {
- final QName nodeType = data.name().getNodeType();
- final String namespace = nodeType.getNamespace().toString();
- try {
- xmlWriter.writeStartElement(XMLConstants.DEFAULT_NS_PREFIX, nodeType.getLocalName(), namespace);
- xmlWriter.writeDefaultNamespace(namespace);
- for (var child : data.body()) {
- nnWriter.write(child);
- }
- nnWriter.flush();
- xmlWriter.writeEndElement();
- xmlWriter.flush();
- } catch (final XMLStreamException e) {
- throw new IOException("Failed to write elements", e);
- }
- }
-}
import org.opendaylight.restconf.server.mdsal.MdsalDatabindProvider;
import org.opendaylight.restconf.server.mdsal.MdsalRestconfServer;
import org.opendaylight.restconf.server.spi.NormalizedFormattableBody;
-import org.opendaylight.restconf.server.spi.OperationOutputBody;
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.EffectiveModelContext;
return JUKEBOX_SCHEMA;
}
- static final void assertJson(final String expectedJson, final OperationOutputBody payload) {
+ static final void assertJson(final String expectedJson, final NormalizedFormattableBody<?> payload) {
final var baos = new ByteArrayOutputStream();
try {
payload.formatToJSON(PrettyPrintParam.FALSE, baos);
assertEquals(expectedJson, baos.toString(StandardCharsets.UTF_8));
}
- static final void assertXml(final String expectedXml, final OperationOutputBody payload) {
+ static final void assertXml(final String expectedXml, final NormalizedFormattableBody<?> payload) {
final var baos = new ByteArrayOutputStream();
try {
payload.formatToXML(PrettyPrintParam.FALSE, baos);
}
static final ContainerNode assertOperationOutput(final int status, final Consumer<AsyncResponse> invocation) {
- return assertOperationOutputBody(status, invocation).output();
+ return assertInstanceOf(ContainerNode.class, assertOperationOutputBody(status, invocation).data());
}
- static final OperationOutputBody assertOperationOutputBody(final int status,
+ static final NormalizedFormattableBody<?> assertOperationOutputBody(final int status,
final Consumer<AsyncResponse> invocation) {
- return assertInstanceOf(OperationOutputBody.class, assertFormattableBody(status, invocation));
+ return assertInstanceOf(NormalizedFormattableBody.class, assertFormattableBody(status, invocation));
}
static final <T> T assertEntity(final Class<T> expectedType, final int expectedStatus,
Code Review / netconf.git / commitdiff