This is an automated email from the ASF dual-hosted git repository. paulk-asert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 55c0a189a93d5cd26cebc08278724c0039286404 Author: Paul King <[email protected]> AuthorDate: Thu May 7 19:18:10 2026 +1000 minor refactor: consistent spelling --- COMPATIBILITY.md | 2 +- src/main/java/groovy/concurrent/Agent.java | 12 ++++++------ src/main/java/groovy/concurrent/BroadcastChannel.java | 2 +- src/main/java/groovy/transform/ActiveObject.java | 2 +- .../groovy/transform/ActiveObjectASTTransformation.java | 2 +- src/spec/doc/_core-async-channels.adoc | 2 +- src/spec/doc/core-concurrent-actors.adoc | 6 +++--- src/test/groovy/groovy/concurrent/ActorTest.groovy | 2 +- .../src/main/java/groovy/junit6/plugin/ExpectedToFail.java | 2 +- .../main/java/groovy/junit6/plugin/ForkedJvmExtension.java | 2 +- .../main/java/groovy/junit6/plugin/ForkedJvmTestRunner.java | 4 ++-- .../src/test/groovy/ExpectedToFailTest.groovy | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md index 0f9708ef6e..0463f16726 100644 --- a/COMPATIBILITY.md +++ b/COMPATIBILITY.md @@ -100,7 +100,7 @@ These are also breaking, even though `japicmp` may not catch them: - Behavioural changes that users have come to rely on, including MetaClass dispatch, method-resolution order, GDK method semantics, - and serialisation formats. + and serialization formats. - Changing the bytecode shape that `@CompileStatic` produces in a way that breaks reflection-based callers. - Changing the AST shape produced for a given source construct in a diff --git a/src/main/java/groovy/concurrent/Agent.java b/src/main/java/groovy/concurrent/Agent.java index 1ba1020092..977caa7cdf 100644 --- a/src/main/java/groovy/concurrent/Agent.java +++ b/src/main/java/groovy/concurrent/Agent.java @@ -37,7 +37,7 @@ import java.util.function.Function; * GPars' {@code Agent}. * <p> * An {@code Agent} wraps a value that can be read by any thread but - * modified only through serialised update functions. Updates are queued + * modified only through serialized update functions. Updates are queued * and applied one at a time on a dedicated executor, guaranteeing that * the value is never corrupted by concurrent writes. * <p> @@ -84,7 +84,7 @@ public final class Agent<T> { /** * Creates an agent with the given initial value, using a - * single-thread executor for serialised updates. + * single-thread executor for serialized updates. * * @param initialValue the starting value * @param <T> the value type @@ -101,7 +101,7 @@ public final class Agent<T> { /** * Creates an agent backed by the given pool for update execution. - * Updates are still serialised (only one at a time), but they run + * Updates are still serialized (only one at a time), but they run * on the pool's threads. * * @param initialValue the starting value @@ -111,7 +111,7 @@ public final class Agent<T> { */ public static <T> Agent<T> create(T initialValue, Pool pool) { Objects.requireNonNull(pool, "pool must not be null"); - // Use a SerialExecutor to serialise updates on the pool's threads. + // Use a SerialExecutor to serialize updates on the pool's threads. // We cannot use newSingleThreadExecutor with a delegating ThreadFactory // because that breaks the executor's internal task loop. return new Agent<>(initialValue, new SerialExecutor(pool)); @@ -155,7 +155,7 @@ public final class Agent<T> { * Queues an update function to be applied to the current value. * The function receives the current value and returns the new value. * <p> - * Updates are applied asynchronously and serialised: only one update + * Updates are applied asynchronously and serialized: only one update * runs at a time. * * @param updateFn a function from current value to new value @@ -305,7 +305,7 @@ public final class Agent<T> { } /** - * An executor that serialises task execution on a delegate executor. + * An executor that serializes task execution on a delegate executor. * Tasks are queued and executed one at a time — when one completes, * the next is submitted to the delegate. */ diff --git a/src/main/java/groovy/concurrent/BroadcastChannel.java b/src/main/java/groovy/concurrent/BroadcastChannel.java index ad6648c014..be8e233d1c 100644 --- a/src/main/java/groovy/concurrent/BroadcastChannel.java +++ b/src/main/java/groovy/concurrent/BroadcastChannel.java @@ -261,7 +261,7 @@ public final class BroadcastChannel<T> { if (n <= 0) { // Reactive Streams §3.9 violation. Route the terminal error // through the drain thread (§1.3 requires onNext / onError / - // onComplete signals to be serialised); calling + // onComplete signals to be serialized); calling // subscriber.onError here would race a concurrent onNext. terminalError.compareAndSet(null, new IllegalArgumentException( "Reactive Streams §3.9: request must be positive, got " + n)); diff --git a/src/main/java/groovy/transform/ActiveObject.java b/src/main/java/groovy/transform/ActiveObject.java index ce31fd16bf..8fa4005559 100644 --- a/src/main/java/groovy/transform/ActiveObject.java +++ b/src/main/java/groovy/transform/ActiveObject.java @@ -29,7 +29,7 @@ import java.lang.annotation.Target; /** * Marks a class as an active object whose {@link ActiveMethod}-annotated * methods are automatically routed through an internal actor for - * thread-safe, serialised execution. + * thread-safe, serialized execution. * <p> * All {@code @ActiveMethod} calls on the same instance are processed * one at a time — no locks needed. diff --git a/src/main/java/org/codehaus/groovy/transform/ActiveObjectASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/ActiveObjectASTTransformation.java index 369cb6bf03..b53d01963e 100644 --- a/src/main/java/org/codehaus/groovy/transform/ActiveObjectASTTransformation.java +++ b/src/main/java/org/codehaus/groovy/transform/ActiveObjectASTTransformation.java @@ -59,7 +59,7 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.varX; /** * Handles the {@link ActiveObject} annotation, transforming * {@link ActiveMethod}-annotated methods to route through an - * internal actor for serialised execution. + * internal actor for serialized execution. * <p> * Inspired by GPars' {@code ActiveObjectASTTransformation}, * adapted for Groovy's built-in {@link Actor} infrastructure. diff --git a/src/spec/doc/_core-async-channels.adoc b/src/spec/doc/_core-async-channels.adoc index b8ef4bff0e..279567f9f7 100644 --- a/src/spec/doc/_core-async-channels.adoc +++ b/src/spec/doc/_core-async-channels.adoc @@ -199,6 +199,6 @@ and the per-subscriber buffer is drained, the subscriber receives `onComplete` even if it has no outstanding `request(n)`. Likewise, `onError` for a spec-violating `request(n <= 0)` (§3.9) is signalled through the same single-threaded delivery path as `onNext` / -`onComplete`, preserving §1.3 signal serialisation; subscribers do +`onComplete`, preserving §1.3 signal serialization; subscribers do not see those signals racing on the caller's thread. ==== diff --git a/src/spec/doc/core-concurrent-actors.adoc b/src/spec/doc/core-concurrent-actors.adoc index 2493b70112..f66f470dd5 100644 --- a/src/spec/doc/core-concurrent-actors.adoc +++ b/src/spec/doc/core-concurrent-actors.adoc @@ -40,7 +40,7 @@ Both use virtual threads on JDK 21+ for efficient scaling. == Agent An `Agent` wraps a value that can be read by any thread but modified -only through serialised update functions: +only through serialized update functions: [source,groovy] ---- @@ -322,7 +322,7 @@ class Account { } def account = new Account() -account.deposit(100) // async, serialised, blocks until done +account.deposit(100) // async, serialized, blocks until done account.deposit(50) account.withdraw(30) assert account.getBalance() == 120.0 @@ -352,7 +352,7 @@ assert await(result) == 49 The key benefit: you write normal-looking classes with normal methods. Thread safety is guaranteed by the annotation — all `@ActiveMethod` -calls are serialised through the actor. No locks, no concurrent +calls are serialized through the actor. No locks, no concurrent collections, no race conditions. This also makes the code highly readable for AI tools — the diff --git a/src/test/groovy/groovy/concurrent/ActorTest.groovy b/src/test/groovy/groovy/concurrent/ActorTest.groovy index 2bb971d00d..10220626f0 100644 --- a/src/test/groovy/groovy/concurrent/ActorTest.groovy +++ b/src/test/groovy/groovy/concurrent/ActorTest.groovy @@ -179,7 +179,7 @@ final class ActorTest { // === Concurrent stress === @Test - void testConcurrentSendsAreSerialised() { + void testConcurrentSendsAreSerialized() { assertScript ''' import groovy.concurrent.Actor import java.util.concurrent.CountDownLatch diff --git a/subprojects/groovy-test-junit6/src/main/java/groovy/junit6/plugin/ExpectedToFail.java b/subprojects/groovy-test-junit6/src/main/java/groovy/junit6/plugin/ExpectedToFail.java index 4fd0edd278..296e20afa0 100644 --- a/subprojects/groovy-test-junit6/src/main/java/groovy/junit6/plugin/ExpectedToFail.java +++ b/subprojects/groovy-test-junit6/src/main/java/groovy/junit6/plugin/ExpectedToFail.java @@ -69,7 +69,7 @@ import java.lang.annotation.Target; * annotation iteration order). When {@code @ExpectedToFail} is declared * <em>before</em> {@code @ForkedJvm} (i.e., outer), the inversion happens in * the parent JVM after the failure propagates from the fork — exercising - * {@code @ForkedJvm}'s serialisation. When declared after (inner), the + * {@code @ForkedJvm}'s serialization. When declared after (inner), the * inversion happens inside the forked child. * * @since 6.0.0 diff --git a/subprojects/groovy-test-junit6/src/main/java/groovy/junit6/plugin/ForkedJvmExtension.java b/subprojects/groovy-test-junit6/src/main/java/groovy/junit6/plugin/ForkedJvmExtension.java index ddf8e85de2..9c0921cf2c 100644 --- a/subprojects/groovy-test-junit6/src/main/java/groovy/junit6/plugin/ForkedJvmExtension.java +++ b/subprojects/groovy-test-junit6/src/main/java/groovy/junit6/plugin/ForkedJvmExtension.java @@ -235,7 +235,7 @@ public class ForkedJvmExtension implements InvocationInterceptor { throw t; } catch (ClassNotFoundException | IOException deserFailed) { throw new AssertionError("Forked JVM for " + location - + " failed and result couldn't be deserialised", deserFailed); + + " failed and result couldn't be deserialized", deserFailed); } } } diff --git a/subprojects/groovy-test-junit6/src/main/java/groovy/junit6/plugin/ForkedJvmTestRunner.java b/subprojects/groovy-test-junit6/src/main/java/groovy/junit6/plugin/ForkedJvmTestRunner.java index 0b4bc7315b..73cb145e40 100644 --- a/subprojects/groovy-test-junit6/src/main/java/groovy/junit6/plugin/ForkedJvmTestRunner.java +++ b/subprojects/groovy-test-junit6/src/main/java/groovy/junit6/plugin/ForkedJvmTestRunner.java @@ -43,7 +43,7 @@ import java.nio.file.Paths; * and method name as command-line arguments. Runs exactly that one test method * via the JUnit Platform {@link Launcher}, then reports outcome to the parent * via the file referenced by the system property - * {@code groovy.junit6.forked.result}: empty file on success, serialised + * {@code groovy.junit6.forked.result}: empty file on success, serialized * {@link Throwable} (with text fallback) on failure. * * @since 6.0.0 @@ -58,7 +58,7 @@ public final class ForkedJvmTestRunner { /** * Marker byte at the start of the result file when the failure had to be - * written as text instead of a serialised {@link Throwable}. + * written as text instead of a serialized {@link Throwable}. * Distinguishable because {@link ObjectOutputStream}'s STREAM_MAGIC is * {@code 0xACED}, never starts with {@code 0x00}. */ diff --git a/subprojects/groovy-test-junit6/src/test/groovy/ExpectedToFailTest.groovy b/subprojects/groovy-test-junit6/src/test/groovy/ExpectedToFailTest.groovy index ca764d432b..b486b12b6a 100644 --- a/subprojects/groovy-test-junit6/src/test/groovy/ExpectedToFailTest.groovy +++ b/subprojects/groovy-test-junit6/src/test/groovy/ExpectedToFailTest.groovy @@ -91,7 +91,7 @@ class ExpectedToFailTest { @ForkedJvm void outerOrdering_failurePropagatesFromForkAndIsInverted() { // ExpectedToFail OUTER: parent does the inversion AFTER @ForkedJvm - // serialises the failure across the JVM boundary, exercising the + // serializes the failure across the JVM boundary, exercising the // round-trip and verifying type+message fidelity. throw new AssertionError('forked failure round-trips') }
