You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2024/04/24 11:07:42 UTC
(camel) branch main updated (ecb07cdef37 -> 028b6fb743d)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from ecb07cdef37 Bump io.milvus:milvus-sdk-java from 2.3.4 to 2.4.0
new ddeb150f4f9 (chores) camel-core: code cleanup
new da416981e7a (chores) camel-core: code cleanup
new 6d9fca53d70 (chores) camel-core: code cleanup
new 9cfdb5042c8 (chores) camel-core: code cleanup
new 4e4bca031bb (chores) camel-core: code cleanup
new bc8172bd148 (chores) camel-core: code cleanup
new a5bfcd1de2f (chores) camel-core: code cleanup
new 028b6fb743d (chores) camel-core: code cleanup
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/catalog/EndpointValidationResult.java | 4 +---
.../camel/catalog/PropertiesValidationResult.java | 4 +---
.../camel/support/jsse/SSLContextParameters.java | 3 ++-
.../impl/engine/DefaultSupervisingRouteController.java | 2 +-
.../apache/camel/impl/engine/IntrospectionSupport.java | 2 +-
.../org/apache/camel/impl/console/RouteDevConsole.java | 2 +-
.../camel/processor/errorhandler/RedeliveryPolicy.java | 2 +-
.../FileConsumerPollStrategyStopOnRollbackTest.java | 2 +-
.../apache/camel/issues/SplitterParallelIssueTest.java | 2 +-
.../processor/enricher/EnricherNoResourceTest.java | 2 +-
.../org/apache/camel/util/CaseInsensitiveMapTest.java | 12 ++++++------
.../org/apache/camel/management/mbean/LoadTriplet.java | 2 +-
.../main/java/org/apache/camel/util/URISupport.java | 18 ++++++------------
.../apache/camel/util/backoff/BackOffTimerTest.java | 6 +++---
14 files changed, 27 insertions(+), 36 deletions(-)
(camel) 08/08: (chores) camel-core: code cleanup
Posted by or...@apache.org.
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 028b6fb743d621e53d6455f9f6d7b6184a70a56d
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Apr 23 11:58:14 2024 +0200
(chores) camel-core: code cleanup
Use simpler collections operations
---
.../org/apache/camel/catalog/EndpointValidationResult.java | 4 +---
.../org/apache/camel/catalog/PropertiesValidationResult.java | 4 +---
.../java/org/apache/camel/util/CaseInsensitiveMapTest.java | 12 ++++++------
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java b/core/camel-api/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
index c674f915561..3bfbec6b2ce 100644
--- a/core/camel-api/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
+++ b/core/camel-api/src/main/java/org/apache/camel/catalog/EndpointValidationResult.java
@@ -59,9 +59,7 @@ public class EndpointValidationResult extends PropertiesValidationResult impleme
if (lenient == null) {
lenient = new LinkedHashSet<>();
}
- if (!lenient.contains(name)) {
- lenient.add(name);
- }
+ lenient.add(name);
}
public void addNotConsumerOnly(String name) {
diff --git a/core/camel-api/src/main/java/org/apache/camel/catalog/PropertiesValidationResult.java b/core/camel-api/src/main/java/org/apache/camel/catalog/PropertiesValidationResult.java
index d6303663a01..115a420113a 100644
--- a/core/camel-api/src/main/java/org/apache/camel/catalog/PropertiesValidationResult.java
+++ b/core/camel-api/src/main/java/org/apache/camel/catalog/PropertiesValidationResult.java
@@ -128,9 +128,7 @@ abstract class PropertiesValidationResult implements Serializable {
if (deprecated == null) {
deprecated = new LinkedHashSet<>();
}
- if (!deprecated.contains(name)) {
- deprecated.add(name);
- }
+ deprecated.add(name);
}
private String computeErrors(String value) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java b/core/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java
index 68af18d0531..27cb86dcd9b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java
@@ -311,11 +311,11 @@ public class CaseInsensitiveMapTest {
assertTrue(map.containsKey("foo"));
assertTrue(map.containsKey("FOO"));
- assertTrue(map.keySet().contains("FOO"));
- assertTrue(map.keySet().contains("FoO"));
- assertTrue(map.keySet().contains("Foo"));
- assertTrue(map.keySet().contains("foo"));
- assertTrue(map.keySet().contains("fOO"));
+ assertTrue(map.containsKey("FOO"));
+ assertTrue(map.containsKey("FoO"));
+ assertTrue(map.containsKey("Foo"));
+ assertTrue(map.containsKey("foo"));
+ assertTrue(map.containsKey("fOO"));
map.put("FOO", "cake");
assertEquals(1, map.size());
@@ -335,7 +335,7 @@ public class CaseInsensitiveMapTest {
assertTrue(map.containsKey("foo"));
assertFalse(map.containsKey("FOO"));
- assertFalse(map.keySet().contains("FOO"));
+ assertFalse(map.containsKey("FOO"));
map.put("FOO", "cake");
assertEquals(2, map.size());
(camel) 05/08: (chores) camel-core: code cleanup
Posted by or...@apache.org.
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 4e4bca031bb53c5fcb0ce8d53e73174d2c2261ee
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Apr 23 11:43:55 2024 +0200
(chores) camel-core: code cleanup
Apply proper cast when needed
---
.../org/apache/camel/processor/enricher/EnricherNoResourceTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherNoResourceTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherNoResourceTest.java
index d1a2db45eef..230c448008b 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherNoResourceTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherNoResourceTest.java
@@ -40,7 +40,7 @@ public class EnricherNoResourceTest extends ContextTestSupport {
from("direct:a").enrich("direct:foo").to("mock:result");
// set an empty message
- from("direct:foo").setBody(constant(null));
+ from("direct:foo").setBody(constant((Object) null));
}
};
}
(camel) 03/08: (chores) camel-core: code cleanup
Posted by or...@apache.org.
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 6d9fca53d70a25ebee552e3ad178646932ef9027
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Apr 23 11:39:19 2024 +0200
(chores) camel-core: code cleanup
Apply proper cast when needed
---
.../main/java/org/apache/camel/impl/console/RouteDevConsole.java | 2 +-
.../org/apache/camel/processor/errorhandler/RedeliveryPolicy.java | 2 +-
.../java/org/apache/camel/issues/SplitterParallelIssueTest.java | 2 +-
.../test/java/org/apache/camel/util/backoff/BackOffTimerTest.java | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
index a593926d4b4..087357f1cb9 100644
--- a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
+++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
@@ -461,7 +461,7 @@ public class RouteDevConsole extends AbstractDevConsole {
if (percent) {
double p;
if (total > 0) {
- p = (covered / total) * 100;
+ p = ((double) covered / total) * 100;
} else {
p = 0;
}
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryPolicy.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryPolicy.java
index 87e5ffea40f..e0a3eef6c18 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryPolicy.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryPolicy.java
@@ -236,7 +236,7 @@ public class RedeliveryPolicy implements Cloneable, Serializable {
Random random = getRandomNumberGenerator(); // NOSONAR
double variance = (random.nextBoolean() ? collisionAvoidanceFactor : -collisionAvoidanceFactor)
* random.nextDouble();
- redeliveryDelayResult += redeliveryDelayResult * variance;
+ redeliveryDelayResult += (long) (redeliveryDelayResult * variance);
}
// ensure the calculated result is not bigger than the max delay (if configured)
diff --git a/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelIssueTest.java b/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelIssueTest.java
index 50664e3bad2..ca776ac8569 100644
--- a/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelIssueTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelIssueTest.java
@@ -61,7 +61,7 @@ public class SplitterParallelIssueTest extends ContextTestSupport {
@Override
public void process(Exchange exchange) throws Exception {
int num = exchange.getIn().getBody(int.class);
- final long sleep = num * delay;
+ final long sleep = (long) num * delay;
log.info("Sleep for {} ms", sleep);
Thread.sleep(sleep);
}
diff --git a/core/camel-util/src/test/java/org/apache/camel/util/backoff/BackOffTimerTest.java b/core/camel-util/src/test/java/org/apache/camel/util/backoff/BackOffTimerTest.java
index 15bc536f94b..810a3d6e662 100644
--- a/core/camel-util/src/test/java/org/apache/camel/util/backoff/BackOffTimerTest.java
+++ b/core/camel-util/src/test/java/org/apache/camel/util/backoff/BackOffTimerTest.java
@@ -45,7 +45,7 @@ public class BackOffTimerTest {
context -> {
assertEquals(counter.incrementAndGet(), context.getCurrentAttempts());
assertEquals(100, context.getCurrentDelay());
- assertEquals(100 * counter.get(), context.getCurrentElapsedTime());
+ assertEquals(100L * counter.get(), context.getCurrentElapsedTime());
if (first.get() == 0) {
first.set(context.getFirstAttemptTime());
} else {
@@ -78,7 +78,7 @@ public class BackOffTimerTest {
context -> {
assertEquals(counter.incrementAndGet(), context.getCurrentAttempts());
assertEquals(100, context.getCurrentDelay());
- assertEquals(100 * counter.get(), context.getCurrentElapsedTime());
+ assertEquals(100L * counter.get(), context.getCurrentElapsedTime());
return true;
});
@@ -107,7 +107,7 @@ public class BackOffTimerTest {
context -> {
assertEquals(counter.incrementAndGet(), context.getCurrentAttempts());
assertEquals(100, context.getCurrentDelay());
- assertEquals(100 * counter.get(), context.getCurrentElapsedTime());
+ assertEquals(100L * counter.get(), context.getCurrentElapsedTime());
return true;
});
(camel) 06/08: (chores) camel-core: code cleanup
Posted by or...@apache.org.
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 bc8172bd148711bb73485f7affb0aa1d7bb4fc91
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Apr 23 11:45:12 2024 +0200
(chores) camel-core: code cleanup
Avoid possible confusion with varags methods
---
.../main/java/org/apache/camel/support/jsse/SSLContextParameters.java | 3 ++-
.../main/java/org/apache/camel/impl/engine/IntrospectionSupport.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
index 961225aee79..f4dab7a2d9a 100644
--- a/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
+++ b/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.security.GeneralSecurityException;
import java.security.SecureRandom;
import java.security.Security;
+import java.util.Arrays;
import java.util.List;
import javax.net.ssl.KeyManager;
@@ -263,7 +264,7 @@ public class SSLContextParameters extends BaseSSLContextParameters {
LOG.trace("Creating SSLContext from SSLContextParameters [{}].", this);
if (LOG.isDebugEnabled()) {
- LOG.debug("Available Security providers: {}.", Security.getProviders());
+ LOG.debug("Available Security providers: {}.", Arrays.toString(Security.getProviders()));
}
KeyManager[] keyManagers = this.keyManagers == null ? null : this.keyManagers.createKeyManagers();
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java
index f701565cae5..4aaae2c6cfe 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/IntrospectionSupport.java
@@ -248,7 +248,7 @@ final class IntrospectionSupport {
String name = info.getterOrSetterShorthandName;
try {
// we may want to set options on classes that has package view visibility, so override the accessible
- Object value = invokeMethodSafe(method, target, null);
+ Object value = invokeMethodSafe(method, target);
if (value != null || includeNull) {
properties.put(optionPrefix + name, value);
rc = true;
(camel) 04/08: (chores) camel-core: code cleanup
Posted by or...@apache.org.
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 9cfdb5042c8b15b93d6f82d6246226f1eeff8b89
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Apr 23 11:41:16 2024 +0200
(chores) camel-core: code cleanup
Avoid pointless operations
---
.../src/main/java/org/apache/camel/management/mbean/LoadTriplet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/LoadTriplet.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/LoadTriplet.java
index 02af22cb527..fba87014e15 100644
--- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/LoadTriplet.java
+++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/LoadTriplet.java
@@ -22,7 +22,7 @@ package org.apache.camel.management.mbean;
public final class LoadTriplet {
// Exponents for EWMA: exp(-INTERVAL / WINDOW) (in seconds)
- private static final double EXP_1 = Math.exp(-1 / (60.0 * 1.0));
+ private static final double EXP_1 = Math.exp(-1 / (60.0));
private static final double EXP_5 = Math.exp(-1 / (60.0 * 5.0));
private static final double EXP_15 = Math.exp(-1 / (60.0 * 15.0));
(camel) 07/08: (chores) camel-core: code cleanup
Posted by or...@apache.org.
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 a5bfcd1de2faa01926fad9276a618603c77147af
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Apr 23 11:56:23 2024 +0200
(chores) camel-core: code cleanup
Added missing throw
---
.../component/file/FileConsumerPollStrategyStopOnRollbackTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyStopOnRollbackTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyStopOnRollbackTest.java
index fc275e7f18c..d0031783aab 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyStopOnRollbackTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyStopOnRollbackTest.java
@@ -82,7 +82,7 @@ public class FileConsumerPollStrategyStopOnRollbackTest extends ContextTestSuppo
try {
consumer.start();
} catch (Exception e) {
- RuntimeCamelException.wrapRuntimeCamelException(e);
+ throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
if (counter++ == 0) {
(camel) 01/08: (chores) camel-core: code cleanup
Posted by or...@apache.org.
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 ddeb150f4f95f966fce589d39ad1f9c951796688
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Apr 23 11:34:52 2024 +0200
(chores) camel-core: code cleanup
Extract common parts from if blocks
---
.../main/java/org/apache/camel/util/URISupport.java | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
index 6945893da7f..b0985db1e4c 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
@@ -694,7 +694,6 @@ public final class URISupport {
if (parameters.size() == 1) {
// only 1 parameter need to create new query string
query = URISupport.createQueryString(parameters);
- return buildUri(scheme, path, query);
} else {
// reorder parameters a..z
final Set<String> keySet = parameters.keySet();
@@ -703,8 +702,8 @@ public final class URISupport {
// build uri object with sorted parameters
query = URISupport.createQueryString(parametersArray, parameters, true);
- return buildUri(scheme, path, query);
}
+ return buildUri(scheme, path, query);
}
}
@@ -733,9 +732,7 @@ public final class URISupport {
parameters = URISupport.parseQuery(query, false, false);
}
- if (parameters == null || parameters.size() == 1) {
- return buildUri(scheme, path, query);
- } else {
+ if (parameters != null && parameters.size() != 1) {
final Set<String> entries = parameters.keySet();
// reorder parameters a..z
@@ -743,16 +740,14 @@ public final class URISupport {
boolean sort = false;
String prev = null;
for (String key : entries) {
- if (prev == null) {
- prev = key;
- } else {
+ if (prev != null) {
int comp = key.compareTo(prev);
if (comp < 0) {
sort = true;
break;
}
- prev = key;
}
+ prev = key;
}
if (sort) {
final String[] array = entries.toArray(new String[entries.size()]);
@@ -761,8 +756,8 @@ public final class URISupport {
query = URISupport.createQueryString(array, parameters, true);
}
- return buildUri(scheme, path, query);
}
+ return buildUri(scheme, path, query);
}
private static String buildUri(String scheme, String path, String query) {
@@ -823,7 +818,6 @@ public final class URISupport {
if (parameters.size() == 1) {
// only 1 parameter need to create new query string
query = URISupport.createQueryString(parameters);
- return makeUri(uriWithoutQuery, query);
} else {
// reorder parameters a..z
final Set<String> keySet = parameters.keySet();
@@ -832,8 +826,8 @@ public final class URISupport {
// build uri object with sorted parameters
query = URISupport.createQueryString(parametersArray, parameters, true);
- return makeUri(uriWithoutQuery, query);
}
+ return makeUri(uriWithoutQuery, query);
}
} catch (URISyntaxException ex) {
return null;
(camel) 02/08: (chores) camel-core: code cleanup
Posted by or...@apache.org.
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 da416981e7a64321ca0613d365fb76755d9abc51
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Apr 23 11:38:06 2024 +0200
(chores) camel-core: code cleanup
Use log markers
---
.../org/apache/camel/impl/engine/DefaultSupervisingRouteController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
index 9eaaa2b0766..0bc50175510 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
@@ -653,7 +653,7 @@ public class DefaultSupervisingRouteController extends DefaultRouteController im
String cause = e.getClass().getName() + ": " + e.getMessage();
logger.info("Failed restarting route: {} attempt: {} due: {} (stacktrace in debug log level)",
r.getId(), attempt, cause);
- logger.debug(" Error restarting route caused by: " + e.getMessage(), e);
+ logger.debug(" Error restarting route caused by: {}", e.getMessage(), e);
return true;
}
});