This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 2.13.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8220f1bbf7c4deac2284e80232b101cc99b020b1 Author: Lukas Lowinger <[email protected]> AuthorDate: Wed Oct 26 20:25:29 2022 +0200 Enhance test covarege of MTOM with PAYLOAD data format --- .../cxf-soap/cxf-soap-mtom/README.adoc | 2 +- .../cxf/soap/mtom/it/CxfSoapMtomResource.java | 60 ++++-- .../cxf/soap/mtom/it/CxfSoapMtomRoutes.java | 218 +++++++++++++++++++-- .../cxf/soap/mtom/it/CxfSoapMtomTest.java | 20 +- 4 files changed, 258 insertions(+), 42 deletions(-) diff --git a/integration-test-groups/cxf-soap/cxf-soap-mtom/README.adoc b/integration-test-groups/cxf-soap/cxf-soap-mtom/README.adoc index dac25bdb6f..cbce978cf7 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-mtom/README.adoc +++ b/integration-test-groups/cxf-soap/cxf-soap-mtom/README.adoc @@ -1,4 +1,4 @@ = Camel Quarkus CXF SOAP MTOM tests -Tests are not using any external SOAP services (eg. via testcontainers). They purely test if Camel Quarkus is able to send and consume messages with attachments with both MTOM enabled/disabled. +Tests are not using any external SOAP services (eg. via testcontainers). They purely test if Camel Quarkus is able to send and consume messages with attachments with both MTOM enabled/disabled and POJO/PAYLOAD dataformat. diff --git a/integration-test-groups/cxf-soap/cxf-soap-mtom/src/main/java/org/apache/camel/quarkus/component/cxf/soap/mtom/it/CxfSoapMtomResource.java b/integration-test-groups/cxf-soap/cxf-soap-mtom/src/main/java/org/apache/camel/quarkus/component/cxf/soap/mtom/it/CxfSoapMtomResource.java index 405241bc9e..96e7529ac8 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-mtom/src/main/java/org/apache/camel/quarkus/component/cxf/soap/mtom/it/CxfSoapMtomResource.java +++ b/integration-test-groups/cxf-soap/cxf-soap-mtom/src/main/java/org/apache/camel/quarkus/component/cxf/soap/mtom/it/CxfSoapMtomResource.java @@ -16,7 +16,10 @@ */ package org.apache.camel.quarkus.component.cxf.soap.mtom.it; +import java.io.ByteArrayInputStream; import java.net.URI; +import java.util.LinkedHashMap; +import java.util.Map; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; @@ -28,9 +31,13 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import org.apache.camel.Exchange; +import org.apache.camel.ExchangePattern; import org.apache.camel.ProducerTemplate; +import org.apache.camel.attachment.AttachmentMessage; import static org.apache.camel.component.cxf.common.message.CxfConstants.OPERATION_NAME; +import static org.apache.camel.quarkus.component.cxf.soap.mtom.it.CxfSoapMtomRoutes.ROUTE_PAYLOAD_MODE_RESULT_HEADER_KEY_NAME; @Path("/cxf-soap/mtom") @ApplicationScoped @@ -41,13 +48,25 @@ public class CxfSoapMtomResource { @Path("/upload") @POST + @Consumes(MediaType.APPLICATION_OCTET_STREAM) @Produces(MediaType.TEXT_PLAIN) public Response upload(@QueryParam("imageName") String imageName, @QueryParam("mtomEnabled") boolean mtomEnabled, - byte[] image) throws Exception { - final String response = producerTemplate.requestBodyAndHeader( - "direct:" + mtomEndpoint(mtomEnabled), - new Object[] { new ImageFile(image), imageName }, - OPERATION_NAME, "uploadImage", String.class); + @QueryParam("endpointDataFormat") String endpointDataFormat, byte[] image) throws Exception { + Map<String, Object> headers = new LinkedHashMap<>(); + headers.put(OPERATION_NAME, "uploadImage"); + headers.put("endpointDataFormat", endpointDataFormat); + headers.put("mtomEnabled", mtomEnabled); + Object body = new Object[] { new ImageFile(image), imageName }; + Exchange result = producerTemplate.request("direct:invoker", exchange -> { + exchange.getIn().setBody(body); + exchange.getIn().setHeaders(headers); + }); + Object response = null; + if ("PAYLOAD".equals(endpointDataFormat)) { + response = result.getMessage().getHeader(ROUTE_PAYLOAD_MODE_RESULT_HEADER_KEY_NAME); + } else { + response = result.getMessage().getBody(String.class); + } return Response .created(new URI("https://camel.apache.org/")) .entity(response) @@ -56,22 +75,31 @@ public class CxfSoapMtomResource { @Path("/download") @POST + @Produces(MediaType.APPLICATION_OCTET_STREAM) @Consumes(MediaType.TEXT_PLAIN) - public Response download(@QueryParam("imageName") String imageName, @QueryParam("mtomEnabled") boolean mtomEnabled) + public Response download(@QueryParam("imageName") String imageName, @QueryParam("mtomEnabled") boolean mtomEnabled, + @QueryParam("endpointDataFormat") String endpointDataFormat) throws Exception { - final ImageFile response = (ImageFile) producerTemplate.requestBodyAndHeader( - "direct:" + mtomEndpoint(mtomEnabled), - imageName, - OPERATION_NAME, - "downloadImage", ImageFile.class); + Map<String, Object> headers = new LinkedHashMap<>(); + headers.put(OPERATION_NAME, "downloadImage"); + headers.put("endpointDataFormat", endpointDataFormat); + headers.put("mtomEnabled", mtomEnabled); + Exchange result = producerTemplate.request("direct:invoker", exchange -> { + exchange.setPattern(ExchangePattern.InOut); + exchange.getIn().setBody(imageName); + exchange.getIn().setHeaders(headers); + }); + byte[] response = null; + if ("PAYLOAD".equals(endpointDataFormat)) { + response = ((ByteArrayInputStream) result.getMessage(AttachmentMessage.class).getAttachment(imageName).getContent()) + .readAllBytes(); + } else { + response = result.getMessage().getBody(ImageFile.class).getContent(); + } return Response .created(new URI("https://camel.apache.org/")) - .entity(response.getContent()) + .entity(response) .build(); } - private String mtomEndpoint(boolean mtomEnabled) { - return mtomEnabled ? "mtomEnabledInvoker" : "mtomDisabledInvoker"; - } - } diff --git a/integration-test-groups/cxf-soap/cxf-soap-mtom/src/main/java/org/apache/camel/quarkus/component/cxf/soap/mtom/it/CxfSoapMtomRoutes.java b/integration-test-groups/cxf-soap/cxf-soap-mtom/src/main/java/org/apache/camel/quarkus/component/cxf/soap/mtom/it/CxfSoapMtomRoutes.java index a7f454a035..011622415d 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-mtom/src/main/java/org/apache/camel/quarkus/component/cxf/soap/mtom/it/CxfSoapMtomRoutes.java +++ b/integration-test-groups/cxf-soap/cxf-soap-mtom/src/main/java/org/apache/camel/quarkus/component/cxf/soap/mtom/it/CxfSoapMtomRoutes.java @@ -16,28 +16,88 @@ */ package org.apache.camel.quarkus.component.cxf.soap.mtom.it; +import java.io.StringReader; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import javax.activation.DataHandler; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Named; +import javax.xml.transform.Source; +import javax.xml.transform.dom.DOMSource; import javax.xml.ws.handler.Handler; +import javax.xml.xpath.XPathConstants; +import org.w3c.dom.Element; + +import com.sun.istack.ByteArrayDataSource; import io.quarkus.runtime.LaunchMode; import org.apache.camel.Exchange; import org.apache.camel.Processor; +import org.apache.camel.attachment.AttachmentMessage; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.cxf.common.CxfPayload; import org.apache.camel.component.cxf.jaxws.CxfEndpoint; +import org.apache.camel.converter.jaxp.XmlConverter; +import org.apache.cxf.binding.soap.SoapHeader; import org.apache.cxf.ext.logging.LoggingFeature; +import org.apache.cxf.helpers.IOUtils; +import org.apache.cxf.helpers.XPathUtils; import org.apache.cxf.message.MessageContentsList; +import org.apache.cxf.staxutils.StaxUtils; import org.eclipse.microprofile.config.Config; import org.eclipse.microprofile.config.ConfigProvider; +import static org.apache.camel.component.cxf.common.message.CxfConstants.OPERATION_NAME; + @ApplicationScoped public class CxfSoapMtomRoutes extends RouteBuilder { + public static final String SERVICE_TYPES_NS = "http://it.mtom.soap.cxf.component.quarkus.camel.apache.org/"; + public static final String XOP_NS = "http://www.w3.org/2004/08/xop/include"; + + public static final String RESP_UPLOAD_MSG = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" + + "<ns2:uploadImageResponse xmlns:ns2=\"http://it.mtom.soap.cxf.component.quarkus.camel.apache.org/\">" + + "<return>%s</return>" + + "</ns2:uploadImageResponse>"; + + public static final String RESP_DOWNLOAD_MSG_MTOM_ENABLED = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" + + "<ns2:downloadImageResponse xmlns:ns2=\"http://it.mtom.soap.cxf.component.quarkus.camel.apache.org/\">" + + "<arg0><content><xop:Include xmlns:xop=\"http://www.w3.org/2004/08/xop/include\"" + + " href=\"cid:%s\"/></content></arg0>" + + "<arg1>%s</arg1>" + + "</ns2:downloadImageResponse>"; + public static final String RESP_DOWNLOAD_MSG_MTOM_DISABLED = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" + + "<ns2:downloadImageResponse xmlns:ns2=\"http://it.mtom.soap.cxf.component.quarkus.camel.apache.org/\">" + + "<arg0><content>cid:%s</content></arg0>" + + "<arg1>%s</arg1>" + + "</ns2:downloadImageResponse>"; + + public static final String REQ_UPLOAD_MSG_MTOM_DISABLED = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" + + "<ns2:uploadImage xmlns:ns2=\"http://it.mtom.soap.cxf.component.quarkus.camel.apache.org/\">" + + "<arg0><content>cid:%s</content></arg0>" + + "<arg1>%s</arg1>" + + "</ns2:uploadImage>"; + public static final String REQ_UPLOAD_MSG_MTOM_ENABLED = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" + + "<ns2:uploadImage xmlns:ns2=\"http://it.mtom.soap.cxf.component.quarkus.camel.apache.org/\">" + + "<arg0><content><xop:Include xmlns:xop=\"http://www.w3.org/2004/08/xop/include\"" + + " href=\"cid:%s\"/></content></arg0>" + + "<arg1>%s</arg1>" + + "</ns2:uploadImage>"; + public static final String REQ_DOWNLOAD_MSG = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" + + "<ns2:downloadImage xmlns:ns2=\"http://it.mtom.soap.cxf.component.quarkus.camel.apache.org/\">" + + "<arg0>%s</arg0>" + + "</ns2:downloadImage>"; + + /** + * For transfering String response instead of parsing CXFPayload back in CxfSoapMtomResource class. + */ + public static final String ROUTE_PAYLOAD_MODE_RESULT_HEADER_KEY_NAME = "routeResultPayloadModeHeaderKeyName"; + @Inject @Named("loggingMtomFeatureClient") LoggingFeature loggingFeature; @@ -45,27 +105,129 @@ public class CxfSoapMtomRoutes extends RouteBuilder { @Override public void configure() { - from("direct:mtomEnabledInvoker") - .to("cxf:bean:soapMtomEnabledClientEndpoint?dataFormat=POJO"); + from("direct:invoker") + .process(exchange -> { + Map<String, Object> headers = exchange.getIn().getHeaders(); + String endpointDataFormat = headers.get("endpointDataFormat").toString(); + boolean mtomEnabled = Boolean.parseBoolean(headers.get("mtomEnabled").toString()); + headers.put("address", getServerUrl() + "/soapservice/mtom-" + + (mtomEnabled ? "enabled" : "disabled") + "-" + endpointDataFormat.toLowerCase() + + "-mode-image-service"); + if ("PAYLOAD".equals(endpointDataFormat)) { + if ("uploadImage".equals(headers.get(OPERATION_NAME))) { + Object[] reqParams = exchange.getIn().getBody(Object[].class); + ImageFile image = (ImageFile) reqParams[0]; + String imageName = (String) reqParams[1]; + List<Source> elements = new ArrayList<>(); + String reqMessage = mtomEnabled ? REQ_UPLOAD_MSG_MTOM_ENABLED : REQ_UPLOAD_MSG_MTOM_DISABLED; + elements.add(new DOMSource(StaxUtils + .read(new StringReader(String.format(reqMessage, imageName, imageName))) + .getDocumentElement())); + CxfPayload payload = new CxfPayload<>( + new ArrayList<SoapHeader>(), elements, null); + exchange.getIn().setBody(payload); + exchange.getIn(AttachmentMessage.class).addAttachment(imageName, + new DataHandler(new ByteArrayDataSource(image.getContent(), "application/octet-stream"))); + } else if ("downloadImage".equals(headers.get(OPERATION_NAME))) { + Object[] reqParams = exchange.getIn().getBody(Object[].class); + String imageName = (String) reqParams[0]; + List<Source> elements = new ArrayList<>(); + elements.add( + new DOMSource(StaxUtils.read(new StringReader(String.format(REQ_DOWNLOAD_MSG, imageName))) + .getDocumentElement())); + CxfPayload payload = new CxfPayload<>( + new ArrayList<SoapHeader>(), elements, null); + exchange.getIn().setBody(payload); + } + } + }) + .choice().when(simple("${header.mtomEnabled} == 'true'")) + .toD("cxf:bean:soapClientMtomEnabledEndpoint?address=${header.address}&mtomEnabled=${header.mtomEnabled}&dataFormat=${header.endpointDataFormat}") + .otherwise() + .toD("cxf:bean:soapClientMtomDisabledEndpoint?address=${header.address}&mtomEnabled=${header.mtomEnabled}&dataFormat=${header.endpointDataFormat}"); + + from("cxf:bean:soapMtomEnabledServerPojoModeEndpoint?dataFormat=POJO") + .to("direct:pojoModeProcessor"); + + from("cxf:bean:soapMtomDisabledServerPojoModeEndpoint?dataFormat=POJO") + .to("direct:pojoModeProcessor"); + + from("direct:pojoModeProcessor") + .process("pojoModeProcessor") + .toD("bean:imageService?method=${header.operationName}"); + + from("cxf:bean:soapMtomEnabledServerPayloadModeEndpoint?dataFormat=PAYLOAD") + .process("payloadModeProcessor"); + + from("cxf:bean:soapMtomDisabledServerPayloadModeEndpoint?dataFormat=PAYLOAD") + .process("payloadModeProcessor"); + + } + + @ApplicationScoped + @Named("payloadModeProcessor") + static class PayloadModeProcessor implements Processor { - from("direct:mtomDisabledInvoker") - .to("cxf:bean:soapMtomDisabledClientEndpoint?dataFormat=POJO"); + @Inject + @Named("imageService") + ImageService imageService; - from("cxf:bean:soapMtomEnabledServerEndpoint?dataFormat=POJO") - .to("direct:processImage"); + @Override + public void process(Exchange exchange) throws Exception { + CxfPayload<SoapHeader> in = exchange.getIn().getBody(CxfPayload.class); + String operation = in.getBody().get(0).getLocalName(); + if ("uploadImage".equals(operation)) { + Map<String, String> ns = new HashMap<>(); + ns.put("ns2", SERVICE_TYPES_NS); + ns.put("xop", XOP_NS); - from("cxf:bean:soapMtomDisabledServerEndpoint?dataFormat=POJO") - .to("direct:processImage"); + XPathUtils xu = new XPathUtils(ns); + Element body = new XmlConverter().toDOMElement(in.getBody().get(0)); + Element ele = (Element) xu.getValue("//ns2:uploadImage/arg1", body, + XPathConstants.NODE); + String imageName = ele.getTextContent(); + DataHandler dr = exchange.getIn(AttachmentMessage.class).getAttachment(imageName); + String uploadStatus = imageService.uploadImage( + new ImageFile(IOUtils.readBytesFromStream(dr.getInputStream())), imageName); + List<Source> elements = new ArrayList<>(); + elements.add(new DOMSource(StaxUtils.read(new StringReader(String.format(RESP_UPLOAD_MSG, uploadStatus))) + .getDocumentElement())); + CxfPayload payload = new CxfPayload<>( + new ArrayList<SoapHeader>(), elements, null); + exchange.getIn().setBody(payload); + // We have correctly uploaded the image, so we can put the upload status in the header, so we don't mess with CXFPayload in CxfSoapMtomResource + exchange.getIn().setHeader(ROUTE_PAYLOAD_MODE_RESULT_HEADER_KEY_NAME, uploadStatus); + } else if ("downloadImage".equals(operation)) { + Map<String, String> ns = new HashMap<>(); + ns.put("ns2", SERVICE_TYPES_NS); + ns.put("xop", XOP_NS); - from("direct:processImage") - .process("imageServiceProcessor") - .recipientList((simple("bean:imageService?method=${header.operationName}"))); + XPathUtils xu = new XPathUtils(ns); + Element body = new XmlConverter().toDOMElement(in.getBody().get(0)); + Element ele = (Element) xu.getValue("//ns2:downloadImage/arg0", body, + XPathConstants.NODE); + String imageName = ele.getTextContent(); + List<Source> elements = new ArrayList<>(); + boolean mtomEnabled = Boolean.parseBoolean(exchange.getIn().getHeaders().get("mtomEnabled").toString()); + String respMessage = mtomEnabled ? RESP_DOWNLOAD_MSG_MTOM_ENABLED : RESP_DOWNLOAD_MSG_MTOM_DISABLED; + elements.add( + new DOMSource( + StaxUtils.read(new StringReader(String.format(respMessage, imageName, imageName))) + .getDocumentElement())); + ImageFile imageFile = imageService.downloadImage(imageName); + CxfPayload payload = new CxfPayload<>( + new ArrayList<SoapHeader>(), elements, null); + exchange.getIn().setBody(payload); + exchange.getIn(AttachmentMessage.class).addAttachment(imageName, new DataHandler( + new ByteArrayDataSource(imageFile.getContent(), "application/octet-stream"))); + } + } } @ApplicationScoped - @Named("imageServiceProcessor") - static class ImageServiceProcessor implements Processor { + @Named("pojoModeProcessor") + static class PojoModeProcessor implements Processor { @Override public void process(Exchange exchange) throws Exception { String operationName = (String) exchange.getIn().getHeaders().get("operationName"); @@ -94,29 +256,43 @@ public class CxfSoapMtomRoutes extends RouteBuilder { @Produces @ApplicationScoped @Named - CxfEndpoint soapMtomEnabledClientEndpoint() { - return commonCxfEndpoint(true, getServerUrl() + "/soapservice/mtom-enabled-image-service"); + CxfEndpoint soapClientMtomEnabledEndpoint() { + return commonCxfEndpoint(true, ""); + } + + @Produces + @ApplicationScoped + @Named + CxfEndpoint soapClientMtomDisabledEndpoint() { + return commonCxfEndpoint(false, ""); + } + + @Produces + @ApplicationScoped + @Named + CxfEndpoint soapMtomDisabledServerPayloadModeEndpoint() { + return commonCxfEndpoint(false, "/mtom-disabled-payload-mode-image-service"); } @Produces @ApplicationScoped @Named - CxfEndpoint soapMtomDisabledClientEndpoint() { - return commonCxfEndpoint(false, getServerUrl() + "/soapservice/mtom-disabled-image-service"); + CxfEndpoint soapMtomEnabledServerPayloadModeEndpoint() { + return commonCxfEndpoint(true, "/mtom-enabled-payload-mode-image-service"); } @Produces @ApplicationScoped @Named - CxfEndpoint soapMtomEnabledServerEndpoint() { - return commonCxfEndpoint(true, "/mtom-enabled-image-service"); + CxfEndpoint soapMtomEnabledServerPojoModeEndpoint() { + return commonCxfEndpoint(true, "/mtom-enabled-pojo-mode-image-service"); } @Produces @ApplicationScoped @Named - CxfEndpoint soapMtomDisabledServerEndpoint() { - return commonCxfEndpoint(false, "/mtom-disabled-image-service"); + CxfEndpoint soapMtomDisabledServerPojoModeEndpoint() { + return commonCxfEndpoint(false, "/mtom-disabled-pojo-mode-image-service"); } CxfEndpoint commonCxfEndpoint(boolean mtomEnabled, String address) { diff --git a/integration-test-groups/cxf-soap/cxf-soap-mtom/src/test/java/org/apache/camel/quarkus/component/cxf/soap/mtom/it/CxfSoapMtomTest.java b/integration-test-groups/cxf-soap/cxf-soap-mtom/src/test/java/org/apache/camel/quarkus/component/cxf/soap/mtom/it/CxfSoapMtomTest.java index 01c7249d48..be5b10aa7a 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-mtom/src/test/java/org/apache/camel/quarkus/component/cxf/soap/mtom/it/CxfSoapMtomTest.java +++ b/integration-test-groups/cxf-soap/cxf-soap-mtom/src/test/java/org/apache/camel/quarkus/component/cxf/soap/mtom/it/CxfSoapMtomTest.java @@ -19,6 +19,7 @@ package org.apache.camel.quarkus.component.cxf.soap.mtom.it; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.IOException; +import java.util.stream.Stream; import javax.imageio.ImageIO; @@ -28,20 +29,30 @@ import io.restassured.http.ContentType; import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; @QuarkusTest class CxfSoapMtomTest { + private static Stream<Arguments> matrix() { + return Stream.of( + Arguments.of(true, "POJO"), + Arguments.of(false, "POJO"), + Arguments.of(true, "PAYLOAD"), + Arguments.of(false, "PAYLOAD")); + } + @ParameterizedTest - @ValueSource(booleans = { true, false }) - public void uploadDownloadMtom(boolean mtomEnabled) throws IOException { + @MethodSource("matrix") + public void uploadDownloadMtom(boolean mtomEnabled, String endpointDataFormat) throws IOException { byte[] imageBytes = CxfSoapMtomTest.class.getClassLoader().getResourceAsStream("linux-image.png").readAllBytes(); - String imageName = "linux-image-name"; + String imageName = String.format("linux-image-name-mtom-%s-%s-mode", mtomEnabled, endpointDataFormat); RestAssured.given() .contentType(ContentType.BINARY) .queryParam("imageName", imageName) .queryParam("mtomEnabled", mtomEnabled) + .queryParam("endpointDataFormat", endpointDataFormat) .body(imageBytes) .post("/cxf-soap/mtom/upload") .then() @@ -51,6 +62,7 @@ class CxfSoapMtomTest { .contentType(ContentType.TEXT) .queryParam("imageName", imageName) .queryParam("mtomEnabled", mtomEnabled) + .queryParam("endpointDataFormat", endpointDataFormat) .post("/cxf-soap/mtom/download") .then() .statusCode(201)
