This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch concurency in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 6a237b6a46d4c70b3dc60195616f2895d0a4be24 Author: Richard Zowalla <[email protected]> AuthorDate: Thu Apr 2 10:33:42 2026 +0200 Remove unused code from Concurrency 3.1 implementation - ScheduleHelper: remove pass-through toMonths/toDaysOfWeek methods and unused DayOfWeek/Month imports - ManagedScheduledExecutorServiceImplFactory: wire virtual flag into fallback thread factory creation, remove unused import - VirtualThreadHelper: remove unused ofVirtualInterface variable --- .../org/apache/openejb/cdi/concurrency/ScheduleHelper.java | 14 ++------------ .../thread/ManagedScheduledExecutorServiceImplFactory.java | 3 +-- .../apache/openejb/threads/impl/VirtualThreadHelper.java | 1 - 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cdi/concurrency/ScheduleHelper.java b/container/openejb-core/src/main/java/org/apache/openejb/cdi/concurrency/ScheduleHelper.java index f1752ca290..7afa269e7c 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cdi/concurrency/ScheduleHelper.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cdi/concurrency/ScheduleHelper.java @@ -21,8 +21,6 @@ import jakarta.enterprise.concurrent.LastExecution; import jakarta.enterprise.concurrent.Schedule; import jakarta.enterprise.concurrent.ZonedTrigger; -import java.time.DayOfWeek; -import java.time.Month; import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.Arrays; @@ -57,13 +55,13 @@ public final class ScheduleHelper { final CronTrigger trigger = new CronTrigger(zone); if (schedule.months().length > 0) { - trigger.months(toMonths(schedule.months())); + trigger.months(schedule.months()); } if (schedule.daysOfMonth().length > 0) { trigger.daysOfMonth(schedule.daysOfMonth()); } if (schedule.daysOfWeek().length > 0) { - trigger.daysOfWeek(toDaysOfWeek(schedule.daysOfWeek())); + trigger.daysOfWeek(schedule.daysOfWeek()); } if (schedule.hours().length > 0) { trigger.hours(schedule.hours()); @@ -105,14 +103,6 @@ public final class ScheduleHelper { return new SkipIfLateTrigger(trigger, skipIfLateBy); } - private static Month[] toMonths(final Month[] months) { - return months; - } - - private static DayOfWeek[] toDaysOfWeek(final DayOfWeek[] days) { - return days; - } - /** * Wraps a {@link ZonedTrigger} to skip executions that are late by more than * the configured threshold (in seconds). Per the spec, the default is 600 seconds. diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedScheduledExecutorServiceImplFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedScheduledExecutorServiceImplFactory.java index 20e10de525..44ca504da4 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedScheduledExecutorServiceImplFactory.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/thread/ManagedScheduledExecutorServiceImplFactory.java @@ -26,7 +26,6 @@ import org.apache.openejb.threads.reject.CURejectHandler; import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; -import jakarta.enterprise.concurrent.ManagedScheduledExecutorService; import jakarta.enterprise.concurrent.ManagedThreadFactory; import javax.naming.Context; @@ -95,7 +94,7 @@ public class ManagedScheduledExecutorServiceImplFactory { managedThreadFactory = ThreadFactories.findThreadFactory(threadFactory); } catch (final Exception e) { Logger.getInstance(LogCategory.OPENEJB, ManagedScheduledExecutorServiceImplFactory.class).warning("Unable to create configured thread factory: " + threadFactory, e); - managedThreadFactory = new ManagedThreadFactoryImpl(ManagedThreadFactoryImpl.DEFAULT_PREFIX, null, ContextServiceImplFactory.lookupOrDefault(context)); + managedThreadFactory = new ManagedThreadFactoryImpl(ManagedThreadFactoryImpl.DEFAULT_PREFIX, null, ContextServiceImplFactory.lookupOrDefault(context), virtual); } return new ScheduledThreadPoolExecutor(core, managedThreadFactory, CURejectHandler.INSTANCE); diff --git a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/VirtualThreadHelper.java b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/VirtualThreadHelper.java index 1e90ad3ef6..9f1ae9821c 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/VirtualThreadHelper.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/threads/impl/VirtualThreadHelper.java @@ -54,7 +54,6 @@ public final class VirtualThreadHelper { // Use the public interface Thread.Builder (not the internal impl class) // to look up methods — avoids module access issues final Class<?> builderInterface = Class.forName("java.lang.Thread$Builder"); - final Class<?> ofVirtualInterface = Class.forName("java.lang.Thread$Builder$OfVirtual"); // Thread.Builder.OfVirtual.name(String, long) — declared on Builder builderName = builderInterface.getMethod("name", String.class, long.class);
