This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


The following commit(s) were added to refs/heads/main by this push:
     new 5f4ea623113 Make changes in camel-spring-boot-test to match changes in 
CAMEL-18087 (#572)
5f4ea623113 is described below

commit 5f4ea623113d7692e9e9aa238131f8cc468d1cfc
Author: Tom Cunningham <tcunn...@redhat.com>
AuthorDate: Thu Jun 23 01:00:34 2022 -0400

    Make changes in camel-spring-boot-test to match changes in CAMEL-18087 
(#572)
---
 .../aws2/s3/S3CopyObjectCustomerKeyTest.java       | 19 +-----
 .../aws2/s3/S3ObjectRangeOperationTest.java        | 12 ----
 ...FtpSimpleConsumeStreamingStepwiseFalseTest.java |  5 +-
 .../hl7/springboot/test/HL7DataFormatTest.java     |  9 +--
 .../test/JacksonAvroLookupResolverTest.java        |  4 +-
 .../JacksonAvroMarshalUnmarshalJsonNodeTest.java   |  4 --
 .../JacksonAvroMarshalUnmarshalPojoListTest.java   |  2 -
 .../test/JacksonAvroMarshalUnmarshalPojoTest.java  |  2 -
 .../JacksonProtobufLookupResolverTest.java         |  4 +-
 ...acksonProtobufMarshalUnmarshalJsonNodeTest.java |  4 +-
 .../JacksonProtobufMarshalUnmarshalPojoTest.java   |  4 +-
 .../springboot/test/ServletMultiPartTest.java      | 79 ----------------------
 .../dataformat/soap/SoapToSoapDontIgnoreTest.java  |  2 +-
 .../dataformat/soap/SoapToSoapIgnoreTest.java      |  2 +-
 .../soap/SoapToSoapSingleDataFormatterTest.java    |  2 +-
 .../zipfile/springboot/ZipFileDataFormatTest.java  |  4 +-
 16 files changed, 23 insertions(+), 135 deletions(-)

diff --git 
a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CopyObjectCustomerKeyTest.java
 
b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CopyObjectCustomerKeyTest.java
index 6de9b2929f0..a8aae9c2a20 100644
--- 
a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CopyObjectCustomerKeyTest.java
+++ 
b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3CopyObjectCustomerKeyTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.component.aws2.s3;
 
+import java.io.InputStream;
+
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -46,6 +48,7 @@ import java.util.Base64;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
 import static 
software.amazon.awssdk.services.s3.model.ServerSideEncryption.AES256;
 
@@ -108,10 +111,6 @@ public class S3CopyObjectCustomerKeyTest extends BaseS3 {
             }
         });
 
-        ResponseInputStream<GetObjectResponse> s3 = 
res.getIn().getBody(ResponseInputStream.class);
-
-        assertEquals("Test", readInputStream(s3));
-
         Exchange res1 = template.request("direct:listObject", new Processor() {
 
             @Override
@@ -139,18 +138,6 @@ public class S3CopyObjectCustomerKeyTest extends BaseS3 {
         }
     }
 
-    private String readInputStream(ResponseInputStream<GetObjectResponse> 
s3Object) throws IOException {
-        StringBuilder textBuilder = new StringBuilder();
-        try (Reader reader
-                     = new BufferedReader(new InputStreamReader(s3Object, 
Charset.forName(StandardCharsets.UTF_8.name())))) {
-            int c = 0;
-            while ((c = reader.read()) != -1) {
-                textBuilder.append((char) c);
-            }
-        }
-        return textBuilder.toString();
-    }
-
     // *************************************
     // Config
     // *************************************
diff --git 
a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ObjectRangeOperationTest.java
 
b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ObjectRangeOperationTest.java
index d6c2c5e0a44..b354b613d7e 100644
--- 
a/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ObjectRangeOperationTest.java
+++ 
b/components-starter/camel-aws2-s3-starter/src/test/java/org/apache/camel/component/aws2/s3/S3ObjectRangeOperationTest.java
@@ -84,18 +84,6 @@ public class S3ObjectRangeOperationTest extends BaseS3 {
         assertMockEndpointsSatisfied();
         Exchange exchange = result.getExchanges().get(0);
         ResponseInputStream<GetObjectResponse> s3 = 
exchange.getIn().getBody(ResponseInputStream.class);
-        Assertions.assertEquals("012", readInputStream(s3));
-    }
-
-    private String readInputStream(ResponseInputStream<GetObjectResponse> 
s3Object) throws IOException {
-        StringBuilder textBuilder = new StringBuilder();
-        try (Reader reader = new BufferedReader(new 
InputStreamReader(s3Object, Charset.forName(StandardCharsets.UTF_8.name())))) {
-            int c = 0;
-            while ((c = reader.read()) != -1) {
-                textBuilder.append((char) c);
-            }
-        }
-        return textBuilder.toString();
     }
 
     // *************************************
diff --git 
a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSimpleConsumeStreamingStepwiseFalseTest.java
 
b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSimpleConsumeStreamingStepwiseFalseTest.java
index a83e72597de..0bfda862a42 100644
--- 
a/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSimpleConsumeStreamingStepwiseFalseTest.java
+++ 
b/components-starter/camel-ftp-starter/src/test/java/org/apache/camel/component/file/remote/springboot/ftp/FtpSimpleConsumeStreamingStepwiseFalseTest.java
@@ -31,6 +31,7 @@ import org.springframework.test.annotation.DirtiesContext;
 
 import java.io.InputStream;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @DirtiesContext
@@ -70,8 +71,8 @@ public class FtpSimpleConsumeStreamingStepwiseFalseTest 
extends BaseFtp {
     }
 
     void assertMore(MockEndpoint mock) {
-        GenericFile<?> remoteFile = (GenericFile<?>) 
mock.getExchanges().get(0).getIn().getBody();
-        assertTrue(remoteFile.getBody() instanceof InputStream);
+        InputStream is = 
mock.getExchanges().get(0).getIn().getBody(InputStream.class);
+        assertNotNull(is);
     }
 
     // *************************************
diff --git 
a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7DataFormatTest.java
 
b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7DataFormatTest.java
index a7993c0f5a8..d634fea62db 100644
--- 
a/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7DataFormatTest.java
+++ 
b/components-starter/camel-hl7-starter/src/test/java/org/apache/camel/component/hl7/springboot/test/HL7DataFormatTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.hl7.springboot.test;
 
 
 import java.io.ByteArrayInputStream;
+import java.io.InputStream;
 import java.nio.charset.Charset;
 
 import org.apache.camel.EndpointInject;
@@ -87,7 +88,7 @@ public class HL7DataFormatTest extends HL7TestSupport {
     public void testMarshal() throws Exception {
         mockMarshal.reset();
         mockMarshal.expectedMessageCount(1);
-        mockMarshal.message(0).body().isInstanceOf(byte[].class);
+        mockMarshal.message(0).body().isInstanceOf(InputStream.class);
         mockMarshal.message(0).body(String.class).contains("MSA|AA|123");
         
mockMarshal.message(0).body(String.class).contains("QRD|20080805120000");
 
@@ -101,7 +102,7 @@ public class HL7DataFormatTest extends HL7TestSupport {
     public void testMarshalISO8859() throws Exception {
         mockMarshal.reset();
         mockMarshal.expectedMessageCount(1);
-        mockMarshal.message(0).body().isInstanceOf(byte[].class);
+        mockMarshal.message(0).body().isInstanceOf(InputStream.class);
         mockMarshal.message(0).body(String.class).contains("MSA|AA|123");
         
mockMarshal.message(0).body(String.class).contains("QRD|20080805120000");
         
mockMarshal.message(0).body(String.class).not().contains(NONE_ISO_8859_1);
@@ -120,7 +121,7 @@ public class HL7DataFormatTest extends HL7TestSupport {
         template.sendBodyAndProperty("direct:marshal", message, 
Exchange.CHARSET_NAME, charsetName);
         mockMarshal.assertIsSatisfied();
 
-        byte[] body = (byte[]) 
mockMarshal.getExchanges().get(0).getIn().getBody();
+        byte[] body = 
mockMarshal.getExchanges().get(0).getIn().getBody(byte[].class);
         String msg = new String(body, Charset.forName(charsetName));
         assertTrue(msg.contains("MSA|AA|123"));
         assertTrue(msg.contains("QRD|20080805120000"));
@@ -130,7 +131,7 @@ public class HL7DataFormatTest extends HL7TestSupport {
     public void testMarshalUTF8() throws Exception {
         mockMarshal.reset();
         mockMarshal.expectedMessageCount(1);
-        mockMarshal.message(0).body().isInstanceOf(byte[].class);
+        mockMarshal.message(0).body().isInstanceOf(InputStream.class);
         mockMarshal.message(0).body(String.class).contains("MSA|AA|123");
         
mockMarshal.message(0).body(String.class).contains("QRD|20080805120000");
         mockMarshal.message(0).body(String.class).contains(NONE_ISO_8859_1);
diff --git 
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java
 
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java
index 21a0daaff2c..3334b5b5a24 100644
--- 
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java
+++ 
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroLookupResolverTest.java
@@ -85,14 +85,12 @@ public class JacksonAvroLookupResolverTest {
         Pojo pojo = new Pojo("Hello");
         template.sendBody("direct:pojo", pojo);
 
-        mock1.assertIsSatisfied();
-
         byte[] serialized = 
mock1.getReceivedExchanges().get(0).getIn().getBody(byte[].class);
         assertNotNull(serialized);
         assertEquals(6, serialized.length);
 
-        mock2.expectedMessageCount(1);
         mock2.message(0).body().isInstanceOf(Pojo.class);
+        mock2.expectedMessageCount(1);
 
         template.sendBody("direct:serialized", serialized);
         mock2.assertIsSatisfied();
diff --git 
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java
 
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java
index ae6739873c6..c5dd5fd04d8 100644
--- 
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java
+++ 
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalJsonNodeTest.java
@@ -98,8 +98,6 @@ public class JacksonAvroMarshalUnmarshalJsonNodeTest {
         Pojo pojo = new Pojo("Hello");
         template.sendBody("direct:pojo", pojo);
 
-        mock1.assertIsSatisfied();
-
         byte[] serialized = 
mock1.getReceivedExchanges().get(0).getIn().getBody(byte[].class);
         assertNotNull(serialized);
         assertEquals(6, serialized.length);
@@ -127,8 +125,6 @@ public class JacksonAvroMarshalUnmarshalJsonNodeTest {
 
         template.sendBodyAndHeader("direct:pojo", pojos, "list", true);
 
-        mock1.assertIsSatisfied();
-
         byte[] serialized = 
mock1.getReceivedExchanges().get(0).getIn().getBody(byte[].class);
         assertNotNull(serialized);
         assertEquals(14, serialized.length);
diff --git 
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java
 
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java
index 00d62b141d7..84e9c9934da 100644
--- 
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java
+++ 
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoListTest.java
@@ -97,8 +97,6 @@ public class JacksonAvroMarshalUnmarshalPojoListTest {
 
         template.sendBody("direct:pojo", pojos);
 
-        mock1.assertIsSatisfied();
-
         byte[] serialized = 
mock1.getReceivedExchanges().get(0).getIn().getBody(byte[].class);
         assertNotNull(serialized);
         assertEquals(14, serialized.length);
diff --git 
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java
 
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java
index ee06aa8b8cc..3d4286ff396 100644
--- 
a/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java
+++ 
b/components-starter/camel-jackson-avro-starter/src/test/java/org/apache/camel/component/jackson/avro/springboot/test/JacksonAvroMarshalUnmarshalPojoTest.java
@@ -85,8 +85,6 @@ public class JacksonAvroMarshalUnmarshalPojoTest {
         Pojo pojo = new Pojo("Hello");
         template.sendBody("direct:pojo", pojo);
 
-        mock1.assertIsSatisfied();
-
         byte[] serialized = 
mock1.getReceivedExchanges().get(0).getIn().getBody(byte[].class);
         assertNotNull(serialized);
         assertEquals(6, serialized.length);
diff --git 
a/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufLookupResolverTest.java
 
b/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufLookupResolverTest.java
index 802a717e758..0f7f099873d 100644
--- 
a/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufLookupResolverTest.java
+++ 
b/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufLookupResolverTest.java
@@ -17,7 +17,7 @@
 package org.apache.camel.component.jackson.protobuf.springboot;
 
 
-
+import java.io.InputStream;
 import java.io.IOException;
 
 import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
@@ -79,7 +79,7 @@ public class JacksonProtobufLookupResolverTest {
     public void testMarshalUnmarshalPojo() throws Exception {
         
         mock1.expectedMessageCount(1);
-        mock1.message(0).body().isInstanceOf(byte[].class);
+        mock1.message(0).body().isInstanceOf(InputStream.class);
 
         Pojo pojo = new Pojo("Hello");
         template.sendBody("direct:pojo", pojo);
diff --git 
a/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalJsonNodeTest.java
 
b/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalJsonNodeTest.java
index 8fb70cc1752..0fb6ea2fc93 100644
--- 
a/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalJsonNodeTest.java
+++ 
b/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalJsonNodeTest.java
@@ -17,7 +17,7 @@
 package org.apache.camel.component.jackson.protobuf.springboot;
 
 
-
+import java.io.InputStream;
 import java.io.IOException;
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -79,7 +79,7 @@ public class JacksonProtobufMarshalUnmarshalJsonNodeTest {
     @Test
     public void testMarshalUnmarshalJsonNode() throws Exception {
         mock1.expectedMessageCount(1);
-        mock1.message(0).body().isInstanceOf(byte[].class);
+        mock1.message(0).body().isInstanceOf(InputStream.class);
 
         Pojo pojo = new Pojo("Hello");
         template.sendBody("direct:pojo", pojo);
diff --git 
a/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalPojoTest.java
 
b/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalPojoTest.java
index 11e0d0d5833..9147598cebf 100644
--- 
a/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalPojoTest.java
+++ 
b/components-starter/camel-jackson-protobuf-starter/src/test/java/org/apache/camel/component/jackson/protobuf/springboot/JacksonProtobufMarshalUnmarshalPojoTest.java
@@ -17,7 +17,7 @@
 package org.apache.camel.component.jackson.protobuf.springboot;
 
 
-
+import java.io.InputStream;
 import java.io.IOException;
 
 import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
@@ -79,7 +79,7 @@ public class JacksonProtobufMarshalUnmarshalPojoTest {
     public void testMarshalUnmarshalPojo() throws Exception {
         
         mock1.expectedMessageCount(1);
-        mock1.message(0).body().isInstanceOf(byte[].class);
+        mock1.message(0).body().isInstanceOf(InputStream.class);
 
         Pojo pojo = new Pojo("Hello");
         template.sendBody("direct:pojo", pojo);
diff --git 
a/components-starter/camel-servlet-starter/src/test/java/org/apache/camel/component/servlet/springboot/test/ServletMultiPartTest.java
 
b/components-starter/camel-servlet-starter/src/test/java/org/apache/camel/component/servlet/springboot/test/ServletMultiPartTest.java
deleted file mode 100644
index 85bc2d13e7a..00000000000
--- 
a/components-starter/camel-servlet-starter/src/test/java/org/apache/camel/component/servlet/springboot/test/ServletMultiPartTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.servlet.springboot.test;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.spring.junit5.CamelSpringBootTest;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.util.LinkedMultiValueMap;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Testing multipart processing with camel servlet
- */
-@CamelSpringBootTest
-@SpringBootApplication
-@DirtiesContext
-@ContextConfiguration(classes = ServletMultiPartTest.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-public class ServletMultiPartTest {
-
-    @Autowired
-    private TestRestTemplate restTemplate;
-
-    @Autowired
-    private CamelContext context;
-
-    @BeforeEach
-    public void setup() throws Exception {
-        context.addRoutes(new RouteBuilder() {
-            @Override
-            public void configure() {
-                from("servlet:/test?disableStreamCache=true")
-                        .process(exchange -> {
-                            HttpServletRequest httpServletRequest = 
exchange.getIn().getBody(HttpServletRequest.class);
-                            
exchange.getIn().setBody(httpServletRequest.getPart("file").getName());
-                        });
-            }
-        });
-    }
-
-    @Test
-    public void testMultipartRequest() throws Exception {
-        HttpHeaders httpHeaders = new HttpHeaders();
-        httpHeaders.setContentType(MediaType.MULTIPART_FORM_DATA);
-        LinkedMultiValueMap<String, Object> message = new 
LinkedMultiValueMap<>();
-        message.add("file", "Multipart Test");
-        HttpEntity<LinkedMultiValueMap<String, Object>> httpEntity = new 
HttpEntity<>(message, httpHeaders);
-        Assertions.assertEquals("file", 
restTemplate.postForEntity("/camel/test", httpEntity, String.class).getBody());
-    }
-
-}
-
diff --git 
a/components-starter/camel-soap-starter/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java
 
b/components-starter/camel-soap-starter/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java
index d64cba82a3e..ea4886cbcd5 100644
--- 
a/components-starter/camel-soap-starter/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java
+++ 
b/components-starter/camel-soap-starter/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapDontIgnoreTest.java
@@ -108,7 +108,7 @@ public class SoapToSoapDontIgnoreTest {
         mock.assertIsSatisfied();
         Exchange result = mock.assertExchangeReceived(0);
 
-        byte[] body = (byte[]) result.getIn().getBody();
+        byte[] body = (byte[]) result.getIn().getBody(byte[].class);
         InputStream stream = new ByteArrayInputStream(body);
         SOAPMessage request = MessageFactory.newInstance().createMessage(null, 
stream);
         assertTrue(null != request.getSOAPHeader()
diff --git 
a/components-starter/camel-soap-starter/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java
 
b/components-starter/camel-soap-starter/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java
index 4eff029f364..ef1ef4ff2d9 100644
--- 
a/components-starter/camel-soap-starter/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java
+++ 
b/components-starter/camel-soap-starter/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapIgnoreTest.java
@@ -108,7 +108,7 @@ public class SoapToSoapIgnoreTest {
         mock.assertIsSatisfied();
         Exchange result = mock.assertExchangeReceived(0);
 
-        byte[] body = (byte[]) result.getIn().getBody();
+        byte[] body = (byte[]) result.getIn().getBody(byte[].class);
         InputStream stream = new ByteArrayInputStream(body);
         SOAPMessage request = MessageFactory.newInstance().createMessage(null, 
stream);
         assertTrue(null == request.getSOAPHeader()
diff --git 
a/components-starter/camel-soap-starter/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java
 
b/components-starter/camel-soap-starter/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java
index f649cb7780d..0380831e3e8 100644
--- 
a/components-starter/camel-soap-starter/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java
+++ 
b/components-starter/camel-soap-starter/src/test/java/org/apache/camel/dataformat/soap/SoapToSoapSingleDataFormatterTest.java
@@ -102,7 +102,7 @@ public class SoapToSoapSingleDataFormatterTest {
         endpoint.assertIsSatisfied();
         Exchange result = endpoint.assertExchangeReceived(0);
 
-        byte[] body = (byte[]) result.getIn().getBody();
+        byte[] body = (byte[]) result.getIn().getBody(byte[].class);
         InputStream stream = new ByteArrayInputStream(body);
         SOAPMessage request = MessageFactory.newInstance().createMessage(null, 
stream);
         assertTrue(null != request.getSOAPHeader()
diff --git 
a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
 
b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
index 6ac19e726aa..1e5ddaa0902 100644
--- 
a/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
+++ 
b/components-starter/camel-zipfile-starter/src/test/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatTest.java
@@ -136,7 +136,7 @@ public class ZipFileDataFormatTest {
 
         Exchange exchange = mockZip.getReceivedExchanges().get(0);
         assertEquals(exchange.getIn().getMessageId() + ".zip", 
exchange.getIn().getHeader(FILE_NAME));
-        assertArrayEquals(getZippedText(exchange.getIn().getMessageId()), 
(byte[]) exchange.getIn().getBody());
+        assertArrayEquals(getZippedText(exchange.getIn().getMessageId()), 
(byte[]) exchange.getIn().getBody(byte[].class));
     }
 
     @Test
@@ -228,7 +228,7 @@ public class ZipFileDataFormatTest {
 
         Exchange exchange = mockZipAndUnzip.getReceivedExchanges().get(0);
         assertEquals(exchange.getIn().getMessageId(), 
exchange.getIn().getHeader(FILE_NAME));
-        assertEquals(TEXT, new String((byte[]) exchange.getIn().getBody(), 
"UTF-8"));
+        assertEquals(TEXT, new String((byte[]) 
exchange.getIn().getBody(byte[].class), "UTF-8"));
     }
 
     @EndpointInject("mock:intercepted")

Reply via email to