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 a35e82992d6b751d20e2adc717eceacc702b18dc Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Mon Aug 26 12:11:50 2024 +0200 (chores) camel-mock simplify type checks - to use pattern matching for instanceof - use simpler assertion checks --- .../camel/component/mock/AssertionClause.java | 4 +-- .../apache/camel/component/mock/MockEndpoint.java | 31 +++++++++------------- .../mock/MockExpressionClauseSupport.java | 4 +-- .../camel/component/mock/MockValueBuilder.java | 4 +-- 4 files changed, 19 insertions(+), 24 deletions(-) diff --git a/components/camel-mock/src/main/java/org/apache/camel/component/mock/AssertionClause.java b/components/camel-mock/src/main/java/org/apache/camel/component/mock/AssertionClause.java index 21b8fc2aa62..5d538a2e4c9 100644 --- a/components/camel-mock/src/main/java/org/apache/camel/component/mock/AssertionClause.java +++ b/components/camel-mock/src/main/java/org/apache/camel/component/mock/AssertionClause.java @@ -106,8 +106,8 @@ public abstract class AssertionClause extends MockExpressionClauseSupport<MockVa Object value = exchange.getMessage().getBody(); // if the value is StreamCache then ensure It's readable before evaluating any predicates // by resetting it (this is also what StreamCachingAdvice does) - if (value instanceof StreamCache) { - ((StreamCache) value).reset(); + if (value instanceof StreamCache streamCache) { + streamCache.reset(); } } diff --git a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java index c8f638fb6ee..afb6d1db327 100644 --- a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java +++ b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java @@ -210,11 +210,10 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint, Collection<Endpoint> endpoints = context.getEndpoints(); for (Endpoint endpoint : endpoints) { // if the endpoint was intercepted, we should get the delegate - if (endpoint instanceof InterceptSendToEndpoint) { - endpoint = ((InterceptSendToEndpoint) endpoint).getOriginalEndpoint(); + if (endpoint instanceof InterceptSendToEndpoint interceptSendToEndpoint) { + endpoint = interceptSendToEndpoint.getOriginalEndpoint(); } - if (endpoint instanceof MockEndpoint) { - MockEndpoint mockEndpoint = (MockEndpoint) endpoint; + if (endpoint instanceof MockEndpoint mockEndpoint) { mockEndpoint.assertIsSatisfied(); } } @@ -234,11 +233,10 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint, long millis = unit.toMillis(timeout); for (Endpoint endpoint : endpoints) { // if the endpoint was intercepted, we should get the delegate - if (endpoint instanceof InterceptSendToEndpoint) { - endpoint = ((InterceptSendToEndpoint) endpoint).getOriginalEndpoint(); + if (endpoint instanceof InterceptSendToEndpoint interceptSendToEndpoint) { + endpoint = interceptSendToEndpoint.getOriginalEndpoint(); } - if (endpoint instanceof MockEndpoint) { - MockEndpoint mockEndpoint = (MockEndpoint) endpoint; + if (endpoint instanceof MockEndpoint mockEndpoint) { mockEndpoint.setResultWaitTime(millis); mockEndpoint.assertIsSatisfied(); } @@ -257,11 +255,10 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint, Collection<Endpoint> endpoints = context.getEndpoints(); for (Endpoint endpoint : endpoints) { // if the endpoint was intercepted, we should get the delegate - if (endpoint instanceof InterceptSendToEndpoint) { - endpoint = ((InterceptSendToEndpoint) endpoint).getOriginalEndpoint(); + if (endpoint instanceof InterceptSendToEndpoint interceptSendToEndpoint) { + endpoint = interceptSendToEndpoint.getOriginalEndpoint(); } - if (endpoint instanceof MockEndpoint) { - MockEndpoint mockEndpoint = (MockEndpoint) endpoint; + if (endpoint instanceof MockEndpoint mockEndpoint) { mockEndpoint.setAssertPeriod(period); } } @@ -277,11 +274,10 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint, Collection<Endpoint> endpoints = context.getEndpoints(); for (Endpoint endpoint : endpoints) { // if the endpoint was intercepted, we should get the delegate - if (endpoint instanceof InterceptSendToEndpoint) { - endpoint = ((InterceptSendToEndpoint) endpoint).getOriginalEndpoint(); + if (endpoint instanceof InterceptSendToEndpoint interceptSendToEndpoint) { + endpoint = interceptSendToEndpoint.getOriginalEndpoint(); } - if (endpoint instanceof MockEndpoint) { - MockEndpoint mockEndpoint = (MockEndpoint) endpoint; + if (endpoint instanceof MockEndpoint mockEndpoint) { mockEndpoint.reset(); } } @@ -1967,8 +1963,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint, LOG.debug("{} failed and received[{}]: {}", getEndpointUri(), ++index, exchange); } } - if (message instanceof Throwable) { - Throwable cause = (Throwable) message; + if (message instanceof Throwable cause) { String msg = "Caught exception on " + getEndpointUri() + " due to: " + cause.getMessage(); throw new AssertionError(msg, cause); } else { diff --git a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClauseSupport.java b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClauseSupport.java index c53e5fe23aa..c99ddc57692 100644 --- a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClauseSupport.java +++ b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockExpressionClauseSupport.java @@ -46,8 +46,8 @@ public class MockExpressionClauseSupport<T> { */ public T expression(Expression expression) { setExpressionValue(expression); - if (expression instanceof ExpressionFactory) { - setExpressionType((ExpressionFactory) expression); + if (expression instanceof ExpressionFactory expressionFactory) { + setExpressionType(expressionFactory); } return result; } diff --git a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockValueBuilder.java b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockValueBuilder.java index a10eaf92375..c6dce5841d2 100644 --- a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockValueBuilder.java +++ b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockValueBuilder.java @@ -337,8 +337,8 @@ public class MockValueBuilder implements Expression, Predicate { } protected Expression asExpression(Object value) { - if (value instanceof Expression) { - return (Expression) value; + if (value instanceof Expression expression1) { + return expression1; } else { return ExpressionBuilder.constantExpression(value); }
