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 3880af883dc0071fa9f7f3097b458640a79b3449
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Wed Apr 10 11:21:40 2024 +0200
(chores) camel-core: use isEmpty when possible
---
.../src/test/java/org/apache/camel/TestSupportJmxCleanup.java | 2 +-
.../camel/component/seda/SedaConsumerSuspendResumeTest.java | 4 ++--
.../org/apache/camel/converter/stream/CachedOutputStreamTest.java | 2 +-
.../java/org/apache/camel/impl/RouteSedaSuspendResumeTest.java | 2 +-
.../java/org/apache/camel/impl/TwoRouteSuspendResumeTest.java | 2 +-
.../src/test/java/org/apache/camel/processor/MDCAsyncTest.java | 8 ++++----
.../test/java/org/apache/camel/processor/MDCCustomKeysTest.java | 8 ++++----
.../apache/camel/processor/MDCSplitParallelProcessingTest.java | 8 ++++----
.../src/test/java/org/apache/camel/processor/MDCSplitTest.java | 8 ++++----
.../src/test/java/org/apache/camel/processor/WireTapMDCTest.java | 8 ++++----
.../src/test/java/org/apache/camel/util/ObjectHelperTest.java | 4 ++--
.../org/apache/camel/management/ManagedStartupFailedTest.java | 2 +-
.../src/main/java/org/apache/camel/support/jndi/JndiContext.java | 2 +-
.../src/test/java/org/apache/camel/xml/out/ModelWriterTest.java | 2 +-
14 files changed, 31 insertions(+), 31 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/TestSupportJmxCleanup.java
b/core/camel-core/src/test/java/org/apache/camel/TestSupportJmxCleanup.java
index 426da86609f..1275bc6af85 100644
--- a/core/camel-core/src/test/java/org/apache/camel/TestSupportJmxCleanup.java
+++ b/core/camel-core/src/test/java/org/apache/camel/TestSupportJmxCleanup.java
@@ -49,7 +49,7 @@ public final class TestSupportJmxCleanup {
MBeanServer mbsc = ManagementFactory.getPlatformMBeanServer();
String d = getDomainName(domain);
Set<ObjectName> s = mbsc.queryNames(new ObjectName(d + ":*"), null);
- if (s.size() > 0) {
+ if (!s.isEmpty()) {
LOG.warn(" + {} ObjectNames registered in domain \"{}\"",
s.size(), d);
for (ObjectName on : s) {
LOG.warn(" | {}", on);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerSuspendResumeTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerSuspendResumeTest.java
index c606d398e10..a20ef70c1b9 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerSuspendResumeTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerSuspendResumeTest.java
@@ -60,8 +60,8 @@ public class SedaConsumerSuspendResumeTest extends
ContextTestSupport {
// it would poll and route (there is a little slack (up till 1 sec)
// before suspension is empowered)
await().atMost(1, TimeUnit.SECONDS)
- .until(() -> context.getEndpoint("seda:foo",
SedaEndpoint.class).getQueue().size() == 0
- && context.getEndpoint("seda:bar",
SedaEndpoint.class).getQueue().size() == 0);
+ .until(() -> context.getEndpoint("seda:foo",
SedaEndpoint.class).getQueue().isEmpty()
+ && context.getEndpoint("seda:bar",
SedaEndpoint.class).getQueue().isEmpty());
// even though we wait for the queues to empty, there is a race
condition where the consumer
// may still process messages while it's being suspended due to
asynchronous message handling.
diff --git
a/core/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
b/core/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
index 6ce529dafaa..aa780adaa6d 100644
---
a/core/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/converter/stream/CachedOutputStreamTest.java
@@ -163,7 +163,7 @@ public class CachedOutputStreamTest extends
ContextTestSupport {
java.io.FileInputStream tmpin = new java.io.FileInputStream(new
File(file, files[0]));
String temp = toString(tmpin);
- assertTrue(temp.length() > 0 && !temp.contains("aaa"), "The content is
not encrypted");
+ assertTrue(!temp.isEmpty() && !temp.contains("aaa"), "The content is
not encrypted");
tmpin.close();
StreamCache cache = cos.newStreamCache();
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 1eef470bdce..5c4c70b4166 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
@@ -56,7 +56,7 @@ public class RouteSedaSuspendResumeTest extends
ContextTestSupport {
Thread.sleep(1000L);
// need to give seda consumer thread time to idle
await().atMost(1, TimeUnit.SECONDS)
- .until(() -> context.getEndpoint("seda:foo",
SedaEndpoint.class).getQueue().size() == 0);
+ .until(() -> context.getEndpoint("seda:foo",
SedaEndpoint.class).getQueue().isEmpty());
template.sendBody("seda:foo", "B");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/TwoRouteSuspendResumeTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/TwoRouteSuspendResumeTest.java
index 2fabdc27cc6..8c7da6cff7f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/TwoRouteSuspendResumeTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/TwoRouteSuspendResumeTest.java
@@ -51,7 +51,7 @@ public class TwoRouteSuspendResumeTest extends
ContextTestSupport {
// need to give seda consumer thread time to idle
await().atMost(1, TimeUnit.SECONDS).until(() -> {
- return context.getEndpoint("seda:foo",
SedaEndpoint.class).getQueue().size() == 0;
+ return context.getEndpoint("seda:foo",
SedaEndpoint.class).getQueue().isEmpty();
});
// even though we wait for the queues to empty, there is a race
condition where the consumer
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/MDCAsyncTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/MDCAsyncTest.java
index 47b3e7c9214..44c8fb4a91c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MDCAsyncTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MDCAsyncTest.java
@@ -147,28 +147,28 @@ public class MDCAsyncTest extends ContextTestSupport {
assertEquals(exchangeId, MDC.get("camel.exchangeId"));
} else {
exchangeId = MDC.get("camel.exchangeId");
- assertTrue(exchangeId != null && exchangeId.length() > 0);
+ assertTrue(exchangeId != null && !exchangeId.isEmpty());
}
if (messageId != null) {
assertEquals(messageId, MDC.get("camel.messageId"));
} else {
messageId = MDC.get("camel.messageId");
- assertTrue(messageId != null && messageId.length() > 0);
+ assertTrue(messageId != null && !messageId.isEmpty());
}
if (breadcrumbId != null) {
assertEquals(breadcrumbId, MDC.get("camel.breadcrumbId"));
} else {
breadcrumbId = MDC.get("camel.breadcrumbId");
- assertTrue(breadcrumbId != null && breadcrumbId.length() > 0);
+ assertTrue(breadcrumbId != null && !breadcrumbId.isEmpty());
}
if (contextId != null) {
assertEquals(contextId, MDC.get("camel.contextId"));
} else {
contextId = MDC.get("camel.contextId");
- assertTrue(contextId != null && contextId.length() > 0);
+ assertTrue(contextId != null && !contextId.isEmpty());
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/MDCCustomKeysTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/MDCCustomKeysTest.java
index 8ca7df20ef3..20c0b58f60d 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/MDCCustomKeysTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/MDCCustomKeysTest.java
@@ -146,28 +146,28 @@ public class MDCCustomKeysTest extends ContextTestSupport
{
assertNotEquals(exchangeId, MDC.get("camel.exchangeId"));
} else {
exchangeId = MDC.get("camel.exchangeId");
- assertTrue(exchangeId != null && exchangeId.length() > 0);
+ assertTrue(exchangeId != null && !exchangeId.isEmpty());
}
if (messageId != null) {
assertNotEquals(messageId, MDC.get("camel.messageId"));
} else {
messageId = MDC.get("camel.messageId");
- assertTrue(messageId != null && messageId.length() > 0);
+ assertTrue(messageId != null && !messageId.isEmpty());
}
if (breadcrumbId != null) {
assertEquals(breadcrumbId, MDC.get("camel.breadcrumbId"));
} else {
breadcrumbId = MDC.get("camel.breadcrumbId");
- assertTrue(breadcrumbId != null && breadcrumbId.length() > 0);
+ assertTrue(breadcrumbId != null && !breadcrumbId.isEmpty());
}
if (contextId != null) {
assertEquals(contextId, MDC.get("camel.contextId"));
} else {
contextId = MDC.get("camel.contextId");
- assertTrue(contextId != null && contextId.length() > 0);
+ assertTrue(contextId != null && !contextId.isEmpty());
}
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/MDCSplitParallelProcessingTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/MDCSplitParallelProcessingTest.java
index f1675bbbc14..6a7fbd63cd7 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/MDCSplitParallelProcessingTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/MDCSplitParallelProcessingTest.java
@@ -113,28 +113,28 @@ public class MDCSplitParallelProcessingTest extends
ContextTestSupport {
assertNotEquals(exchangeId, MDC.get("camel.exchangeId"));
} else {
exchangeId = MDC.get("camel.exchangeId");
- assertTrue(exchangeId != null && exchangeId.length() > 0);
+ assertTrue(exchangeId != null && !exchangeId.isEmpty());
}
if (messageId != null) {
assertNotEquals(messageId, MDC.get("camel.messageId"));
} else {
messageId = MDC.get("camel.messageId");
- assertTrue(messageId != null && messageId.length() > 0);
+ assertTrue(messageId != null && !messageId.isEmpty());
}
if (breadcrumbId != null) {
assertEquals(breadcrumbId, MDC.get("camel.breadcrumbId"));
} else {
breadcrumbId = MDC.get("camel.breadcrumbId");
- assertTrue(breadcrumbId != null && breadcrumbId.length() > 0);
+ assertTrue(breadcrumbId != null && !breadcrumbId.isEmpty());
}
if (contextId != null) {
assertEquals(contextId, MDC.get("camel.contextId"));
} else {
contextId = MDC.get("camel.contextId");
- assertTrue(contextId != null && contextId.length() > 0);
+ assertTrue(contextId != null && !contextId.isEmpty());
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/MDCSplitTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/MDCSplitTest.java
index a78d59dd2b4..70996cb377e 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/MDCSplitTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/MDCSplitTest.java
@@ -112,28 +112,28 @@ public class MDCSplitTest extends ContextTestSupport {
assertNotEquals(exchangeId, MDC.get("camel.exchangeId"));
} else {
exchangeId = MDC.get("camel.exchangeId");
- assertTrue(exchangeId != null && exchangeId.length() > 0);
+ assertTrue(exchangeId != null && !exchangeId.isEmpty());
}
if (messageId != null) {
assertNotEquals(messageId, MDC.get("camel.messageId"));
} else {
messageId = MDC.get("camel.messageId");
- assertTrue(messageId != null && messageId.length() > 0);
+ assertTrue(messageId != null && !messageId.isEmpty());
}
if (breadcrumbId != null) {
assertEquals(breadcrumbId, MDC.get("camel.breadcrumbId"));
} else {
breadcrumbId = MDC.get("camel.breadcrumbId");
- assertTrue(breadcrumbId != null && breadcrumbId.length() > 0);
+ assertTrue(breadcrumbId != null && !breadcrumbId.isEmpty());
}
if (contextId != null) {
assertEquals(contextId, MDC.get("camel.contextId"));
} else {
contextId = MDC.get("camel.contextId");
- assertTrue(contextId != null && contextId.length() > 0);
+ assertTrue(contextId != null && !contextId.isEmpty());
}
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/WireTapMDCTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/WireTapMDCTest.java
index ccc020cee44..a1a2dff54ad 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/WireTapMDCTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/WireTapMDCTest.java
@@ -127,28 +127,28 @@ public class WireTapMDCTest extends ContextTestSupport {
assertEquals(exchangeId, MDC.get("camel.exchangeId"));
} else {
exchangeId = MDC.get("camel.exchangeId");
- assertTrue(exchangeId != null && exchangeId.length() > 0);
+ assertTrue(exchangeId != null && !exchangeId.isEmpty());
}
if (messageId != null) {
assertEquals(messageId, MDC.get("camel.messageId"));
} else {
messageId = MDC.get("camel.messageId");
- assertTrue(messageId != null && messageId.length() > 0);
+ assertTrue(messageId != null && !messageId.isEmpty());
}
if (breadcrumbId != null) {
assertEquals(breadcrumbId, MDC.get("camel.breadcrumbId"));
} else {
breadcrumbId = MDC.get("camel.breadcrumbId");
- assertTrue(breadcrumbId != null && breadcrumbId.length() > 0);
+ assertTrue(breadcrumbId != null && !breadcrumbId.isEmpty());
}
if (contextId != null) {
assertEquals(contextId, MDC.get("camel.contextId"));
} else {
contextId = MDC.get("camel.contextId");
- assertTrue(contextId != null && contextId.length() > 0);
+ assertTrue(contextId != null && !contextId.isEmpty());
}
}
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
b/core/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
index b0fd15074a1..ce3cf724fc5 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
@@ -1060,12 +1060,12 @@ public class ObjectHelperTest {
void testAsList() {
List<Object> out0 = org.apache.camel.util.ObjectHelper.asList(null);
assertNotNull(out0);
- boolean b2 = out0.size() == 0;
+ boolean b2 = out0.isEmpty();
assertTrue(b2);
List<Object> out1 = org.apache.camel.util.ObjectHelper.asList(new
Object[0]);
assertNotNull(out1);
- boolean b1 = out1.size() == 0;
+ boolean b1 = out1.isEmpty();
assertTrue(b1);
String[] args = new String[] { "foo", "bar" };
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedStartupFailedTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedStartupFailedTest.java
index c90c26ad9d3..5fa07041ffb 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedStartupFailedTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedStartupFailedTest.java
@@ -55,7 +55,7 @@ public class ManagedStartupFailedTest extends
ManagementTestSupport {
MBeanServer server = getMBeanServer();
try {
Set<ObjectName> onames = server.queryNames(new
ObjectName("org.apache.camel:*"), null);
- assertTrue(onames.size() > 0);
+ assertTrue(!onames.isEmpty());
ProducerTemplate producer = context.createProducerTemplate();
String result = producer.requestBody("direct:start", "Kermit",
String.class);
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
index 9811292e05d..33ab252c2e8 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
@@ -194,7 +194,7 @@ public class JndiContext implements Context, Serializable {
// and look for it in the bindings map.
CompositeName path = new CompositeName(name);
- if (path.size() == 0) {
+ if (path.isEmpty()) {
return this;
} else {
String first = path.get(0);
diff --git
a/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java
b/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java
index 6be1f3e5ffc..66a1b732ad5 100644
---
a/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java
+++
b/core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java
@@ -216,7 +216,7 @@ public class ModelWriterTest {
field.setAccessible(true);
Object fe = field.get(expected);
Object fa = field.get(actual);
- deepEquals(fe, fa, (path.length() > 0 ? path + "." : path)
+ field.getName());
+ deepEquals(fe, fa, (!path.isEmpty() ? path + "." : path) +
field.getName());
}
}
}
