This is an automated email from the ASF dual-hosted git repository.
pcongiusti 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 a6cd06d54678 [CAMEL-22555] extra fixes for non-varargs call of varargs
method with inexact argument type for last parameter
a6cd06d54678 is described below
commit a6cd06d54678849e2249be8b244ae9bb787b5cb4
Author: JinyuChen97 <[email protected]>
AuthorDate: Mon Mar 16 11:18:54 2026 +0000
[CAMEL-22555] extra fixes for non-varargs call of varargs method with
inexact argument type for last parameter
https://issues.apache.org/jira/browse/CAMEL-22555
---
.../src/main/java/org/apache/camel/coap/CoAPEndpoint.java | 2 +-
.../camel/component/geocoder/GeoCoderGoogleProducer.java | 7 ++++---
.../camel/component/geocoder/GeoCoderProxyManualIT.java | 6 ++++--
.../component/mina/MinaInOutWithForcedNoResponseTest.java | 4 ++--
.../java/org/apache/camel/component/mock/MockEndpoint.java | 13 +++++++++++++
.../zookeeper/integration/ZooKeeperManagedEndpointIT.java | 2 +-
.../org/apache/camel/support/jsse/TrustAllTrustManager.java | 5 +++--
.../core/commands/kubernetes/traits/TraitHelperTest.java | 2 +-
8 files changed, 29 insertions(+), 12 deletions(-)
diff --git
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
index 929d2694fb92..40b694b07b27 100644
---
a/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
+++
b/components/camel-coap/src/main/java/org/apache/camel/coap/CoAPEndpoint.java
@@ -493,7 +493,7 @@ public class CoAPEndpoint extends DefaultEndpoint
implements EndpointServiceLoca
}
if (getConfiguredCipherSuites() != null) {
- LOGGER.debug("There are configured cipher suites: {}",
getConfiguredCipherSuites());
+ LOGGER.debug("There are configured cipher suites: {}",
Arrays.toString(getConfiguredCipherSuites()));
builder.set(DTLS_CIPHER_SUITES,
CipherSuite.getTypesByNames(getConfiguredCipherSuites()));
}
diff --git
a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderGoogleProducer.java
b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderGoogleProducer.java
index 331535b9739a..cb002490b13e 100644
---
a/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderGoogleProducer.java
+++
b/components/camel-geocoder/src/main/java/org/apache/camel/component/geocoder/GeoCoderGoogleProducer.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.geocoder;
+import java.util.Arrays;
import java.util.Locale;
import com.google.maps.GeoApiContext;
@@ -74,7 +75,7 @@ public class GeoCoderGoogleProducer extends DefaultProducer {
LOG.debug("Geocode for lat/lng {}", latlng);
GeocodingResult[] results =
GeocodingApi.reverseGeocode(context, latLng).await();
- LOG.debug("Geocode response {}", results);
+ LOG.debug("Geocode response {}", Arrays.toString(results));
if (results != null) {
extractGeoResult(results, exchange);
@@ -89,7 +90,7 @@ public class GeoCoderGoogleProducer extends DefaultProducer {
LOG.debug("Geocode for address {}", address);
GeocodingResult[] results = GeocodingApi.geocode(context,
address).await();
- LOG.debug("Geocode response {}", results);
+ LOG.debug("Geocode response {}", Arrays.toString(results));
if (results != null) {
extractGeoResult(results, exchange);
@@ -130,7 +131,7 @@ public class GeoCoderGoogleProducer extends DefaultProducer
{
LOG.debug("Geocode - reverse geocode for location {}", resLatlng);
GeocodingResult[] results = GeocodingApi.reverseGeocode(context,
result.location).await();
- LOG.debug("Geocode response {}", results);
+ LOG.debug("Geocode response {}", Arrays.toString(results));
if (results != null) {
extractGeoResult(results, exchange);
diff --git
a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyManualIT.java
b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyManualIT.java
index df29e9723f43..48ac7905a0a5 100644
---
a/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyManualIT.java
+++
b/components/camel-geocoder/src/test/java/org/apache/camel/component/geocoder/GeoCoderProxyManualIT.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.geocoder;
+import java.util.Arrays;
+
import com.google.maps.GeoApiContext;
import com.google.maps.GeocodingApi;
import com.google.maps.GeocodingApiRequest;
@@ -41,7 +43,7 @@ public class GeoCoderProxyManualIT extends
GeoCoderApiKeyTestBase {
GeocodingApiRequest geocodingApiRequest =
GeocodingApi.reverseGeocode(context, new LatLng(45.4643, 9.1895));
GeocodingResult[] results = geocodingApiRequest.await();
- LOG.info("Response {}", results);
+ LOG.info("Response {}", Arrays.toString(results));
}
@Test
@@ -55,7 +57,7 @@ public class GeoCoderProxyManualIT extends
GeoCoderApiKeyTestBase {
GeocodingApiRequest geocodingApiRequest =
GeocodingApi.reverseGeocode(context, new LatLng(45.4643, 9.1895));
GeocodingResult[] results = geocodingApiRequest.await();
- LOG.info("Response {}", results);
+ LOG.info("Response {}", Arrays.toString(results));
}
}
diff --git
a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java
b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java
index 622acaffd8cd..ceb3ca744c47 100644
---
a/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java
+++
b/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java
@@ -60,12 +60,12 @@ public class MinaInOutWithForcedNoResponseTest extends
BaseMinaTest {
.when(body().isEqualTo("Woodbine"))
.transform(constant("Hello Chad"))
.otherwise()
- .transform(constant(null));
+ .transform(constant((Object) null));
fromF("mina:tcp://localhost:%d?sync=true&disconnectOnNoReply=false&noReplyLogLevel=OFF",
port2).choice()
.when(body().isEqualTo("Woodbine"))
.transform(constant("Hello Chad")).otherwise()
- .transform(constant(null));
+ .transform(constant((Object) null));
}
};
}
diff --git
a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
index 7d07929a08f5..187c6317a126 100644
---
a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
+++
b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
@@ -1018,6 +1018,19 @@ public class MockEndpoint extends DefaultEndpoint
implements BrowsableEndpoint,
expectedBodiesReceived(bodyList);
}
+ /**
+ * Sets an expectation that the given String body values are received by
this endpoint in the specified order.
+ * <p/>
+ * <b>Important:</b> The number of bodies must match the expected number
of messages, so if you expect three
+ * messages, then there must be three bodies.
+ * <p/>
+ * <b>Important:</b> This overrides any previous set value using {@link
#expectedMessageCount(int)}
+ */
+ public void expectedBodiesReceived(String... bodies) {
+ List<Object> bodyList = new ArrayList<>(Arrays.asList(bodies));
+ expectedBodiesReceived(bodyList);
+ }
+
/**
* Adds an expectation that the given body value are received by this
endpoint
*/
diff --git
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperManagedEndpointIT.java
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperManagedEndpointIT.java
index ffedc6c9b6cc..38c0b731c1a7 100644
---
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperManagedEndpointIT.java
+++
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperManagedEndpointIT.java
@@ -55,7 +55,7 @@ public class ZooKeeperManagedEndpointIT extends
ZooKeeperITSupport {
getMBeanServer().invoke(zepName, "clearServers",
null,
-
JmxUtils.getMethodSignature(ZooKeeperEndpoint.class.getMethod("clearServers",
null)));
+
JmxUtils.getMethodSignature(ZooKeeperEndpoint.class.getMethod("clearServers")));
getMBeanServer().invoke(zepName, "addServer",
new Object[] { "someserver:12345" },
JmxUtils.getMethodSignature(ZooKeeperEndpoint.class.getMethod("addServer", new
Class[] { String.class })));
diff --git
a/core/camel-api/src/main/java/org/apache/camel/support/jsse/TrustAllTrustManager.java
b/core/camel-api/src/main/java/org/apache/camel/support/jsse/TrustAllTrustManager.java
index 677c70a248f2..2bc5dc2e24ff 100644
---
a/core/camel-api/src/main/java/org/apache/camel/support/jsse/TrustAllTrustManager.java
+++
b/core/camel-api/src/main/java/org/apache/camel/support/jsse/TrustAllTrustManager.java
@@ -17,6 +17,7 @@
package org.apache.camel.support.jsse;
import java.security.cert.X509Certificate;
+import java.util.Arrays;
import javax.net.ssl.X509TrustManager;
@@ -43,12 +44,12 @@ public class TrustAllTrustManager implements
X509TrustManager {
@Override
public void checkClientTrusted(X509Certificate[] certs, String authType) {
- LOG.debug("Trusting client certificate: {}", certs);
+ LOG.debug("Trusting client certificate: {}", Arrays.toString(certs));
}
@Override
public void checkServerTrusted(X509Certificate[] certs, String authType) {
- LOG.debug("Trusting server certificate: {}", certs);
+ LOG.debug("Trusting server certificate: {}", Arrays.toString(certs));
}
@Override
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/TraitHelperTest.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/TraitHelperTest.java
index a751290e1bc5..62549c2e483b 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/TraitHelperTest.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/traits/TraitHelperTest.java
@@ -47,7 +47,7 @@ public class TraitHelperTest {
Assertions.assertEquals(3, resultEmptyDefault.length);
Assertions.assertArrayEquals(overridesGroup, resultEmptyDefault);
- String[] resultNull = TraitHelper.mergeTraits(null);
+ String[] resultNull = TraitHelper.mergeTraits();
Assertions.assertNotNull(resultNull);
}
