This is an automated email from the ASF dual-hosted git repository. apupier pushed a commit to branch CAMEL-22996-dropJava17 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 40cf9c438aed017d9a9391fb41a7242f0c830fef Author: Aurélien Pupier <[email protected]> AuthorDate: Fri Oct 16 09:43:25 2026 +0200 CAMEL-22996: resolve Java-21 baseline TODOs (threadId, Locale.of) Co-authored-by: IBM Bob 2.2.1 --- .../component/as2/api/AS2AsyncMDNServerConnection.java | 4 +--- .../camel/component/as2/api/AS2ServerConnection.java | 4 +--- .../apache/camel/dataformat/bindy/FormattingOptions.java | 4 +--- .../component/google/bigquery/GoogleBigQueryProducer.java | 4 +--- .../component/google/pubsub/GooglePubsubProducer.java | 5 +---- .../org/apache/camel/component/smpp/SmppConsumer.java | 5 +---- .../org/apache/camel/component/smpp/SmppProducer.java | 15 +++------------ .../impl/engine/DefaultAsyncProcessorAwaitManager.java | 4 +--- .../mbean/ManagedAsyncProcessorAwaitManager.java | 4 +--- 9 files changed, 11 insertions(+), 38 deletions(-) diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2AsyncMDNServerConnection.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2AsyncMDNServerConnection.java index 731ca3d4d1c0..dee0ffb7f478 100644 --- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2AsyncMDNServerConnection.java +++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2AsyncMDNServerConnection.java @@ -195,9 +195,7 @@ public class AS2AsyncMDNServerConnection { // NOTE: the connection will be closed after the execution of the process. AS2BHttpServerConnection inConn = new AS2BHttpServerConnection(cfg); // NOSONAR inConn.bind(inSocket); - // TODO Update once baseline is Java 21 - // setName(REQUEST_HANDLER_THREAD_NAME_PREFIX + threadId()); - setName(REQUEST_HANDLER_THREAD_NAME_PREFIX + getId()); + setName(REQUEST_HANDLER_THREAD_NAME_PREFIX + threadId()); this.httpService = httpService; this.serverConnection = inConn; } diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java index 83dfcc1b52d4..1270448dc5ee 100644 --- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java +++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ServerConnection.java @@ -490,9 +490,7 @@ public class AS2ServerConnection { LOG.info("Incoming connection from {}", inSocket.getInetAddress()); inConn.bind(inSocket); - // TODO Update once baseline is Java 21 - // setName(REQUEST_HANDLER_THREAD_NAME_PREFIX + threadId()); - setName(REQUEST_HANDLER_THREAD_NAME_PREFIX + getId()); + setName(REQUEST_HANDLER_THREAD_NAME_PREFIX + threadId()); this.httpService = httpService; this.serverConnection = inConn; diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormattingOptions.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormattingOptions.java index 79af598dfa2c..1422bfcfde8d 100644 --- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormattingOptions.java +++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/FormattingOptions.java @@ -123,9 +123,7 @@ public class FormattingOptions { if (ObjectHelper.isNotEmpty(locale)) { String[] result = locale.split("-"); if (result.length <= 2) { - // TODO Update once baseline is Java 21 - // answer = result.length == 1 ? Locale.of(result[0]) : Locale.of(result[0], result[1]); - answer = result.length == 1 ? new Locale(result[0]) : new Locale(result[0], result[1]); + answer = result.length == 1 ? Locale.of(result[0]) : Locale.of(result[0], result[1]); } } return answer; diff --git a/components/camel-google/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryProducer.java b/components/camel-google/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryProducer.java index 6a80d9848944..73533603e1c7 100644 --- a/components/camel-google/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryProducer.java +++ b/components/camel-google/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryProducer.java @@ -172,9 +172,7 @@ public class GoogleBigQueryProducer extends DefaultProducer { apiRequestRows.size(), tableId, suffix, partitionDecorator); } if (LOG.isDebugEnabled()) { - // TODO Update once baseline is Java 21 - // LOG.debug("uploader thread/id: {} / {} . api call completed.", Thread.currentThread().threadId(), exchangeId); - LOG.debug("uploader thread/id: {} / {} . api call completed.", Thread.currentThread().getId(), exchangeId); + LOG.debug("uploader thread/id: {} / {} . api call completed.", Thread.currentThread().threadId(), exchangeId); } return insertAllRequest.getRows().size(); } diff --git a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java index d295dc870ab7..31b54f5d103b 100644 --- a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java +++ b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java @@ -62,10 +62,7 @@ public class GooglePubsubProducer extends DefaultProducer { public void process(Exchange exchange) throws Exception { if (logger.isDebugEnabled()) { - // TODO Update once baseline is Java 21 - // logger.debug("uploader thread/id: {} / {}. api call completed.", Thread.currentThread().threadId(), - // exchange.getExchangeId()); - logger.debug("uploader thread/id: {} / {}. api call completed.", Thread.currentThread().getId(), + logger.debug("uploader thread/id: {} / {}. api call completed.", Thread.currentThread().threadId(), exchange.getExchangeId()); } diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java index b5d381670107..a572368a0522 100644 --- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java +++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java @@ -198,11 +198,8 @@ public class SmppConsumer extends DefaultConsumer { reconnectLock.unlock(); } } else { - // TODO Update once baseline is Java 21 - // LOG.warn("Thread {} could not acquire a lock for creating the session during consumer reconnection", - // Thread.currentThread().threadId()); LOG.warn("Thread {} could not acquire a lock for creating the session during consumer reconnection", - Thread.currentThread().getId()); + Thread.currentThread().threadId()); } } diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java index 78d16d9b442a..eff257679df9 100644 --- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java +++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java @@ -93,11 +93,8 @@ public class SmppProducer extends DefaultProducer { connectLock.unlock(); } } else { - // TODO Update once baseline is Java 21 - // LOG.warn("Thread {} could not acquire a lock for creating the session during producer start", - // Thread.currentThread().threadId()); LOG.warn("Thread {} could not acquire a lock for creating the session during producer start", - Thread.currentThread().getId()); + Thread.currentThread().threadId()); } } } @@ -172,11 +169,8 @@ public class SmppProducer extends DefaultProducer { connectLock.unlock(); } } else { - // TODO Update once baseline is Java 21 - // LOG.warn("Thread {} could not acquire a lock for creating the session during lazy initialization", - // Thread.currentThread().threadId()); LOG.warn("Thread {} could not acquire a lock for creating the session during lazy initialization", - Thread.currentThread().getId()); + Thread.currentThread().threadId()); } } } @@ -223,11 +217,8 @@ public class SmppProducer extends DefaultProducer { connectLock.unlock(); } } else { - // TODO Update once baseline is Java 21 - // LOG.warn("Thread {} could not acquire a lock for creating the session during producer reconnection", - // Thread.currentThread().threadId()); LOG.warn("Thread {} could not acquire a lock for creating the session during producer reconnection", - Thread.currentThread().getId()); + Thread.currentThread().threadId()); } } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java index fd52d530b1c6..e831514cb668 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java @@ -259,9 +259,7 @@ public class DefaultAsyncProcessorAwaitManager extends ServiceSupport implements sb.append( "---------------------------------------------------------------------------------------------------------------------------------------\n"); - // TODO Update once baseline is Java 21 - // sb.append(style("Id:")).append(entry.getBlockedThread().threadId()).append("\n"); - sb.append(style("Id:")).append(entry.getBlockedThread().getId()).append("\n"); + sb.append(style("Id:")).append(entry.getBlockedThread().threadId()).append("\n"); sb.append(style("Name:")).append(entry.getBlockedThread().getName()).append("\n"); sb.append(style("RouteId:")).append(safeNull(entry.getRouteId())).append("\n"); sb.append(style("NodeId:")).append(safeNull(entry.getNodeId())).append("\n"); diff --git a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedAsyncProcessorAwaitManager.java b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedAsyncProcessorAwaitManager.java index a209b900e1e8..7beddc6769e2 100644 --- a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedAsyncProcessorAwaitManager.java +++ b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedAsyncProcessorAwaitManager.java @@ -82,9 +82,7 @@ public class ManagedAsyncProcessorAwaitManager extends ManagedService implements private static CompositeData toCompositeData(AsyncProcessorAwaitManager.AwaitThread entry, CompositeType ct) throws OpenDataException { - // TODO Update once baseline is Java 21 - // String id = Long.toString(entry.getBlockedThread().threadId()); - String id = Long.toString(entry.getBlockedThread().getId()); + String id = Long.toString(entry.getBlockedThread().threadId()); String name = entry.getBlockedThread().getName(); String exchangeId = entry.getExchange().getExchangeId(); String routeId = entry.getRouteId();
