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 62d6d5f5cfb4d4eeb187b597fd7d9a2392dfcf4e Author: Otavio Rodolfo Piske <angusyo...@gmail.com> AuthorDate: Tue Apr 23 12:07:24 2024 +0200 (chores) camel-core: code cleanup Remove redundant casts --- .../org/apache/camel/reifier/language/TokenizerExpressionReifier.java | 2 +- .../apache/camel/reifier/language/XMLTokenizerExpressionReifier.java | 2 +- .../org/apache/camel/reifier/language/XPathExpressionReifier.java | 2 +- .../org/apache/camel/reifier/language/XQueryExpressionReifier.java | 2 +- .../component/bean/BeanNoTypeConvertionPossibleWhenHeaderTest.java | 2 +- .../test/java/org/apache/camel/converter/ObjectConverterNaNTest.java | 4 ++-- .../src/test/java/org/apache/camel/processor/SplitterTest.java | 4 ++-- .../test/java/org/apache/camel/processor/WireTapOnExceptionTest.java | 3 +-- .../src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java | 2 +- .../src/main/java/org/apache/camel/support/ObjectHelper.java | 4 ++-- 10 files changed, 13 insertions(+), 14 deletions(-) diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java index e8171f4220c..e25056e1bc2 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java @@ -23,7 +23,7 @@ import org.apache.camel.model.language.TokenizerExpression; public class TokenizerExpressionReifier extends SingleInputTypedExpressionReifier<TokenizerExpression> { public TokenizerExpressionReifier(CamelContext camelContext, ExpressionDefinition definition) { - super(camelContext, (TokenizerExpression) definition); + super(camelContext, definition); } protected Object[] createProperties() { diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XMLTokenizerExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XMLTokenizerExpressionReifier.java index 8c33ac43907..8de85bfb6ff 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XMLTokenizerExpressionReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XMLTokenizerExpressionReifier.java @@ -26,7 +26,7 @@ import org.apache.camel.spi.NamespaceAware; public class XMLTokenizerExpressionReifier extends SingleInputTypedExpressionReifier<XMLTokenizerExpression> { public XMLTokenizerExpressionReifier(CamelContext camelContext, ExpressionDefinition definition) { - super(camelContext, (XMLTokenizerExpression) definition); + super(camelContext, definition); } @Override diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XPathExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XPathExpressionReifier.java index f3e56a15077..6507fdca67e 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XPathExpressionReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XPathExpressionReifier.java @@ -31,7 +31,7 @@ import org.apache.camel.spi.NamespaceAware; public class XPathExpressionReifier extends SingleInputTypedExpressionReifier<XPathExpression> { public XPathExpressionReifier(CamelContext camelContext, ExpressionDefinition definition) { - super(camelContext, (XPathExpression) definition); + super(camelContext, definition); } @Override diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XQueryExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XQueryExpressionReifier.java index cc13d1248ed..5f9554f526f 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XQueryExpressionReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/XQueryExpressionReifier.java @@ -27,7 +27,7 @@ import org.apache.camel.spi.NamespaceAware; public class XQueryExpressionReifier extends SingleInputTypedExpressionReifier<XQueryExpression> { public XQueryExpressionReifier(CamelContext camelContext, ExpressionDefinition definition) { - super(camelContext, (XQueryExpression) definition); + super(camelContext, definition); } @Override diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleWhenHeaderTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleWhenHeaderTest.java index 33fc0b99578..4908f98d4dc 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleWhenHeaderTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNoTypeConvertionPossibleWhenHeaderTest.java @@ -75,7 +75,7 @@ public class BeanNoTypeConvertionPossibleWhenHeaderTest extends ContextTestSuppo mock.expectedBodiesReceived("Hello World"); mock.message(0).header("foo").isNull(); - template.requestBodyAndHeader("direct:start", "Hello World", "foo", (Object) null); + template.requestBodyAndHeader("direct:start", "Hello World", "foo", null); assertMockEndpointsSatisfied(); } diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterNaNTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterNaNTest.java index 25202257878..5b8dd6123ff 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterNaNTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterNaNTest.java @@ -88,14 +88,14 @@ public class ObjectConverterNaNTest extends ContextTestSupport { @Test public void testDoubleToFloatWithNaN() { assertEquals(Float.valueOf("4"), context.getTypeConverter().convertTo(Float.class, Double.valueOf("4"))); - assertEquals((Object) (Float) Float.NaN, context.getTypeConverter().convertTo(Float.class, Double.NaN)); + assertEquals((Object) Float.NaN, context.getTypeConverter().convertTo(Float.class, Double.NaN)); assertEquals(Float.valueOf("3"), context.getTypeConverter().convertTo(Float.class, Double.valueOf("3"))); } @Test public void testFloatToDoubleWithNaN() { assertEquals(Double.valueOf("4"), context.getTypeConverter().convertTo(Double.class, Float.valueOf("4"))); - assertEquals((Object) (Double) Double.NaN, context.getTypeConverter().convertTo(Double.class, Float.NaN)); + assertEquals((Object) Double.NaN, context.getTypeConverter().convertTo(Double.class, Float.NaN)); assertEquals(Double.valueOf("3"), context.getTypeConverter().convertTo(Double.class, Float.valueOf("3"))); } } diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java index d91830331cf..9963b3c87df 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java @@ -155,7 +155,7 @@ public class SplitterTest extends ContextTestSupport { Message out = result.getMessage(); assertMessageHeader(out, "foo", "bar"); - assertEquals((Object) (Integer) 5, result.getProperty("aggregated", Integer.class)); + assertEquals((Object) 5, result.getProperty("aggregated", Integer.class)); } @Test @@ -176,7 +176,7 @@ public class SplitterTest extends ContextTestSupport { Message out = result.getMessage(); assertMessageHeader(out, "foo", "bar"); - assertEquals((Object) (Integer) 5, result.getProperty("aggregated", Integer.class)); + assertEquals((Object) 5, result.getProperty("aggregated", Integer.class)); } @Test diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/WireTapOnExceptionTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/WireTapOnExceptionTest.java index f308719715b..7a868c40682 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/WireTapOnExceptionTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/WireTapOnExceptionTest.java @@ -17,7 +17,6 @@ package org.apache.camel.processor; import org.apache.camel.CamelContext; -import org.apache.camel.Component; import org.apache.camel.Consumer; import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; @@ -60,7 +59,7 @@ public class WireTapOnExceptionTest extends ContextTestSupport { public static final class MyProducerFailEndpoint extends DefaultEndpoint { private MyProducerFailEndpoint(String endpointUri, CamelContext camelContext) { - super(endpointUri, (Component) null); + super(endpointUri, null); setCamelContext(camelContext); } diff --git a/core/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java b/core/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java index 2e73b7b7c86..e3616372254 100644 --- a/core/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/support/DefaultTimeoutMapTest.java @@ -103,7 +103,7 @@ public class DefaultTimeoutMapTest { Object old = map.remove("A"); assertEquals(123, old); - assertNull((Object) map.get("A")); + assertNull(map.get("A")); assertEquals(0, map.size()); map.stop(); diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java index 60fe181a8e3..d8e9826c1b8 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/ObjectHelper.java @@ -893,11 +893,11 @@ public final class ObjectHelper { // -> bean=foo?method=killer(a,b) // -> bean=bar?method=great(a,b) // http://stackoverflow.com/questions/1516090/splitting-a-title-into-separate-parts - return (Iterable<String>) () -> new Scanner(s, PARENTHESIS_PATTERN); + return () -> new Scanner(s, PARENTHESIS_PATTERN); } else { // optimized split string on default delimiter int count = StringHelper.countChar(s, DEFAULT_DELIMITER_CHAR) + 1; - return (Iterable<String>) () -> StringHelper.splitOnCharacterAsIterator(s, DEFAULT_DELIMITER_CHAR, + return () -> StringHelper.splitOnCharacterAsIterator(s, DEFAULT_DELIMITER_CHAR, count); } }