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 2024/08/21 05:41:15 UTC
(camel) 03/04: (chores) convert core/camel-core to use pattern matching for instanceof
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
commit 429812d7390ea5edfee0d74870ff040b2a5c9cec
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Aug 20 13:36:15 2024 +0200
(chores) convert core/camel-core to use pattern matching for instanceof
---
.../java/org/apache/camel/ContextTestSupport.java | 7 +++----
.../src/test/java/org/apache/camel/TestSupport.java | 20 ++++++++++----------
.../camel/builder/FluentProducerTemplateTest.java | 4 ++--
.../org/apache/camel/builder/RouteBuilderTest.java | 3 +--
.../component/mock/MockEndpointTimeClauseTest.java | 4 ++--
.../camel/component/xslt/XsltResultHandlerTest.java | 4 ++--
.../impl/DefaultComponentAutowiredFalseTest.java | 3 +--
.../apache/camel/impl/RouteSedaStopStartTest.java | 8 ++++----
.../camel/impl/RouteSedaSuspendResumeTest.java | 8 ++++----
.../camel/impl/engine/PeriodTaskSchedulerTest.java | 8 ++++----
.../impl/event/EventNotifierExchangeSentTest.java | 6 ++----
.../RoutesConfigurationBuilderIdOrPatternTest.java | 9 +++------
.../camel/model/RoutesConfigurationBuilderTest.java | 15 +++++----------
.../camel/processor/CustomProcessorFactoryTest.java | 6 ++----
.../MultiCastParallelAndStreamCachingTest.java | 10 ++++------
...stParallelAndStreamCachingWithEncryptionTest.java | 5 +++--
.../camel/processor/MyLoggingSentEventNotifer.java | 3 +--
.../apache/camel/processor/NavigateRouteTest.java | 6 ++----
.../processor/SetHeaderUsingDslExpressionsTest.java | 3 +--
.../SplitterWithCustomThreadPoolExecutorTest.java | 4 ++--
.../async/AsyncEndpointEventNotifierTest.java | 3 +--
.../camel/processor/converter/custom/MyBean.java | 3 +--
.../camel/processor/interceptor/DebugTest.java | 3 +--
.../PropertyBindingSupportConfigurerTest.java | 6 ++----
24 files changed, 63 insertions(+), 88 deletions(-)
diff --git a/core/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java b/core/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
index 8c83989841b..c4972b3a267 100644
--- a/core/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
@@ -456,9 +456,9 @@ public abstract class ContextTestSupport extends TestSupport
RoutesBuilder[] builders = createRouteBuilders();
// add configuration before routes
for (RoutesBuilder builder : builders) {
- if (builder instanceof RouteConfigurationsBuilder) {
+ if (builder instanceof RouteConfigurationsBuilder routeConfigurationsBuilder) {
log.debug("Using created route configuration: {}", builder);
- context.addRoutesConfigurations((RouteConfigurationsBuilder) builder);
+ context.addRoutesConfigurations(routeConfigurationsBuilder);
}
}
for (RoutesBuilder builder : builders) {
@@ -677,8 +677,7 @@ public abstract class ContextTestSupport extends TestSupport
if (camelContextService != null) {
camelContextService.start();
} else {
- if (context instanceof DefaultCamelContext) {
- DefaultCamelContext defaultCamelContext = (DefaultCamelContext) context;
+ if (context instanceof DefaultCamelContext defaultCamelContext) {
if (!defaultCamelContext.isStarted()) {
defaultCamelContext.start();
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
index 098feb49c13..c0bbca84ad3 100644
--- a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
@@ -433,8 +433,8 @@ public abstract class TestSupport {
*/
public static Processor unwrap(Processor processor) {
while (true) {
- if (processor instanceof DelegateProcessor) {
- processor = ((DelegateProcessor) processor).getProcessor();
+ if (processor instanceof DelegateProcessor delegateProcessor) {
+ processor = delegateProcessor.getProcessor();
} else {
return processor;
}
@@ -449,15 +449,15 @@ public abstract class TestSupport {
*/
public static Channel unwrapChannel(Processor processor) {
while (true) {
- if (processor instanceof Pipeline) {
- processor = ((Pipeline) processor).next().get(0);
+ if (processor instanceof Pipeline pipeline) {
+ processor = pipeline.next().get(0);
}
- if (processor instanceof Channel) {
- return (Channel) processor;
- } else if (processor instanceof DelegateProcessor) {
- processor = ((DelegateProcessor) processor).getProcessor();
- } else if (processor instanceof ErrorHandlerSupport) {
- processor = ((ErrorHandlerSupport) processor).getOutput();
+ if (processor instanceof Channel channel) {
+ return channel;
+ } else if (processor instanceof DelegateProcessor delegateProcessor) {
+ processor = delegateProcessor.getProcessor();
+ } else if (processor instanceof ErrorHandlerSupport errorHandlerSupport) {
+ processor = errorHandlerSupport.getOutput();
} else {
return null;
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/FluentProducerTemplateTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/FluentProducerTemplateTest.java
index d9f2ca0fa36..e028a5e5221 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/FluentProducerTemplateTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/FluentProducerTemplateTest.java
@@ -475,8 +475,8 @@ public class FluentProducerTemplateTest extends ContextTestSupport {
from("direct:in").process(exchange -> exchange.getIn().setBody("Bye World")).to("mock:result");
from("direct:sum").process(exchange -> {
Object body = exchange.getIn().getBody();
- if (body instanceof Integer) {
- exchange.getIn().setBody((Integer) body + 1);
+ if (body instanceof Integer integer) {
+ exchange.getIn().setBody(integer + 1);
} else {
throw new IllegalArgumentException("Expected body of type Integer");
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
index 01bc6cbed43..cd7195be979 100644
--- a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
@@ -537,8 +537,7 @@ public class RouteBuilderTest extends TestSupport {
}
protected Processor unwrapDelegateProcessor(Processor processor) {
- if (processor instanceof DelegateProcessor) {
- DelegateProcessor delegate = (DelegateProcessor) processor;
+ if (processor instanceof DelegateProcessor delegate) {
return delegate.getProcessor();
} else {
return processor;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTimeClauseTest.java b/core/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTimeClauseTest.java
index bb1cb10226e..bc4b60bd322 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTimeClauseTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTimeClauseTest.java
@@ -232,8 +232,8 @@ public class MockEndpointTimeClauseTest extends ContextTestSupport {
}
private boolean isStarted(Service service) {
- if (service instanceof StatefulService) {
- return ((StatefulService) service).isStarted();
+ if (service instanceof StatefulService statefulService) {
+ return statefulService.isStarted();
}
return true;
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltResultHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltResultHandlerTest.java
index a7c8748a4b3..18ca2d4435c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltResultHandlerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/xslt/XsltResultHandlerTest.java
@@ -39,8 +39,8 @@ public class XsltResultHandlerTest extends TestSupport {
XsltEndpoint endpoint = null;
for (Endpoint ep : context.getEndpoints()) {
- if (ep instanceof XsltEndpoint) {
- endpoint = (XsltEndpoint) ep;
+ if (ep instanceof XsltEndpoint xsltEndpoint) {
+ endpoint = xsltEndpoint;
break;
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentAutowiredFalseTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentAutowiredFalseTest.java
index 7dadf370e04..e760fe644ce 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentAutowiredFalseTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentAutowiredFalseTest.java
@@ -147,8 +147,7 @@ public class DefaultComponentAutowiredFalseTest extends ContextTestSupport {
@Override
public boolean configure(CamelContext camelContext, Object target, String name, Object value, boolean ignoreCase) {
if ("contentHandlerFactory".equals(name)) {
- if (target instanceof MyComponent) {
- MyComponent comp = (MyComponent) target;
+ if (target instanceof MyComponent comp) {
comp.setContentHandlerFactory((ContentHandlerFactory) value);
} else {
MyEndpoint endp = (MyEndpoint) target;
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/RouteSedaStopStartTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/RouteSedaStopStartTest.java
index d1e2aeea5ac..b8bbdd5622f 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/RouteSedaStopStartTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/RouteSedaStopStartTest.java
@@ -45,8 +45,8 @@ public class RouteSedaStopStartTest extends ContextTestSupport {
assertEquals("Stopped", context.getRouteController().getRouteStatus("foo").name());
Route route = context.getRoute("foo");
- if (route instanceof StatefulService) {
- assertEquals("Stopped", ((StatefulService) route).getStatus().name());
+ if (route instanceof StatefulService statefulService) {
+ assertEquals("Stopped", statefulService.getStatus().name());
}
template.sendBody("seda:foo", "B");
@@ -62,8 +62,8 @@ public class RouteSedaStopStartTest extends ContextTestSupport {
assertEquals("Started", context.getRouteController().getRouteStatus("foo").name());
route = context.getRoute("foo");
- if (route instanceof StatefulService) {
- assertEquals("Started", ((StatefulService) route).getStatus().name());
+ if (route instanceof StatefulService statefulService) {
+ assertEquals("Started", statefulService.getStatus().name());
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/RouteSedaSuspendResumeTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/RouteSedaSuspendResumeTest.java
index cdf5115b66f..4460350ba3c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/RouteSedaSuspendResumeTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/RouteSedaSuspendResumeTest.java
@@ -49,8 +49,8 @@ public class RouteSedaSuspendResumeTest extends ContextTestSupport {
assertEquals("Suspended", context.getRouteController().getRouteStatus("foo").name());
Route route = context.getRoute("foo");
- if (route instanceof StatefulService) {
- assertEquals("Suspended", ((StatefulService) route).getStatus().name());
+ if (route instanceof StatefulService statefulService) {
+ assertEquals("Suspended", statefulService.getStatus().name());
}
Thread.sleep(1000L);
@@ -72,8 +72,8 @@ public class RouteSedaSuspendResumeTest extends ContextTestSupport {
assertEquals("Started", context.getRouteController().getRouteStatus("foo").name());
route = context.getRoute("foo");
- if (route instanceof StatefulService) {
- assertEquals("Started", ((StatefulService) route).getStatus().name());
+ if (route instanceof StatefulService statefulService) {
+ assertEquals("Started", statefulService.getStatus().name());
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/PeriodTaskSchedulerTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/PeriodTaskSchedulerTest.java
index b95740cb9e0..714749a7670 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/PeriodTaskSchedulerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/PeriodTaskSchedulerTest.java
@@ -42,9 +42,9 @@ public class PeriodTaskSchedulerTest extends ContextTestSupport {
counter.set(0);
PeriodTaskScheduler scheduler = PluginHelper.getPeriodTaskScheduler(context);
- if (scheduler instanceof TimerListenerManager) {
+ if (scheduler instanceof TimerListenerManager timerListenerManager) {
// speedup unit test
- ((TimerListenerManager) scheduler).setInterval(10);
+ timerListenerManager.setInterval(10);
}
scheduler.schedulePeriodTask(counter::incrementAndGet, 10);
context.start();
@@ -59,9 +59,9 @@ public class PeriodTaskSchedulerTest extends ContextTestSupport {
MyTask task = new MyTask();
PeriodTaskScheduler scheduler = PluginHelper.getPeriodTaskScheduler(context);
- if (scheduler instanceof TimerListenerManager) {
+ if (scheduler instanceof TimerListenerManager timerListenerManager) {
// speedup unit test
- ((TimerListenerManager) scheduler).setInterval(10);
+ timerListenerManager.setInterval(10);
}
scheduler.schedulePeriodTask(task, 10);
context.start();
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeSentTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeSentTest.java
index f9e5d8a38fb..cd3154f6134 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeSentTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierExchangeSentTest.java
@@ -157,14 +157,12 @@ public class EventNotifierExchangeSentTest extends ContextTestSupport {
boolean found = false;
boolean found2 = false;
for (CamelEvent event : events) {
- if (event instanceof ExchangeSendingEvent) {
- ExchangeSendingEvent sending = (ExchangeSendingEvent) event;
+ if (event instanceof ExchangeSendingEvent sending) {
String uri = sending.getEndpoint().getEndpointUri();
if ("log://foo".equals(uri)) {
found = true;
}
- } else if (event instanceof ExchangeSentEvent) {
- ExchangeSentEvent sent = (ExchangeSentEvent) event;
+ } else if (event instanceof ExchangeSentEvent sent) {
String uri = sent.getEndpoint().getEndpointUri();
if ("log://foo".equals(uri)) {
found2 = true;
diff --git a/core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationBuilderIdOrPatternTest.java b/core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationBuilderIdOrPatternTest.java
index 7c5441866a6..f7c8b3bcbe6 100644
--- a/core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationBuilderIdOrPatternTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationBuilderIdOrPatternTest.java
@@ -73,8 +73,7 @@ public class RoutesConfigurationBuilderIdOrPatternTest extends ContextTestSuppor
// first add the routes configurations as they are globally for all routes
for (RoutesBuilder builder : routes) {
- if (builder instanceof RouteConfigurationsBuilder) {
- RouteConfigurationsBuilder rcb = (RouteConfigurationsBuilder) builder;
+ if (builder instanceof RouteConfigurationsBuilder rcb) {
context.addRoutesConfigurations(rcb);
}
}
@@ -135,8 +134,7 @@ public class RoutesConfigurationBuilderIdOrPatternTest extends ContextTestSuppor
// first add the routes configurations as they are globally for all routes
for (RoutesBuilder builder : routes) {
- if (builder instanceof RouteConfigurationsBuilder) {
- RouteConfigurationsBuilder rcb = (RouteConfigurationsBuilder) builder;
+ if (builder instanceof RouteConfigurationsBuilder rcb) {
context.addRoutesConfigurations(rcb);
}
}
@@ -192,8 +190,7 @@ public class RoutesConfigurationBuilderIdOrPatternTest extends ContextTestSuppor
// first add the routes configurations as they are globally for all routes
for (RoutesBuilder builder : routes) {
- if (builder instanceof RouteConfigurationsBuilder) {
- RouteConfigurationsBuilder rcb = (RouteConfigurationsBuilder) builder;
+ if (builder instanceof RouteConfigurationsBuilder rcb) {
context.addRoutesConfigurations(rcb);
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationBuilderTest.java
index 17aeaf356c4..419e7a2a768 100644
--- a/core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationBuilderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/model/RoutesConfigurationBuilderTest.java
@@ -66,8 +66,7 @@ public class RoutesConfigurationBuilderTest extends ContextTestSupport {
// first add the routes configurations as they are globally for all routes
for (RoutesBuilder builder : routes) {
- if (builder instanceof RouteConfigurationsBuilder) {
- RouteConfigurationsBuilder rcb = (RouteConfigurationsBuilder) builder;
+ if (builder instanceof RouteConfigurationsBuilder rcb) {
context.addRoutesConfigurations(rcb);
}
}
@@ -118,8 +117,7 @@ public class RoutesConfigurationBuilderTest extends ContextTestSupport {
// first add the routes configurations as they are globally for all routes
for (RoutesBuilder builder : routes) {
- if (builder instanceof RouteConfigurationsBuilder) {
- RouteConfigurationsBuilder rcb = (RouteConfigurationsBuilder) builder;
+ if (builder instanceof RouteConfigurationsBuilder rcb) {
context.addRoutesConfigurations(rcb);
}
}
@@ -174,8 +172,7 @@ public class RoutesConfigurationBuilderTest extends ContextTestSupport {
// first add the routes configurations as they are globally for all routes
for (RoutesBuilder builder : routes) {
- if (builder instanceof RouteConfigurationsBuilder) {
- RouteConfigurationsBuilder rcb = (RouteConfigurationsBuilder) builder;
+ if (builder instanceof RouteConfigurationsBuilder rcb) {
context.addRoutesConfigurations(rcb);
}
}
@@ -229,8 +226,7 @@ public class RoutesConfigurationBuilderTest extends ContextTestSupport {
// first add the routes configurations as they are globally for all routes
for (RoutesBuilder builder : routes) {
- if (builder instanceof RouteConfigurationsBuilder) {
- RouteConfigurationsBuilder rcb = (RouteConfigurationsBuilder) builder;
+ if (builder instanceof RouteConfigurationsBuilder rcb) {
context.addRoutesConfigurations(rcb);
}
}
@@ -288,8 +284,7 @@ public class RoutesConfigurationBuilderTest extends ContextTestSupport {
// first add the routes configurations as they are globally for all routes
for (RoutesBuilder builder : routes) {
- if (builder instanceof RouteConfigurationsBuilder) {
- RouteConfigurationsBuilder rcb = (RouteConfigurationsBuilder) builder;
+ if (builder instanceof RouteConfigurationsBuilder rcb) {
context.addRoutesConfigurations(rcb);
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/CustomProcessorFactoryTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/CustomProcessorFactoryTest.java
index b63cfefb5b0..da6f1aa7d0c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/CustomProcessorFactoryTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/CustomProcessorFactoryTest.java
@@ -81,14 +81,12 @@ public class CustomProcessorFactoryTest extends ContextTestSupport {
@Override
public Processor createProcessor(Route route, NamedNode definition) throws Exception {
- if (definition instanceof SplitDefinition) {
+ if (definition instanceof SplitDefinition split) {
// add additional output to the splitter
- SplitDefinition split = (SplitDefinition) definition;
split.addOutput(new ToDefinition("mock:extra"));
}
- if (definition instanceof SetBodyDefinition) {
- SetBodyDefinition set = (SetBodyDefinition) definition;
+ if (definition instanceof SetBodyDefinition set) {
set.setExpression(new ConstantExpression("body was altered"));
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java
index 7b01e20cef1..86b61544a2e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java
@@ -82,20 +82,18 @@ public class MultiCastParallelAndStreamCachingTest extends ContextTestSupport {
Thread.sleep(50);
}
Object body = exchange.getIn().getBody();
- if (body instanceof InputStream) {
+ if (body instanceof InputStream inputStream) {
ByteArrayOutputStream output = new ByteArrayOutputStream();
- IOHelper.copy((InputStream) body, output);
+ IOHelper.copy(inputStream, output);
exchange.getMessage().setBody(output.toByteArray());
- } else if (body instanceof Reader) {
- Reader reader = (Reader) body;
+ } else if (body instanceof Reader reader) {
StringBuilder sb = new StringBuilder();
for (int i = reader.read(); i > -1; i = reader.read()) {
sb.append((char) i);
}
reader.close();
exchange.getMessage().setBody(sb.toString());
- } else if (body instanceof StreamSource) {
- StreamSource ss = (StreamSource) body;
+ } else if (body instanceof StreamSource ss) {
if (ss.getInputStream() != null) {
ByteArrayOutputStream output = new ByteArrayOutputStream();
IOHelper.copy(ss.getInputStream(), output);
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingWithEncryptionTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingWithEncryptionTest.java
index 5aa2ecd2da7..d4d3300ee05 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingWithEncryptionTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingWithEncryptionTest.java
@@ -66,9 +66,10 @@ public class MultiCastParallelAndStreamCachingWithEncryptionTest extends Context
public void process(Exchange exchange) throws Exception {
Object body = exchange.getIn().getBody();
- if (body instanceof InputStream) {
+ if (body instanceof InputStream inputStream) {
ByteArrayOutputStream output = new ByteArrayOutputStream();
- IOHelper.copy((InputStream) body, output);
+
+ inputStream.transferTo(output);
exchange.getMessage().setBody(output.toByteArray());
} else {
throw new RuntimeException("Type " + body.getClass().getName() + " not supported");
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MyLoggingSentEventNotifer.java b/core/camel-core/src/test/java/org/apache/camel/processor/MyLoggingSentEventNotifer.java
index acaf990f2c2..898fcc4ce80 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MyLoggingSentEventNotifer.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MyLoggingSentEventNotifer.java
@@ -30,8 +30,7 @@ public class MyLoggingSentEventNotifer extends EventNotifierSupport {
@Override
public void notify(CamelEvent event) {
// react only when its the sent event
- if (event instanceof ExchangeSentEvent) {
- ExchangeSentEvent sent = (ExchangeSentEvent) event;
+ if (event instanceof ExchangeSentEvent sent) {
LOG.info("Took {} millis to send to: {}", sent.getTimeTaken(), sent.getEndpoint());
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/NavigateRouteTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/NavigateRouteTest.java
index c748cb9198b..4fc86bf1aa0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/NavigateRouteTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/NavigateRouteTest.java
@@ -63,13 +63,11 @@ public class NavigateRouteTest extends ContextTestSupport {
for (Processor child : nav.next()) {
processors.add(child);
- if (child instanceof SendProcessor) {
- SendProcessor send = (SendProcessor) child;
+ if (child instanceof SendProcessor send) {
assertEquals("mock://result", send.getDestination().getEndpointUri());
}
- if (child instanceof ConvertBodyProcessor) {
- ConvertBodyProcessor convert = (ConvertBodyProcessor) child;
+ if (child instanceof ConvertBodyProcessor convert) {
assertEquals(String.class, convert.getType());
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java
index d27cec205c8..cbdeaaeb85c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java
@@ -46,8 +46,7 @@ public class SetHeaderUsingDslExpressionsTest extends ContextTestSupport {
@Override
public boolean equals(Object obj) {
boolean result = false;
- if (obj instanceof MyValueClass) {
- MyValueClass value = (MyValueClass) obj;
+ if (obj instanceof MyValueClass value) {
if (this.value1.equals(value.value1) && this.value2.equals(value.value2)) {
result = true;
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
index 45381b44775..11aeed168d5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterWithCustomThreadPoolExecutorTest.java
@@ -68,8 +68,8 @@ public class SplitterWithCustomThreadPoolExecutorTest extends ContextTestSupport
SplitDefinition result = null;
for (ProcessorDefinition<?> processorType : outputs) {
- if (processorType instanceof SplitDefinition) {
- result = (SplitDefinition) processorType;
+ if (processorType instanceof SplitDefinition splitDefinition) {
+ result = splitDefinition;
} else {
result = firstSplitterType(processorType.getOutputs());
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEventNotifierTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEventNotifierTest.java
index 3fb5f0a1f31..df73dc69796 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEventNotifierTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEventNotifierTest.java
@@ -69,8 +69,7 @@ public class AsyncEndpointEventNotifierTest extends ContextTestSupport {
public boolean isEnabled(CamelEvent event) {
// we only want the async endpoint
- if (event instanceof ExchangeSentEvent) {
- ExchangeSentEvent sent = (ExchangeSentEvent) event;
+ if (event instanceof ExchangeSentEvent sent) {
return sent.getEndpoint().getEndpointUri().startsWith("async");
}
return false;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/converter/custom/MyBean.java b/core/camel-core/src/test/java/org/apache/camel/processor/converter/custom/MyBean.java
index 52b39ab3fed..1f0849c0250 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/converter/custom/MyBean.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/converter/custom/MyBean.java
@@ -32,8 +32,7 @@ public class MyBean {
@Override
public boolean equals(Object o) {
- if (o instanceof MyBean) {
- MyBean that = (MyBean) o;
+ if (o instanceof MyBean that) {
return ObjectHelper.equal(this.a, that.a) && ObjectHelper.equal(this.b, that.b);
}
return false;
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugTest.java
index b24ad53e646..208127a5997 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/DebugTest.java
@@ -70,8 +70,7 @@ public class DebugTest extends ContextTestSupport {
mockCondition = new ConditionSupport() {
public boolean matchProcess(Exchange exchange, Processor processor, NamedNode definition, boolean before) {
// match when sending to mocks
- if (definition instanceof ToDefinition) {
- ToDefinition to = (ToDefinition) definition;
+ if (definition instanceof ToDefinition to) {
return to.getUri().startsWith("mock");
}
return false;
diff --git a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportConfigurerTest.java b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportConfigurerTest.java
index b972fb11470..bd1bdce6057 100644
--- a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportConfigurerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportConfigurerTest.java
@@ -385,8 +385,7 @@ public class PropertyBindingSupportConfigurerTest extends ContextTestSupport {
if (ignoreCase) {
name = name.toLowerCase(Locale.ENGLISH);
}
- if (target instanceof Bar) {
- Bar bar = (Bar) target;
+ if (target instanceof Bar bar) {
if ("age".equals(name)) {
bar.withAge(Integer.parseInt(value.toString()));
counter++;
@@ -441,8 +440,7 @@ public class PropertyBindingSupportConfigurerTest extends ContextTestSupport {
if (ignoreCase) {
name = name.toLowerCase(Locale.ENGLISH);
}
- if (target instanceof Bar) {
- Bar bar = (Bar) target;
+ if (target instanceof Bar bar) {
if ("age".equals(name)) {
counter++;
return bar.getAge();