You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/11/15 09:14:03 UTC
(camel) branch main updated: CAMEL-20113: test module cleanups
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new bae8e3d1865 CAMEL-20113: test module cleanups
bae8e3d1865 is described below
commit bae8e3d1865062e68ad199c15929df58b8146a21
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Nov 15 09:01:24 2023 +0100
CAMEL-20113: test module cleanups
- avoid NPEs
- use lambdas when possible
- collapsed identical catch blocks
- simplified generics
- simplified string operations
- fixed incorrect assertions (swapped arguments)
- simplified assertions
- use static inner classes
- fixed C-style array declaration
---
.../apache/camel/itest/async/MyAsyncProducer.java | 37 ++++++-------
.../customerrelations/CustomerServicesTest.java | 2 +-
...ComponentConfigurationAndDocumentationTest.java | 13 ++---
.../camel/itest/doc/EipDocumentationTest.java | 6 +--
.../itest/ftp/FtpInitialConnectTimeoutTest.java | 48 ++++++++---------
.../greeter/JettyRecipientListCxfIssueTest.java | 10 ++--
.../org/apache/camel/itest/greeter/Server.java | 2 +-
.../camel/itest/issues/JettyHttpFileCacheTest.java | 12 ++---
.../apache/camel/itest/issues/JettyHttpTest.java | 9 ++--
.../itest/jaxb/JaxbFallbackTypeConverterTest.java | 17 ++----
.../jetty/JettyBridgeHostHeaderIssueTest.java | 61 +++++-----------------
.../itest/jetty/JettyFailoverRoundRobinTest.java | 29 +++-------
.../camel/itest/jetty/JettyFreemarkerTest.java | 26 ++++-----
.../jetty/JettyJmsShutdownInProgressTest.java | 14 +++--
.../camel/itest/jetty/JettyJmsTwowayTest.java | 10 ++--
.../camel/itest/jetty/JettyRestRedirectTest.java | 10 ++--
.../jetty/JettySimulateFailoverRoundRobinTest.java | 28 +++-------
.../camel/itest/jetty/JettyVelocityTest.java | 26 ++++-----
.../itest/jetty/JettyXsltHttpTemplateTest.java | 8 +--
.../apache/camel/itest/jetty/JettyXsltTest.java | 22 ++++----
.../camel/itest/jms/JmsConsumerShutdownTest.java | 16 ++----
.../org/apache/camel/itest/jms/JmsHttpJmsTest.java | 13 +----
.../camel/itest/jms/JmsHttpPostIssueTest.java | 19 +++----
.../itest/jms/JmsHttpPostIssueWithMockTest.java | 19 +++----
.../apache/camel/itest/jms/JmsResequencerTest.java | 17 +++---
.../itest/netty/NettyAsyncRequestReplyTest.java | 17 +++---
.../NettyHttpClientChunkedResponseTest.java | 10 +---
.../itest/security/KeystorePasswordCallback.java | 4 +-
.../org/apache/camel/itest/tx/JmsToHttpRoute.java | 20 +++----
...ndNoTransactionErrorHandlerConfiguredRoute.java | 52 ++++++++----------
.../itest/tx/JmsToHttpWithOnExceptionRoute.java | 52 ++++++++----------
.../camel/itest/tx/JmsToHttpWithRollbackRoute.java | 14 ++---
32 files changed, 234 insertions(+), 409 deletions(-)
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/async/MyAsyncProducer.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/async/MyAsyncProducer.java
index 94955291699..d0073964beb 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/async/MyAsyncProducer.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/async/MyAsyncProducer.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.itest.async;
-import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
@@ -45,27 +44,25 @@ public class MyAsyncProducer extends DefaultAsyncProducer {
@Override
public boolean process(final Exchange exchange, final AsyncCallback callback) {
- executor.submit(new Callable<Object>() {
- public Object call() throws Exception {
- LOG.info("Simulating a task which takes " + getEndpoint().getDelay() + " millis to reply");
- Thread.sleep(getEndpoint().getDelay());
+ executor.submit(() -> {
+ LOG.info("Simulating a task which takes " + getEndpoint().getDelay() + " millis to reply");
+ Thread.sleep(getEndpoint().getDelay());
- int count = counter.incrementAndGet();
- if (getEndpoint().getFailFirstAttempts() >= count) {
- LOG.info("Simulating a failure at attempt " + count);
- exchange.setException(new CamelExchangeException("Simulated error at attempt " + count, exchange));
- } else {
- String reply = getEndpoint().getReply();
- exchange.getMessage().setBody(reply);
- // propagate headers
- exchange.getMessage().setHeaders(exchange.getIn().getHeaders());
- LOG.info("Setting reply " + reply);
- }
-
- LOG.info("Callback done(false)");
- callback.done(false);
- return null;
+ int count = counter.incrementAndGet();
+ if (getEndpoint().getFailFirstAttempts() >= count) {
+ LOG.info("Simulating a failure at attempt " + count);
+ exchange.setException(new CamelExchangeException("Simulated error at attempt " + count, exchange));
+ } else {
+ String reply = getEndpoint().getReply();
+ exchange.getMessage().setBody(reply);
+ // propagate headers
+ exchange.getMessage().setHeaders(exchange.getIn().getHeaders());
+ LOG.info("Setting reply " + reply);
}
+
+ LOG.info("Callback done(false)");
+ callback.done(false);
+ return null;
});
// indicate from this point forward its being routed asynchronously
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java
index cace2b00ddf..5f6d9d8758d 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java
@@ -71,7 +71,7 @@ public class CustomerServicesTest {
}
}
- class HeaderChecker extends AbstractPhaseInterceptor<Message> {
+ static class HeaderChecker extends AbstractPhaseInterceptor<Message> {
HeaderChecker(String phase) {
super(phase);
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/DataFormatComponentConfigurationAndDocumentationTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/DataFormatComponentConfigurationAndDocumentationTest.java
index c9ba2b1b0a6..5e9c274d312 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/DataFormatComponentConfigurationAndDocumentationTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/DataFormatComponentConfigurationAndDocumentationTest.java
@@ -31,6 +31,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@EnabledIfSystemProperty(named = "enable.documentation.itests", matches = "true")
@@ -58,11 +59,11 @@ public class DataFormatComponentConfigurationAndDocumentationTest extends CamelT
assertNotNull(found);
assertEquals("textQualifier", found.getName());
assertEquals("attribute", found.getKind());
- assertEquals(false, found.isRequired());
+ assertFalse(found.isRequired());
assertEquals("string", found.getType());
assertEquals("java.lang.String", found.getJavaType());
- assertEquals(false, found.isDeprecated());
- assertEquals(false, found.isSecret());
+ assertFalse(found.isDeprecated());
+ assertFalse(found.isSecret());
assertEquals("If the text is qualified with a character. Uses quote character by default.", found.getDescription());
}
}
@@ -84,11 +85,11 @@ public class DataFormatComponentConfigurationAndDocumentationTest extends CamelT
assertNotNull(found);
assertEquals("escapeChar", found.getName());
assertEquals("attribute", found.getKind());
- assertEquals(false, found.isRequired());
+ assertFalse(found.isRequired());
assertEquals("string", found.getType());
assertEquals("java.lang.String", found.getJavaType());
- assertEquals(false, found.isDeprecated());
- assertEquals(false, found.isSecret());
+ assertFalse(found.isDeprecated());
+ assertFalse(found.isSecret());
assertEquals("\\", found.getDefaultValue());
assertEquals("The escape character.", found.getDescription());
}
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/EipDocumentationTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/EipDocumentationTest.java
index 320a1337a02..18812a6df8d 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/EipDocumentationTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/doc/EipDocumentationTest.java
@@ -57,7 +57,7 @@ public class EipDocumentationTest extends CamelTestSupport {
try (CamelContext context = new DefaultCamelContext()) {
String json = ((CatalogCamelContext) context).getEipParameterJsonSchema("split");
LOG.info(json);
- assertNotNull("Should have found json for split", json);
+ assertNotNull(json, "Should have found json for split");
assertTrue(json.contains("\"name\": \"split\""));
// there should be javadoc included
@@ -73,7 +73,7 @@ public class EipDocumentationTest extends CamelTestSupport {
try (CamelContext context = new DefaultCamelContext()) {
String json = ((CatalogCamelContext) context).getEipParameterJsonSchema("simple");
LOG.info(json);
- assertNotNull("Should have found json for simple", json);
+ assertNotNull(json, "Should have found json for simple");
assertTrue(json.contains("\"label\": \"language,core,java\""));
assertTrue(json.contains("\"name\": \"simple\""));
@@ -85,7 +85,7 @@ public class EipDocumentationTest extends CamelTestSupport {
try (CamelContext context = new DefaultCamelContext()) {
String json = ((CatalogCamelContext) context).getEipParameterJsonSchema("failover");
LOG.info(json);
- assertNotNull("Should have found json for failover", json);
+ assertNotNull(json, "Should have found json for failover");
assertTrue(json.contains("\"name\": \"failover\""));
assertTrue(json.contains(
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java
index 429605d6892..122e284b639 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java
@@ -59,41 +59,35 @@ public class FtpInitialConnectTimeoutTest extends CamelTestSupport {
final AtomicBoolean timeout = new AtomicBoolean();
try {
- doAnswer(new Answer<InputStream>() {
- @Override
- public InputStream answer(InvocationOnMock invocation) throws Throwable {
- final InputStream stream = (InputStream) invocation.callRealMethod();
-
- InputStream inputStream = new InputStream() {
- @Override
- public int read() throws IOException {
- if (timeout.get()) {
- // emulate a timeout occurring in _getReply()
- throw new SocketTimeoutException();
- }
- return stream.read();
+ doAnswer((Answer<InputStream>) invocation12 -> {
+ final InputStream stream = (InputStream) invocation12.callRealMethod();
+
+ InputStream inputStream = new InputStream() {
+ @Override
+ public int read() throws IOException {
+ if (timeout.get()) {
+ // emulate a timeout occurring in _getReply()
+ throw new SocketTimeoutException();
}
- };
+ return stream.read();
+ }
+ };
- return inputStream;
- }
+ return inputStream;
}).when(socket).getInputStream();
} catch (IOException ignored) {
}
try {
- doAnswer(new Answer<Object>() {
- @Override
- public Object answer(InvocationOnMock invocation) throws Throwable {
- if ((Integer) invocation.getArguments()[0] == CONNECT_TIMEOUT) {
- // setting of connect timeout
- timeout.set(true);
- } else {
- // non-connect timeout
- timeout.set(false);
- }
- return invocation.callRealMethod();
+ doAnswer((Answer<Object>) invocation1 -> {
+ if ((Integer) invocation1.getArguments()[0] == CONNECT_TIMEOUT) {
+ // setting of connect timeout
+ timeout.set(true);
+ } else {
+ // non-connect timeout
+ timeout.set(false);
}
+ return invocation1.callRealMethod();
}).when(socket).setSoTimeout(anyInt());
} catch (SocketException e) {
throw new RuntimeException(e);
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.java
index b2377823645..842582b36b0 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JettyRecipientListCxfIssueTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.itest.greeter;
import java.io.File;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.Test;
@@ -57,12 +56,9 @@ public class JettyRecipientListCxfIssueTest extends CamelSpringTestSupport {
assertNotNull(request);
// send a message to jetty
- Exchange out = template.request("http://0.0.0.0:{{RecipientListCxfTest.port3}}/myapp", new Processor() {
- @Override
- public void process(Exchange exchange) {
- exchange.getIn().setHeader("operationName", "greetMe");
- exchange.getIn().setBody(request);
- }
+ Exchange out = template.request("http://0.0.0.0:{{RecipientListCxfTest.port3}}/myapp", exchange -> {
+ exchange.getIn().setHeader("operationName", "greetMe");
+ exchange.getIn().setBody(request);
});
assertNotNull(out);
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/Server.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/Server.java
index 39a3eee8e1d..dabbaf4ca2e 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/Server.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/Server.java
@@ -40,7 +40,7 @@ public class Server {
}
}
- public static void main(String args[]) throws Exception {
+ public static void main(String[] args) throws Exception {
Server server = new Server();
LOG.info("Server ready...");
server.start();
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpFileCacheTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpFileCacheTest.java
index 188a1330e50..8f2c0620764 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpFileCacheTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpFileCacheTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.issues;
import java.io.File;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
@@ -28,6 +26,7 @@ import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.createDirectory;
import static org.apache.camel.test.junit5.TestSupport.deleteDirectory;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class JettyHttpFileCacheTest extends CamelTestSupport {
private static final String TEST_STRING = "This is a test string and it has enough"
@@ -52,6 +51,7 @@ public class JettyHttpFileCacheTest extends CamelTestSupport {
File file = new File("target/cachedir");
String[] files = file.list();
+ assertNotNull(files);
assertEquals(0, files.length, "There should not have any temp file");
}
@@ -66,13 +66,7 @@ public class JettyHttpFileCacheTest extends CamelTestSupport {
.to("http://localhost:9101?bridgeEndpoint=true");
from("jetty:http://localhost:9101?chunked=true&matchOnUriPrefix=true")
- .process(new Processor() {
-
- public void process(Exchange exchange) {
- exchange.getMessage().setBody(TEST_STRING);
- }
-
- });
+ .process(exchange -> exchange.getMessage().setBody(TEST_STRING));
}
};
}
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpTest.java
index 3ba2bb5f3eb..50c9c03562e 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/JettyHttpTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.itest.issues;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -55,11 +54,9 @@ public class JettyHttpTest extends CamelTestSupport {
@Override
public void configure() {
from(targetConsumerUri)
- .process(new Processor() {
- public void process(Exchange exchange) {
- String path = exchange.getIn().getHeader(Exchange.HTTP_URI, String.class);
- exchange.getMessage().setBody("Hi! " + path);
- }
+ .process(exchange -> {
+ String path = exchange.getIn().getHeader(Exchange.HTTP_URI, String.class);
+ exchange.getMessage().setBody("Hi! " + path);
});
from(sourceUri)
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/JaxbFallbackTypeConverterTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/JaxbFallbackTypeConverterTest.java
index 619ae4d8dad..edb5a2ae973 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/JaxbFallbackTypeConverterTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jaxb/JaxbFallbackTypeConverterTest.java
@@ -18,9 +18,7 @@ package org.apache.camel.itest.jaxb;
import java.io.InputStream;
-import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.converter.jaxb.FallbackTypeConverter;
import org.apache.camel.itest.jaxb.example.Bar;
@@ -52,16 +50,11 @@ public class JaxbFallbackTypeConverterTest extends CamelTestSupport {
// setup the camel property for the PrettyPrint
context.getGlobalOptions().put(FallbackTypeConverter.PRETTY_PRINT, "false");
- from("direct:start").process(new Processor() {
-
- @Override
- public void process(Exchange exchange) throws Exception {
- Message in = exchange.getIn();
- InputStream is = in.getMandatoryBody(InputStream.class);
- // make sure we can get the InputStream rightly.
- exchange.getMessage().setBody(is);
- }
-
+ from("direct:start").process(exchange -> {
+ Message in = exchange.getIn();
+ InputStream is = in.getMandatoryBody(InputStream.class);
+ // make sure we can get the InputStream rightly.
+ exchange.getMessage().setBody(is);
});
}
};
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java
index 4cc84d1a52c..5f89dea2731 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyBridgeHostHeaderIssueTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.itest.jetty;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -46,12 +45,8 @@ public class JettyBridgeHostHeaderIssueTest extends CamelTestSupport {
//The first call to our service will hit the first destination in the round robin load balancer
//this destination has the preserveProxyHeader parameter set to true, so we verify the Host header
//received by our downstream instance matches the address and port of the proxied service
- Exchange reply = template.request("http:localhost:" + port + "/myapp", new Processor() {
- @Override
- public void process(Exchange exchange) {
- exchange.getIn().setBody("Hello World");
- }
- });
+ Exchange reply = template.request("http:localhost:" + port + "/myapp",
+ exchange -> exchange.getIn().setBody("Hello World"));
assertNotNull(reply);
assertEquals("foo", reply.getMessage().getBody(String.class));
//assert the received Host header is localhost:port (where port matches the /myapp port)
@@ -60,12 +55,8 @@ public class JettyBridgeHostHeaderIssueTest extends CamelTestSupport {
//The second call to our service will hit the second destination in the round robin load balancer
//this destination does not have the preserveProxyHeader, so we expect the Host header received by the destination
//to match the url of the destination service itself
- Exchange reply2 = template.request("http:localhost:" + port + "/myapp", new Processor() {
- @Override
- public void process(Exchange exchange) {
- exchange.getIn().setBody("Bye World");
- }
- });
+ Exchange reply2 = template.request("http:localhost:" + port + "/myapp",
+ exchange -> exchange.getIn().setBody("Bye World"));
assertNotNull(reply2);
assertEquals("bar", reply2.getMessage().getBody(String.class));
//assert the received Host header is localhost:port3 (where port3 matches the /bar destination server)
@@ -74,24 +65,16 @@ public class JettyBridgeHostHeaderIssueTest extends CamelTestSupport {
//The next two calls will use/test the jetty producers in the round robin load balancer
//The first has the preserveHostHeader option set to true, so we would expect to receive a Host header matching the /myapp proxied service
- Exchange reply3 = template.request("http:localhost:" + port + "/myapp", new Processor() {
- @Override
- public void process(Exchange exchange) {
- exchange.getIn().setBody("Bye JWorld");
- }
- });
+ Exchange reply3 = template.request("http:localhost:" + port + "/myapp",
+ exchange -> exchange.getIn().setBody("Bye JWorld"));
assertNotNull(reply3);
assertEquals("jbar", reply3.getMessage().getBody(String.class));
//assert the received Host header is localhost:port (where port matches the /myapp destination server)
assertEquals("localhost:" + port, receivedHostHeaderEndpoint3);
//The second does not have a preserveHostHeader (preserveHostHeader=false), we would expect to see a Host header matching the destination service
- Exchange reply4 = template.request("http:localhost:" + port + "/myapp", new Processor() {
- @Override
- public void process(Exchange exchange) {
- exchange.getIn().setBody("JAVA!!!!");
- }
- });
+ Exchange reply4 = template.request("http:localhost:" + port + "/myapp",
+ exchange -> exchange.getIn().setBody("JAVA!!!!"));
assertNotNull(reply4);
assertEquals("java???", reply4.getMessage().getBody(String.class));
//assert the received Host header is localhost:port5 (where port3 matches the /jbarf destination server)
@@ -119,39 +102,19 @@ public class JettyBridgeHostHeaderIssueTest extends CamelTestSupport {
.to("http://localhost:" + port5 + "/jbarf?bridgeEndpoint=true&throwExceptionOnFailure=false");
from("jetty:http://localhost:" + port2 + "/foo")
- .process(new Processor() {
- @Override
- public void process(Exchange exchange) {
- receivedHostHeaderEndpoint1 = exchange.getIn().getHeader("Host", String.class);
- }
- })
+ .process(exchange -> receivedHostHeaderEndpoint1 = exchange.getIn().getHeader("Host", String.class))
.transform().constant("foo");
from("jetty:http://localhost:" + port3 + "/bar")
- .process(new Processor() {
- @Override
- public void process(Exchange exchange) {
- receivedHostHeaderEndpoint2 = exchange.getIn().getHeader("Host", String.class);
- }
- })
+ .process(exchange -> receivedHostHeaderEndpoint2 = exchange.getIn().getHeader("Host", String.class))
.transform().constant("bar");
from("jetty:http://localhost:" + port4 + "/jbar")
- .process(new Processor() {
- @Override
- public void process(Exchange exchange) {
- receivedHostHeaderEndpoint3 = exchange.getIn().getHeader("Host", String.class);
- }
- })
+ .process(exchange -> receivedHostHeaderEndpoint3 = exchange.getIn().getHeader("Host", String.class))
.transform().constant("jbar");
from("jetty:http://localhost:" + port5 + "/jbarf")
- .process(new Processor() {
- @Override
- public void process(Exchange exchange) {
- receivedHostHeaderEndpoint4 = exchange.getIn().getHeader("Host", String.class);
- }
- })
+ .process(exchange -> receivedHostHeaderEndpoint4 = exchange.getIn().getHeader("Host", String.class))
.transform().constant("java???");
}
};
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
index 836abafc2fc..04a12982941 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.itest.jetty;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
@@ -84,37 +83,25 @@ public class JettyFailoverRoundRobinTest extends CamelTestSupport {
from(bad)
.to("mock:bad")
- .process(new Processor() {
- public void process(Exchange exchange) {
- exchange.getIn().setHeader(Exchange.HTTP_RESPONSE_CODE, 500);
- exchange.getIn().setBody("Something bad happened");
- }
+ .process(exchange -> {
+ exchange.getIn().setHeader(Exchange.HTTP_RESPONSE_CODE, 500);
+ exchange.getIn().setBody("Something bad happened");
});
from(bad2)
.to("mock:bad2")
- .process(new Processor() {
- public void process(Exchange exchange) {
- exchange.getIn().setHeader(Exchange.HTTP_RESPONSE_CODE, 404);
- exchange.getIn().setBody("Not found");
- }
+ .process(exchange -> {
+ exchange.getIn().setHeader(Exchange.HTTP_RESPONSE_CODE, 404);
+ exchange.getIn().setBody("Not found");
});
from(good)
.to("mock:good")
- .process(new Processor() {
- public void process(Exchange exchange) {
- exchange.getIn().setBody("Good");
- }
- });
+ .process(exchange -> exchange.getIn().setBody("Good"));
from(good2)
.to("mock:good2")
- .process(new Processor() {
- public void process(Exchange exchange) {
- exchange.getIn().setBody("Also good");
- }
- });
+ .process(exchange -> exchange.getIn().setBody("Also good"));
}
};
}
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java
index 8ae3347e8b7..87e71474f16 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFreemarkerTest.java
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.ResourceHelper;
@@ -83,20 +82,17 @@ public class JettyFreemarkerTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() {
from("jetty:http://localhost:" + port + "/test")
- .process(new Processor() {
- @Override
- public void process(Exchange exchange) throws Exception {
- String name = exchange.getIn().getHeader("name", String.class);
- ObjectHelper.notNull(name, "name");
-
- name = "org/apache/camel/itest/jetty/" + name + ".ftl";
- InputStream is
- = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext(), name);
- String xml = exchange.getContext().getTypeConverter().convertTo(String.class, is);
-
- exchange.getMessage().setBody(xml);
- exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, "text/plain");
- }
+ .process(exchange -> {
+ String name = exchange.getIn().getHeader("name", String.class);
+ ObjectHelper.notNull(name, "name");
+
+ name = "org/apache/camel/itest/jetty/" + name + ".ftl";
+ InputStream is
+ = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext(), name);
+ String xml = exchange.getContext().getTypeConverter().convertTo(String.class, is);
+
+ exchange.getMessage().setBody(xml);
+ exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, "text/plain");
});
}
};
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java
index b6e4dd04be1..e50c634dacd 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java
@@ -60,14 +60,12 @@ public class JettyJmsShutdownInProgressTest {
Future<String> reply2 = template.asyncRequestBody(URL, "Camel", String.class);
// shutdown camel while in progress, wait 2 sec so the first req has been received in Camel route
- Executors.newSingleThreadExecutor().execute(new Runnable() {
- public void run() {
- try {
- Thread.sleep(2000);
- JettyJmsShutdownInProgressTest.this.camelContext.stop();
- } catch (Exception e) {
- // ignore
- }
+ Executors.newSingleThreadExecutor().execute(() -> {
+ try {
+ Thread.sleep(2000);
+ JettyJmsShutdownInProgressTest.this.camelContext.stop();
+ } catch (Exception e) {
+ // ignore
}
});
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
index fd33b6b7903..61429ef99d0 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.itest.jetty;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.itest.utils.extensions.JmsServiceExtension;
import org.apache.camel.test.AvailablePortFinder;
@@ -52,12 +51,9 @@ public class JettyJmsTwowayTest {
void testSendingRequest() {
assertNotNull(camelContext, "The camelContext should not be null");
ProducerTemplate template = camelContext.createProducerTemplate();
- Exchange exchange = template.send(URL, new Processor() {
- public void process(Exchange exchange) {
- exchange.getIn().setBody("<hello>Willem</hello>");
- exchange.getIn().setHeader("Operation", "greetMe");
- }
-
+ Exchange exchange = template.send(URL, exchange1 -> {
+ exchange1.getIn().setBody("<hello>Willem</hello>");
+ exchange1.getIn().setHeader("Operation", "greetMe");
});
assertEquals("<response><hello>Willem</hello></response>", exchange.getMessage().getBody(String.class));
template.stop();
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyRestRedirectTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyRestRedirectTest.java
index 8968e5d1820..d7f864e837b 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyRestRedirectTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyRestRedirectTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.itest.jetty;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.http.HttpComponent;
import org.apache.camel.test.AvailablePortFinder;
@@ -53,12 +52,9 @@ public class JettyRestRedirectTest extends CamelTestSupport {
.post("/tag").to("direct:tag");
from("direct:profileLookup").transform().constant("Mock profile");
- from("direct:tag").log("${headers}").process(new Processor() {
- @Override
- public void process(Exchange ex) {
- ex.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 303);
- ex.getMessage().setHeader("Location", "/metadata/profile/1");
- }
+ from("direct:tag").log("${headers}").process(ex -> {
+ ex.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 303);
+ ex.getMessage().setHeader("Location", "/metadata/profile/1");
}).log("${headers}").transform().constant("Redirecting...");
}
};
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
index 429e954c75c..1a8be6507e8 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
@@ -82,37 +82,25 @@ public class JettySimulateFailoverRoundRobinTest extends CamelTestSupport {
from(bad)
.to("mock:bad")
- .process(new Processor() {
- public void process(Exchange exchange) {
- exchange.getIn().setHeader(Exchange.HTTP_RESPONSE_CODE, 500);
- exchange.getIn().setBody("Something bad happened");
- }
+ .process(exchange -> {
+ exchange.getIn().setHeader(Exchange.HTTP_RESPONSE_CODE, 500);
+ exchange.getIn().setBody("Something bad happened");
});
from(bad2)
.to("mock:bad2")
- .process(new Processor() {
- public void process(Exchange exchange) {
- exchange.getIn().setHeader(Exchange.HTTP_RESPONSE_CODE, 404);
- exchange.getIn().setBody("Not found");
- }
+ .process(exchange -> {
+ exchange.getIn().setHeader(Exchange.HTTP_RESPONSE_CODE, 404);
+ exchange.getIn().setBody("Not found");
});
from(good)
.to("mock:good")
- .process(new Processor() {
- public void process(Exchange exchange) {
- exchange.getIn().setBody("Good");
- }
- });
+ .process(exchange -> exchange.getIn().setBody("Good"));
from(good2)
.to("mock:good2")
- .process(new Processor() {
- public void process(Exchange exchange) {
- exchange.getIn().setBody("Also good");
- }
- });
+ .process(exchange -> exchange.getIn().setBody("Also good"));
}
};
}
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java
index 792a0c31232..894717b85d9 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyVelocityTest.java
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.ResourceHelper;
@@ -83,20 +82,17 @@ public class JettyVelocityTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() {
from("jetty:http://localhost:" + port + "/test")
- .process(new Processor() {
- @Override
- public void process(Exchange exchange) throws Exception {
- String name = exchange.getIn().getHeader("name", String.class);
- ObjectHelper.notNull(name, "name");
-
- name = "org/apache/camel/itest/jetty/" + name;
- InputStream is
- = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext(), name);
- String xml = exchange.getContext().getTypeConverter().convertTo(String.class, is);
-
- exchange.getMessage().setBody(xml);
- exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, "text/plain");
- }
+ .process(exchange -> {
+ String name = exchange.getIn().getHeader("name", String.class);
+ ObjectHelper.notNull(name, "name");
+
+ name = "org/apache/camel/itest/jetty/" + name;
+ InputStream is
+ = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext(), name);
+ String xml = exchange.getContext().getTypeConverter().convertTo(String.class, is);
+
+ exchange.getMessage().setBody(xml);
+ exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, "text/plain");
});
}
};
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyXsltHttpTemplateTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyXsltHttpTemplateTest.java
index bef81bf0540..7ca49550192 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyXsltHttpTemplateTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyXsltHttpTemplateTest.java
@@ -37,11 +37,11 @@ public class JettyXsltHttpTemplateTest extends CamelTestSupport {
"<mail><subject>Hey</subject><body>Hello world!</body></mail>", String.class);
assertNotNull(xml, "The transformed XML should not be null");
- assertTrue(xml.indexOf("transformed") > -1);
+ assertTrue(xml.contains("transformed"));
// the cheese tag is in the transform.xsl
- assertTrue(xml.indexOf("cheese") > -1);
- assertTrue(xml.indexOf("<subject>Hey</subject>") > -1);
- assertTrue(xml.indexOf("<body>Hello world!</body>") > -1);
+ assertTrue(xml.contains("cheese"));
+ assertTrue(xml.contains("<subject>Hey</subject>"));
+ assertTrue(xml.contains("<body>Hello world!</body>"));
}
@Override
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyXsltTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyXsltTest.java
index e15fae5b32d..1cdacfd6572 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyXsltTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyXsltTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.itest.jetty;
import java.io.InputStream;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.ResourceHelper;
@@ -70,20 +69,17 @@ public class JettyXsltTest extends CamelTestSupport {
return new RouteBuilder() {
public void configure() {
from("jetty:http://localhost:" + port + "/test")
- .process(new Processor() {
- @Override
- public void process(Exchange exchange) throws Exception {
- String name = exchange.getIn().getHeader("name", String.class);
- ObjectHelper.notNull(name, "name");
+ .process(exchange -> {
+ String name = exchange.getIn().getHeader("name", String.class);
+ ObjectHelper.notNull(name, "name");
- name = "org/apache/camel/itest/jetty/" + name;
- InputStream is
- = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext(), name);
- String xml = exchange.getContext().getTypeConverter().convertTo(String.class, is);
+ name = "org/apache/camel/itest/jetty/" + name;
+ InputStream is
+ = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext(), name);
+ String xml = exchange.getContext().getTypeConverter().convertTo(String.class, is);
- exchange.getMessage().setBody(xml);
- exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, "text/xml");
- }
+ exchange.getMessage().setBody(xml);
+ exchange.getMessage().setHeader(Exchange.CONTENT_TYPE, "text/xml");
});
}
};
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java
index d7fd0125ddf..aa2e8599497 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.itest.jms;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
@@ -62,11 +60,8 @@ public class JmsConsumerShutdownTest {
end.setResultWaitTime(1000);
// direct:dir route always fails
- exception.whenAnyExchangeReceived(new Processor() {
- @Override
- public void process(Exchange exchange) throws Exception {
- throw new Exception("Kaboom!");
- }
+ exception.whenAnyExchangeReceived(exchange -> {
+ throw new Exception("Kaboom!");
});
activemq.sendBody("jms:start", "Hello");
@@ -84,11 +79,8 @@ public class JmsConsumerShutdownTest {
end.setResultWaitTime(1000);
// direct:dir route always fails
- exception.whenAnyExchangeReceived(new Processor() {
- @Override
- public void process(Exchange exchange) throws Exception {
- throw new Exception("Kaboom!");
- }
+ exception.whenAnyExchangeReceived(exchange -> {
+ throw new Exception("Kaboom!");
});
seda.sendBody("seda:start", "Hello");
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java
index 825a4cfc11f..38bb4f742d1 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpJmsTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.itest.jms;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.mock.MockEndpoint;
@@ -51,22 +50,14 @@ public class JmsHttpJmsTest extends CamelTestSupport {
template.sendBody("jms:in", "Hello World");
Endpoint endpoint = context.getEndpoint("jms:out");
- endpoint.createConsumer(new Processor() {
- public void process(Exchange exchange) {
- assertEquals("Bye World", exchange.getIn().getBody(String.class));
- }
- });
+ endpoint.createConsumer(exchange -> assertEquals("Bye World", exchange.getIn().getBody(String.class)));
mock.assertIsSatisfied();
}
@Test
void testResultReplyJms() throws Exception {
- Exchange exchange = template.request("jms:reply?replyTo=bar", new Processor() {
- public void process(Exchange exchange) {
- exchange.getIn().setBody("Hello World");
- }
- });
+ Exchange exchange = template.request("jms:reply?replyTo=bar", exchange1 -> exchange1.getIn().setBody("Hello World"));
assertEquals("Bye World", exchange.getMessage().getBody(String.class));
assertTrue(exchange.getMessage().hasHeaders(), "Should have headers");
assertEquals("ActiveMQQueue[bar]", exchange.getMessage().getHeader("JMSDestination", String.class));
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueTest.java
index fe5e3576cf3..1629bc801c2 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.itest.jms;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsComponent;
@@ -72,16 +70,13 @@ public class JmsHttpPostIssueTest extends CamelTestSupport {
.to("http://localhost:" + port + "/myservice");
from("jetty:http://0.0.0.0:" + port + "/myservice")
- .process(new Processor() {
- @Override
- public void process(Exchange exchange) {
- String body = exchange.getIn().getBody(String.class);
- assertEquals("name=Hello World", body);
-
- exchange.getMessage().setBody("OK");
- exchange.getMessage().setHeader(CONTENT_TYPE, "text/plain");
- exchange.getMessage().setHeader(HTTP_RESPONSE_CODE, 200);
- }
+ .process(exchange -> {
+ String body = exchange.getIn().getBody(String.class);
+ assertEquals("name=Hello World", body);
+
+ exchange.getMessage().setBody("OK");
+ exchange.getMessage().setHeader(CONTENT_TYPE, "text/plain");
+ exchange.getMessage().setHeader(HTTP_RESPONSE_CODE, 200);
});
}
};
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueWithMockTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueWithMockTest.java
index d578e4c9547..cba280a6279 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueWithMockTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsHttpPostIssueWithMockTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.itest.jms;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.mock.MockEndpoint;
@@ -76,16 +74,13 @@ public class JmsHttpPostIssueWithMockTest extends CamelTestSupport {
.to("mock:result");
from("jetty:http://0.0.0.0:" + port + "/myservice")
- .process(new Processor() {
- @Override
- public void process(Exchange exchange) {
- String body = exchange.getIn().getBody(String.class);
- assertEquals("name=Hello World", body);
-
- exchange.getMessage().setBody("OK");
- exchange.getMessage().setHeader(CONTENT_TYPE, "text/plain");
- exchange.getMessage().setHeader(HTTP_RESPONSE_CODE, 200);
- }
+ .process(exchange -> {
+ String body = exchange.getIn().getBody(String.class);
+ assertEquals("name=Hello World", body);
+
+ exchange.getMessage().setBody("OK");
+ exchange.getMessage().setHeader(CONTENT_TYPE, "text/plain");
+ exchange.getMessage().setHeader(HTTP_RESPONSE_CODE, 200);
});
}
};
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
index 53d61f0695a..2898d80d001 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
@@ -21,7 +21,6 @@ import java.util.List;
import org.apache.camel.Body;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.mock.MockEndpoint;
@@ -51,14 +50,12 @@ public class JmsResequencerTest extends CamelTestSupport {
public void sendBodyAndHeader(
String endpointUri, final Object body, final String headerName,
final Object headerValue) {
- template.send(endpointUri, new Processor() {
- public void process(Exchange exchange) {
- Message in = exchange.getIn();
- in.setBody(body);
- in.setHeader(headerName, headerValue);
- //in.setHeader("testCase", getName());
- in.setHeader(Exchange.BEAN_METHOD_NAME, "execute");
- }
+ template.send(endpointUri, exchange -> {
+ Message in = exchange.getIn();
+ in.setBody(body);
+ in.setHeader(headerName, headerValue);
+ //in.setHeader("testCase", getName());
+ in.setHeader(Exchange.BEAN_METHOD_NAME, "execute");
});
}
@@ -134,7 +131,7 @@ public class JmsResequencerTest extends CamelTestSupport {
return "bean:" + beanName + "?method=execute";
}
- public class ReusableBean {
+ public static class ReusableBean {
public String body;
private String name;
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java
index 658056d4040..0e444ac9dac 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
@@ -72,14 +71,12 @@ public class NettyAsyncRequestReplyTest extends CamelTestSupport {
Map<Integer, Future<String>> responses = new HashMap<>();
for (int i = 0; i < size; i++) {
final int index = i;
- Future<String> out = executor.submit(new Callable<String>() {
- public String call() throws Exception {
- String reply = template.requestBody("netty:tcp://localhost:" + port + "?textline=true&sync=true", index,
- String.class);
- LOG.info("Sent {} received {}", index, reply);
- assertEquals("Bye " + index, reply);
- return reply;
- }
+ Future<String> out = executor.submit(() -> {
+ String reply = template.requestBody("netty:tcp://localhost:" + port + "?textline=true&sync=true", index,
+ String.class);
+ LOG.info("Sent {} received {}", index, reply);
+ assertEquals("Bye " + index, reply);
+ return reply;
});
responses.put(index, out);
}
@@ -88,7 +85,7 @@ public class NettyAsyncRequestReplyTest extends CamelTestSupport {
Set<String> unique = new HashSet<>();
for (Future<String> future : responses.values()) {
String reply = future.get(120, TimeUnit.SECONDS);
- assertNotNull("Should get a reply", reply);
+ assertNotNull(reply, "Should get a reply");
unique.add(reply);
}
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/nettyhttp/NettyHttpClientChunkedResponseTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/nettyhttp/NettyHttpClientChunkedResponseTest.java
index c52a4897ecd..5e9bc8386a4 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/nettyhttp/NettyHttpClientChunkedResponseTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/nettyhttp/NettyHttpClientChunkedResponseTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.itest.nettyhttp;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -44,13 +43,8 @@ public class NettyHttpClientChunkedResponseTest extends CamelTestSupport {
}
private void invokeService(int port, boolean checkChunkedHeader) {
- Exchange out = template.request("netty-http:http://localhost:" + port + "/test", new Processor() {
-
- @Override
- public void process(Exchange exchange) {
- exchange.getIn().setBody("Camel in chunks.");
- }
- });
+ Exchange out = template.request("netty-http:http://localhost:" + port + "/test",
+ exchange -> exchange.getIn().setBody("Camel in chunks."));
assertNotNull(out);
assertEquals("Bye Camel in chunks.", out.getMessage().getBody(String.class));
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/KeystorePasswordCallback.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/KeystorePasswordCallback.java
index d1e0c9af0a0..74fb275bd06 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/KeystorePasswordCallback.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/KeystorePasswordCallback.java
@@ -95,9 +95,7 @@ public class KeystorePasswordCallback implements CallbackHandler {
Method getType = null;
try {
getType = pc.getClass().getMethod("getPasswordType");
- } catch (NoSuchMethodException ex) {
- // keep looking
- } catch (SecurityException ex) {
+ } catch (NoSuchMethodException | SecurityException ex) {
// keep looking
}
if (getType == null) {
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
index a99b0793eef..7f77c1249dc 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
@@ -20,8 +20,6 @@ import jakarta.annotation.Resource;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
import org.apache.camel.test.AvailablePortFinder;
@@ -68,10 +66,8 @@ public class JmsToHttpRoute extends RouteBuilder {
// as this is based on an unit test we use mocks to verify how many times we did rollback
.to("mock:JmsToHttpRoute")
// response is not okay so force a rollback by throwing an exception
- .process(new Processor() {
- public void process(Exchange exchange) {
- throw new IllegalArgumentException("Rollback please");
- }
+ .process(exchange -> {
+ throw new IllegalArgumentException("Rollback please");
})
.otherwise()
// otherwise since its okay, the route ends and the response is sent back
@@ -80,13 +76,11 @@ public class JmsToHttpRoute extends RouteBuilder {
// this is our http route that will fail the first 2 attempts
// before it sends an ok response
- from("jetty:http://localhost:" + port + "/sender").process(new Processor() {
- public void process(Exchange exchange) {
- if (counter++ < 2) {
- exchange.getMessage().setBody(nok);
- } else {
- exchange.getMessage().setBody(ok);
- }
+ from("jetty:http://localhost:" + port + "/sender").process(exchange -> {
+ if (counter++ < 2) {
+ exchange.getMessage().setBody(nok);
+ } else {
+ exchange.getMessage().setBody(ok);
}
});
}
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java
index 522eeef297f..e34b9b6d30f 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java
@@ -17,8 +17,6 @@
package org.apache.camel.itest.tx;
import org.apache.camel.Exchange;
-import org.apache.camel.Predicate;
-import org.apache.camel.Processor;
import org.apache.camel.http.base.HttpOperationFailedException;
import org.apache.camel.test.AvailablePortFinder;
@@ -35,11 +33,9 @@ public class JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute
port = AvailablePortFinder.getNextAvailable();
// if its a 404 then regard it as handled
- onException(HttpOperationFailedException.class).onWhen(new Predicate() {
- public boolean matches(Exchange exchange) {
- HttpOperationFailedException e = exchange.getException(HttpOperationFailedException.class);
- return e != null && e.getStatusCode() == 404;
- }
+ onException(HttpOperationFailedException.class).onWhen(exchange -> {
+ HttpOperationFailedException e = exchange.getException(HttpOperationFailedException.class);
+ return e != null && e.getStatusCode() == 404;
}).handled(true).to("mock:404").transform(constant(noAccess));
from("activemq:queue:JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute")
@@ -64,30 +60,28 @@ public class JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute
.end();
// this is our http router
- from("jetty:http://localhost:" + port + "/sender").process(new Processor() {
- public void process(Exchange exchange) {
- // first hit is always a error code 500 to force the caller to retry
- if (counter++ < 1) {
- // simulate http error 500
- exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 500);
- exchange.getMessage().setBody("Damn some internal server error");
- return;
- }
-
- String user = exchange.getIn().getHeader("user", String.class);
- if ("unknown".equals(user)) {
- // no page for a unknown user
- exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 404);
- exchange.getMessage().setBody("Page does not exists");
- return;
- } else if ("guest".equals(user)) {
- // not okay for guest user
- exchange.getMessage().setBody(nok);
- return;
- }
+ from("jetty:http://localhost:" + port + "/sender").process(exchange -> {
+ // first hit is always a error code 500 to force the caller to retry
+ if (counter++ < 1) {
+ // simulate http error 500
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 500);
+ exchange.getMessage().setBody("Damn some internal server error");
+ return;
+ }
- exchange.getMessage().setBody(ok);
+ String user = exchange.getIn().getHeader("user", String.class);
+ if ("unknown".equals(user)) {
+ // no page for a unknown user
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 404);
+ exchange.getMessage().setBody("Page does not exists");
+ return;
+ } else if ("guest".equals(user)) {
+ // not okay for guest user
+ exchange.getMessage().setBody(nok);
+ return;
}
+
+ exchange.getMessage().setBody(ok);
});
}
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java
index adbe4ccd3d0..951c406af4c 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java
@@ -19,8 +19,6 @@ package org.apache.camel.itest.tx;
import jakarta.annotation.Resource;
import org.apache.camel.Exchange;
-import org.apache.camel.Predicate;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.http.base.HttpOperationFailedException;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
@@ -53,11 +51,9 @@ public class JmsToHttpWithOnExceptionRoute extends RouteBuilder {
errorHandler(transactionErrorHandler(required));
// if its a 404 then regard it as handled
- onException(HttpOperationFailedException.class).onWhen(new Predicate() {
- public boolean matches(Exchange exchange) {
- HttpOperationFailedException e = exchange.getException(HttpOperationFailedException.class);
- return e != null && e.getStatusCode() == 404;
- }
+ onException(HttpOperationFailedException.class).onWhen(exchange -> {
+ HttpOperationFailedException e = exchange.getException(HttpOperationFailedException.class);
+ return e != null && e.getStatusCode() == 404;
}).handled(true).to("mock:JmsToHttpWithOnExceptionRoute404").transform(constant(noAccess));
from("activemq:queue:JmsToHttpWithOnExceptionRoute")
@@ -82,30 +78,28 @@ public class JmsToHttpWithOnExceptionRoute extends RouteBuilder {
.end();
// this is our http router
- from("jetty:http://localhost:" + port + "/sender").process(new Processor() {
- public void process(Exchange exchange) {
- // first hit is always a error code 500 to force the caller to retry
- if (counter++ < 1) {
- // simulate http error 500
- exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 500);
- exchange.getMessage().setBody("Damn some internal server error");
- return;
- }
-
- String user = exchange.getIn().getHeader("user", String.class);
- if ("unknown".equals(user)) {
- // no page for a unknown user
- exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 404);
- exchange.getMessage().setBody("Page does not exists");
- return;
- } else if ("guest".equals(user)) {
- // not okay for guest user
- exchange.getMessage().setBody(nok);
- return;
- }
+ from("jetty:http://localhost:" + port + "/sender").process(exchange -> {
+ // first hit is always a error code 500 to force the caller to retry
+ if (counter++ < 1) {
+ // simulate http error 500
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 500);
+ exchange.getMessage().setBody("Damn some internal server error");
+ return;
+ }
- exchange.getMessage().setBody(ok);
+ String user = exchange.getIn().getHeader("user", String.class);
+ if ("unknown".equals(user)) {
+ // no page for a unknown user
+ exchange.getMessage().setHeader(Exchange.HTTP_RESPONSE_CODE, 404);
+ exchange.getMessage().setBody("Page does not exists");
+ return;
+ } else if ("guest".equals(user)) {
+ // not okay for guest user
+ exchange.getMessage().setBody(nok);
+ return;
}
+
+ exchange.getMessage().setBody(ok);
});
}
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithRollbackRoute.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithRollbackRoute.java
index 2c5210370c9..82ae446d7a3 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithRollbackRoute.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithRollbackRoute.java
@@ -20,8 +20,6 @@ import jakarta.annotation.Resource;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
import org.apache.camel.test.AvailablePortFinder;
@@ -76,13 +74,11 @@ public class JmsToHttpWithRollbackRoute extends RouteBuilder {
// this is our http route that will fail the first 2 attempts
// before it sends an ok response
- from("jetty:http://localhost:" + port + "/sender").process(new Processor() {
- public void process(Exchange exchange) {
- if (counter++ < 2) {
- exchange.getMessage().setBody(nok);
- } else {
- exchange.getMessage().setBody(ok);
- }
+ from("jetty:http://localhost:" + port + "/sender").process(exchange -> {
+ if (counter++ < 2) {
+ exchange.getMessage().setBody(nok);
+ } else {
+ exchange.getMessage().setBody(ok);
}
});
}