This is an automated email from the ASF dual-hosted git repository. ifesdjeen pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/cassandra-simulator.git
commit 0411385bf30a5275941d9134dd12b90e7de5f3ee Author: Alex Petrov <[email protected]> AuthorDate: Thu Jul 23 17:52:29 2026 +0200 Simplify code --- .../org/apache/cassandra/simulator/Simulator.java | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/simulator-core/src/main/java/org/apache/cassandra/simulator/Simulator.java b/simulator-core/src/main/java/org/apache/cassandra/simulator/Simulator.java index ef53f70..7c8d918 100644 --- a/simulator-core/src/main/java/org/apache/cassandra/simulator/Simulator.java +++ b/simulator-core/src/main/java/org/apache/cassandra/simulator/Simulator.java @@ -223,28 +223,28 @@ public class Simulator implements AutoCloseable "org/apache/cassandra/simulator/systems/InterceptedIdentityHashMap")); customRules.add(new InterceptRule.Constructor("java/util/concurrent/ConcurrentHashMap", "org/apache/cassandra/simulator/systems/InterceptibleConcurrentHashMap")); - customRules.add(new InterceptRule.FactoryMethod("java/util/concurrent/Executors", "newFixedThreadPool", + customRules.add(InterceptRule.FactoryMethod.make("java/util/concurrent/Executors", "newFixedThreadPool", "(I)Ljava/util/concurrent/ExecutorService;")); - customRules.add(new InterceptRule.FactoryMethod("java/util/concurrent/Executors", "newSingleThreadExecutor", + customRules.add(InterceptRule.FactoryMethod.make("java/util/concurrent/Executors", "newSingleThreadExecutor", "()Ljava/util/concurrent/ExecutorService;")); - customRules.add(new InterceptRule.FactoryMethod("java/util/concurrent/Executors", "newCachedThreadPool", + customRules.add(InterceptRule.FactoryMethod.make("java/util/concurrent/Executors", "newCachedThreadPool", "()Ljava/util/concurrent/ExecutorService;")); - customRules.add(new InterceptRule.FactoryMethod("java/util/concurrent/Executors", "newScheduledThreadPool", + customRules.add(InterceptRule.FactoryMethod.make("java/util/concurrent/Executors", "newScheduledThreadPool", "(I)Ljava/util/concurrent/ScheduledExecutorService;")); - customRules.add(new InterceptRule.FactoryMethod("java/util/concurrent/Executors", "newSingleThreadScheduledExecutor", + customRules.add(InterceptRule.FactoryMethod.make("java/util/concurrent/Executors", "newSingleThreadScheduledExecutor", "()Ljava/util/concurrent/ScheduledExecutorService;")); // Preserve the standard ThreadFactory overloads. Their factory argument is intentionally // discarded because simulated executors create InterceptibleThread instances themselves. - customRules.add(new InterceptRule.FactoryMethod("java/util/concurrent/Executors", "newFixedThreadPool", + customRules.add(InterceptRule.FactoryMethod.make("java/util/concurrent/Executors", "newFixedThreadPool", "(ILjava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ExecutorService;")); - customRules.add(new InterceptRule.FactoryMethod("java/util/concurrent/Executors", "newSingleThreadExecutor", + customRules.add(InterceptRule.FactoryMethod.make("java/util/concurrent/Executors", "newSingleThreadExecutor", "(Ljava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ExecutorService;")); - customRules.add(new InterceptRule.FactoryMethod("java/util/concurrent/Executors", "newCachedThreadPool", + customRules.add(InterceptRule.FactoryMethod.make("java/util/concurrent/Executors", "newCachedThreadPool", "(Ljava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ExecutorService;")); - customRules.add(new InterceptRule.FactoryMethod("java/util/concurrent/Executors", "newScheduledThreadPool", + customRules.add(InterceptRule.FactoryMethod.make("java/util/concurrent/Executors", "newScheduledThreadPool", "(ILjava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ScheduledExecutorService;")); - customRules.add(new InterceptRule.FactoryMethod("java/util/concurrent/Executors", "newSingleThreadScheduledExecutor", + customRules.add(InterceptRule.FactoryMethod.make("java/util/concurrent/Executors", "newSingleThreadScheduledExecutor", "(Ljava/util/concurrent/ThreadFactory;)Ljava/util/concurrent/ScheduledExecutorService;")); } @@ -345,7 +345,7 @@ public class Simulator implements AutoCloseable if (!m.isAnnotationPresent(Intercept.class)) continue; String descriptor = methodDescriptor(m); - customRules.add(new InterceptRule.FactoryMethod(ownerInternal, m.getName(), descriptor)); + customRules.add(InterceptRule.FactoryMethod.make(ownerInternal, m.getName(), descriptor)); // Defer factory registration until buildSchedule() so we can use the // simulation classloader (instanceCL) to create instances. This avoids @@ -457,7 +457,7 @@ public class Simulator implements AutoCloseable || m.getParameterCount() != 1 || m.getParameterTypes()[0] != int.class) continue; - customRules.add(new InterceptRule.FactoryMethod(ownerInternal, methodName, methodDescriptor(m))); + customRules.add(InterceptRule.FactoryMethod.make(ownerInternal, methodName, methodDescriptor(m))); InterceptorOfGlobalMethods.Global.registerFactory(ownerInternal, methodName, factory); return this; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
