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 173d73e163465d51386ca7c379d920cc05c92d69
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Tue Apr 23 12:03:12 2024 +0200
(chores) camel-core: code cleanup
Simplify overly complex string operations
---
.../camel/component/file/FileProducerMoveExistingStrategyTest.java | 2 +-
.../src/test/java/org/apache/camel/converter/ObjectConverterTest.java | 4 ++--
.../test/java/org/apache/camel/converter/jaxp/StAX2SAXSourceTest.java | 2 +-
.../test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java | 4 ++--
.../java/org/apache/camel/util/SkipLastNewlineInputStreamTest.java | 4 ++--
.../src/test/java/org/apache/camel/xml/in/ParserTest.java | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerMoveExistingStrategyTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerMoveExistingStrategyTest.java
index 6fc97636c27..83db991c616 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerMoveExistingStrategyTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/file/FileProducerMoveExistingStrategyTest.java
@@ -86,7 +86,7 @@ public class FileProducerMoveExistingStrategyTest extends
ContextTestSupport {
String to = endpoint.getMoveExisting().evaluate(dummy,
String.class);
counter++;
String fileNameWithoutExtension = to.substring(0,
to.lastIndexOf('.')) + counter;
- to = fileNameWithoutExtension + to.substring(to.lastIndexOf('.'),
to.length());
+ to = fileNameWithoutExtension + to.substring(to.lastIndexOf('.'));
// we must normalize it (to avoid having both \ and / in the name
// which confuses java.io.File)
to = FileUtil.normalizePath(to);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
b/core/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
index c96686db8ba..7d76d07a217 100644
---
a/core/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/converter/ObjectConverterTest.java
@@ -152,8 +152,8 @@ public class ObjectConverterTest {
public void testToString() {
assertEquals("ABC", ObjectConverter.toString(new StringBuffer("ABC")));
assertEquals("ABC", ObjectConverter.toString(new
StringBuilder("ABC")));
- assertEquals("", ObjectConverter.toString(new StringBuffer("")));
- assertEquals("", ObjectConverter.toString(new StringBuilder("")));
+ assertEquals("", ObjectConverter.toString(new StringBuffer()));
+ assertEquals("", ObjectConverter.toString(new StringBuilder()));
}
@Test
diff --git
a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/StAX2SAXSourceTest.java
b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/StAX2SAXSourceTest.java
index c9168ea506a..04ccb702e64 100644
---
a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/StAX2SAXSourceTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/StAX2SAXSourceTest.java
@@ -62,7 +62,7 @@ public class StAX2SAXSourceTest extends ContextTestSupport {
transformer.transform(staxSource, new StreamResult(baos));
writer.flush();
baos.flush();
- MatcherAssert.assertThat(new String(baos.toByteArray()),
equalTo(TEST_XML));
+ MatcherAssert.assertThat(baos.toString(), equalTo(TEST_XML));
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
index 573b76c4bed..852bcbfd2da 100644
---
a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/StaxConverterTest.java
@@ -110,7 +110,7 @@ public class StaxConverterTest extends ContextTestSupport {
}
assertNotNull(output);
- String result = new String(output.toByteArray(), UTF_8);
+ String result = output.toString(UTF_8);
// normalize the auotation mark
if (result.indexOf('\'') > 0) {
result = result.replace('\'', '"');
@@ -169,7 +169,7 @@ public class StaxConverterTest extends ContextTestSupport {
}
assertNotNull(output);
- String result = new String(output.toByteArray(), UTF_8);
+ String result = output.toString(UTF_8);
assertEquals(TEST_XML, result);
}
diff --git
a/core/camel-util/src/test/java/org/apache/camel/util/SkipLastNewlineInputStreamTest.java
b/core/camel-util/src/test/java/org/apache/camel/util/SkipLastNewlineInputStreamTest.java
index 94e3f1a306b..9cda6a2e09f 100644
---
a/core/camel-util/src/test/java/org/apache/camel/util/SkipLastNewlineInputStreamTest.java
+++
b/core/camel-util/src/test/java/org/apache/camel/util/SkipLastNewlineInputStreamTest.java
@@ -53,7 +53,7 @@ public class SkipLastNewlineInputStreamTest {
while ((c = in.read()) >= 0) {
out.write(c);
}
- Assertions.assertEquals(expected, new String(out.toByteArray(),
StandardCharsets.UTF_8));
+ Assertions.assertEquals(expected,
out.toString(StandardCharsets.UTF_8));
}
try (InputStream in
@@ -64,7 +64,7 @@ public class SkipLastNewlineInputStreamTest {
while ((len = in.read(buf)) >= 0) {
out.write(buf, 0, len);
}
- Assertions.assertEquals(expected, new String(out.toByteArray(),
StandardCharsets.UTF_8));
+ Assertions.assertEquals(expected,
out.toString(StandardCharsets.UTF_8));
}
}
diff --git
a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ParserTest.java
b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ParserTest.java
index a04990748af..00ded5053c1 100644
--- a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ParserTest.java
+++ b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ParserTest.java
@@ -76,7 +76,7 @@ public class ParserTest {
assertEquals("value-1", xpp.getAttributeValue(null,
"a"));
assertEquals("value-2", xpp.getAttributeValue("uri:b",
"a"));
// check with non-interned String
- assertEquals("value-2", xpp.getAttributeValue(new
String("uri:b"), "a"));
+ assertEquals("value-2", xpp.getAttributeValue("uri:b",
"a"));
}
}
case MXParser.END_TAG -> {
