import java.util.List;
import java.util.function.Consumer;
import javax.ws.rs.container.AsyncResponse;
-import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
-import javax.ws.rs.ext.MessageBodyWriter;
import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.opendaylight.mdsal.dom.api.DOMRpcService;
import org.opendaylight.mdsal.dom.spi.FixedDOMSchemaService;
import org.opendaylight.restconf.api.ApiPath;
-import org.opendaylight.restconf.api.MediaTypes;
+import org.opendaylight.restconf.api.FormattableBody;
+import org.opendaylight.restconf.api.query.PrettyPrintParam;
import org.opendaylight.restconf.common.errors.RestconfDocumentedException;
import org.opendaylight.restconf.common.errors.RestconfError;
import org.opendaylight.restconf.nb.rfc8040.AbstractJukeboxTest;
-import org.opendaylight.restconf.nb.rfc8040.jersey.providers.JsonNormalizedNodeBodyWriter;
-import org.opendaylight.restconf.nb.rfc8040.jersey.providers.XmlNormalizedNodeBodyWriter;
-import org.opendaylight.restconf.nb.rfc8040.legacy.NormalizedNodePayload;
+import org.opendaylight.restconf.nb.rfc8040.ErrorTagMapping;
+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;
@BeforeEach
final void setupRestconf() {
- restconf = new JaxRsRestconf(new MdsalRestconfServer(new FixedDOMSchemaService(modelContext()), dataBroker,
- rpcService, actionService, mountPointService));
+ restconf = new JaxRsRestconf(
+ new MdsalRestconfServer(new MdsalDatabindProvider(new FixedDOMSchemaService(modelContext())),
+ dataBroker, rpcService, actionService, mountPointService),
+ ErrorTagMapping.RFC8040, PrettyPrintParam.FALSE);
}
EffectiveModelContext modelContext() {
return JUKEBOX_SCHEMA;
}
- static final void assertJson(final String expectedJson, final NormalizedNodePayload payload) {
- assertPayload(expectedJson, payload, new JsonNormalizedNodeBodyWriter(),
- MediaTypes.APPLICATION_YANG_DATA_JSON);
- }
-
- static final void assertXml(final String expectedXml, final NormalizedNodePayload payload) {
- assertPayload(expectedXml, payload, new XmlNormalizedNodeBodyWriter(), MediaTypes.APPLICATION_YANG_DATA_XML);
+ static final void assertJson(final String expectedJson, final OperationOutputBody payload) {
+ final var baos = new ByteArrayOutputStream();
+ try {
+ payload.formatToJSON(PrettyPrintParam.FALSE, baos);
+ } catch (IOException e) {
+ throw new AssertionError(e);
+ }
+ assertEquals(expectedJson, baos.toString(StandardCharsets.UTF_8));
}
- private static void assertPayload(final String expected, final NormalizedNodePayload payload,
- final MessageBodyWriter<NormalizedNodePayload> writer, final String mediaType) {
+ static final void assertXml(final String expectedXml, final OperationOutputBody payload) {
final var baos = new ByteArrayOutputStream();
try {
- writer.writeTo(payload, null, null, null, MediaType.valueOf(mediaType), null, baos);
+ payload.formatToXML(PrettyPrintParam.FALSE, baos);
} catch (IOException e) {
throw new AssertionError(e);
}
- assertEquals(expected, baos.toString(StandardCharsets.UTF_8));
+ assertEquals(expectedXml, baos.toString(StandardCharsets.UTF_8));
+ }
+
+ @NonNullByDefault
+ static final <N extends NormalizedNode> NormalizedFormattableBody<N> assertNormalizedBody(final int status,
+ final Consumer<AsyncResponse> invocation) {
+ return assertInstanceOf(NormalizedFormattableBody.class, assertFormattableBody(status, invocation));
}
- static final NormalizedNode assertNormalizedNode(final int status, final Consumer<AsyncResponse> invocation) {
- return assertNormalizedNodePayload(status, invocation).data();
+ static final FormattableBody assertFormattableBody(final int status, final Consumer<AsyncResponse> invocation) {
+ return assertEntity(JaxRsFormattableBody.class, status, invocation).body();
}
- static final NormalizedNodePayload assertNormalizedNodePayload(final int status,
+ static final ContainerNode assertOperationOutput(final int status, final Consumer<AsyncResponse> invocation) {
+ return assertOperationOutputBody(status, invocation).output();
+ }
+
+ static final OperationOutputBody assertOperationOutputBody(final int status,
final Consumer<AsyncResponse> invocation) {
- return assertEntity(NormalizedNodePayload.class, status, invocation);
+ return assertEntity(OperationOutputBody.class, status, invocation);
}
static final <T> T assertEntity(final Class<T> expectedType, final int expectedStatus,
static final List<RestconfError> assertErrors(final Consumer<AsyncResponse> invocation) {
final var ar = mock(AsyncResponse.class);
- final var captor = ArgumentCaptor.forClass(RestconfDocumentedException.class);
- doReturn(true).when(ar).resume(captor.capture());
+ doReturn(true).when(ar).resume(any(RestconfDocumentedException.class));
+
invocation.accept(ar);
- verify(ar).resume(any(RestconfDocumentedException.class));
+
+ final var captor = ArgumentCaptor.forClass(RestconfDocumentedException.class);
+ verify(ar).resume(captor.capture());
return captor.getValue().getErrors();
}
static final Response assertResponse(final int expectedStatus, final Consumer<AsyncResponse> invocation) {
final var ar = mock(AsyncResponse.class);
- final var captor = ArgumentCaptor.forClass(Response.class);
- doReturn(true).when(ar).resume(captor.capture());
+ doReturn(true).when(ar).resume(any(Response.class));
+
invocation.accept(ar);
- verify(ar).resume(any(Response.class));
+
+ final var captor = ArgumentCaptor.forClass(Response.class);
+ verify(ar).resume(captor.capture());
final var response = captor.getValue();
assertEquals(expectedStatus, response.getStatus());
return response;