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 a54469261b3 (chores) camel-core: tests cleanups
a54469261b3 is described below
commit a54469261b33f498bf5c1ff7efa4442802231db8
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Tue Jan 31 09:57:49 2023 +0100
(chores) camel-core: tests cleanups
- remove unnecessary override
- simplify list creation
- use try-with-resources
---
.../BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java | 6 ------
.../cluster/FileLockClusteredRoutePolicyFactoryTest.java | 3 +--
.../file/cluster/FileLockClusteredRoutePolicyTest.java | 3 +--
.../apache/camel/processor/SplitCustomExpressionTest.java | 5 +----
.../apache/camel/processor/SplitRefCustomExpressionTest.java | 5 +----
.../org/apache/camel/processor/async/MyAsyncComponent.java | 2 +-
.../camel/processor/transformer/TransformerRouteTest.java | 12 +++++++-----
7 files changed, 12 insertions(+), 24 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
index 6a579935a8b..da90d0daa40 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanChoseMethodWithMatchingTypeAndSkipSettersTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.bean;
-import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -35,11 +34,6 @@ public class
BeanChoseMethodWithMatchingTypeAndSkipSettersTest extends ContextTe
return jndi;
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- return super.createCamelContext();
- }
-
@Test
public void testSendCSVFile() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:queue:order");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java
index dc3fe1df21b..af11a86d882 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java
@@ -23,7 +23,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
-import java.util.stream.IntStream;
import org.apache.camel.TestSupport;
import org.apache.camel.builder.RouteBuilder;
@@ -38,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public final class FileLockClusteredRoutePolicyFactoryTest {
private static final Logger LOGGER =
LoggerFactory.getLogger(FileLockClusteredRoutePolicyFactoryTest.class);
- private static final List<String> CLIENTS = IntStream.range(0,
3).mapToObj(Integer::toString).toList();
+ private static final List<String> CLIENTS = List.of("0", "1", "2");
private static final List<String> RESULTS = new ArrayList<>();
private static final ScheduledExecutorService SCHEDULER =
Executors.newScheduledThreadPool(CLIENTS.size());
private static final CountDownLatch LATCH = new
CountDownLatch(CLIENTS.size());
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
index 8d4b35b5dcb..ebfd3219575 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyTest.java
@@ -23,7 +23,6 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
-import java.util.stream.IntStream;
import org.apache.camel.TestSupport;
import org.apache.camel.builder.RouteBuilder;
@@ -38,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public final class FileLockClusteredRoutePolicyTest {
private static final Logger LOGGER =
LoggerFactory.getLogger(FileLockClusteredRoutePolicyTest.class);
- private static final List<String> CLIENTS = IntStream.range(0,
3).mapToObj(Integer::toString).toList();
+ private static final List<String> CLIENTS = List.of("0", "1", "2");
private static final List<String> RESULTS = new ArrayList<>();
private static final ScheduledExecutorService SCHEDULER =
Executors.newScheduledThreadPool(CLIENTS.size());
private static final CountDownLatch LATCH = new
CountDownLatch(CLIENTS.size());
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitCustomExpressionTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitCustomExpressionTest.java
index 67829964447..af385af6c77 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitCustomExpressionTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitCustomExpressionTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.processor;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import org.apache.camel.ContextTestSupport;
@@ -59,8 +57,7 @@ public class SplitCustomExpressionTest extends
ContextTestSupport {
// just split the body by comma
String[] parts = body.split(",");
- List<String> list = new ArrayList<>();
- list.addAll(Arrays.asList(parts));
+ List<String> list = List.of(parts);
return (T) list.iterator();
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitRefCustomExpressionTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitRefCustomExpressionTest.java
index 739dc3d5f74..11f4a33271f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/SplitRefCustomExpressionTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/SplitRefCustomExpressionTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.processor;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import org.apache.camel.ContextTestSupport;
@@ -67,8 +65,7 @@ public class SplitRefCustomExpressionTest extends
ContextTestSupport {
// just split the body by comma
String[] parts = body.split(",");
- List<String> list = new ArrayList<>();
- list.addAll(Arrays.asList(parts));
+ List<String> list = List.of(parts);
return (T) list.iterator();
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncComponent.java
b/core/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncComponent.java
index 6e1db1c84ec..375e6baf309 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncComponent.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncComponent.java
@@ -38,7 +38,7 @@ public class MyAsyncComponent extends DefaultComponent {
String[] words = value.split(":");
StringBuilder result = new StringBuilder();
for (String word : words) {
- result.append((result.length() == 0) ? "" : " ");
+ result.append(result.isEmpty() ? "" : " ");
result.append(word.substring(0,
1).toUpperCase(Locale.ENGLISH)).append(word.substring(1));
}
return result.toString();
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/transformer/TransformerRouteTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/transformer/TransformerRouteTest.java
index ee3cafb318c..8a3f850300d 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/transformer/TransformerRouteTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/transformer/TransformerRouteTest.java
@@ -274,13 +274,15 @@ public class TransformerRouteTest extends
ContextTestSupport {
@Override
public Object unmarshal(Exchange exchange, InputStream stream)
throws Exception {
- BufferedReader reader = new BufferedReader(new
InputStreamReader(stream));
- String line = "";
StringBuilder input = new StringBuilder();
- while ((line = reader.readLine()) != null) {
- input.append(line);
+
+ try (BufferedReader reader = new BufferedReader(new
InputStreamReader(stream))) {
+ String line = "";
+ while ((line = reader.readLine()) != null) {
+ input.append(line);
+ }
}
- reader.close();
+
assertEquals("{name:XOrder}", input.toString());
LOG.info("DataFormat: JSON -> XOrder");
return new XOrder();
