handle(LiveEventsPickedUp event, EventContext con
* See the class-level documentation for more details and the big picture.
*/
@React
- EitherOf3 handle(ShardProcessed event) {
+ EitherOf3 handle(ShardProcessed event) {
var builder = builder();
if (builder.getStatus() == COMPLETED) {
- return EitherOf3.withC(nothing());
+ return EitherOf3.withC(noReaction());
}
var id = builder.getId();
@@ -558,7 +558,7 @@ EitherOf3 handle(ShardProce
var completed = completeProcess(builder.getId());
return EitherOf3.withA(completed);
}
- return EitherOf3.withC(nothing());
+ return EitherOf3.withC(noReaction());
}
}
var stillRequested = shardProcessingRequested(id, event.getIndex());
@@ -687,7 +687,7 @@ private Set dispatchAll(List events) {
* the set of identifiers of the targets to dispatch the events to;
* if empty, no particular targets are selected, so the target repository will
* decide on its own
- * @return the list of the identifiers to which the dispatching has been made in fact
+ * @return the set of the identifiers to which the dispatching has been made in fact
*/
@CanIgnoreReturnValue
private Set dispatchAll(List events, Set targets) {
diff --git a/server/src/main/java/io/spine/server/delivery/InboxPart.java b/server/src/main/java/io/spine/server/delivery/InboxPart.java
index 11b36776475..8a528c5fc18 100644
--- a/server/src/main/java/io/spine/server/delivery/InboxPart.java
+++ b/server/src/main/java/io/spine/server/delivery/InboxPart.java
@@ -30,7 +30,7 @@
import io.spine.base.Time;
import io.spine.server.ServerEnvironment;
import io.spine.server.dispatch.DispatchOutcome;
-import io.spine.server.model.Nothing;
+import io.spine.server.event.NoReaction;
import io.spine.server.tenant.TenantAwareRunner;
import io.spine.server.type.SignalEnvelope;
import io.spine.type.TypeUrl;
@@ -130,12 +130,12 @@ DispatchOutcome doInvoke(MessageEndpoint endpoint, I targetId, M envelope)
* Notifies the message endpoint of the duplicate.
*/
void notifyOfDuplicated(InboxMessage message) {
- var call = new EndpointCall(message) {
+ var call = new EndpointCall(message) {
@Override
- Nothing doInvoke(MessageEndpoint endpoint, I targetId, M envelope) {
+ NoReaction doInvoke(MessageEndpoint endpoint, I targetId, M envelope) {
endpoint.onDuplicate(targetId, envelope);
- return Nothing.getDefaultInstance();
+ return NoReaction.getDefaultInstance();
}
};
call.invoke();
diff --git a/server/src/main/java/io/spine/server/model/MethodResult.java b/server/src/main/java/io/spine/server/model/MethodResult.java
index 89a86406fe6..36116729354 100644
--- a/server/src/main/java/io/spine/server/model/MethodResult.java
+++ b/server/src/main/java/io/spine/server/model/MethodResult.java
@@ -31,6 +31,8 @@
import com.google.protobuf.Empty;
import com.google.protobuf.Message;
import io.spine.base.RejectionMessage;
+import io.spine.server.event.NoReaction;
+import io.spine.server.command.DoNothing;
import io.spine.type.TypeName;
import org.checkerframework.checker.nullness.qual.Nullable;
@@ -57,9 +59,13 @@ final class MethodResult {
*
* Messages of these types should not be posted to the system.
*/
+ @SuppressWarnings("deprecation") /* keeping `Nothing` and `io.spine.server.model.DoNothing`
+ for backward compatibility. */
private static final ImmutableSet IGNORED_MESSAGES = ImmutableSet.of(
Nothing.getDefaultInstance(),
+ NoReaction.getDefaultInstance(),
DoNothing.getDefaultInstance(),
+ io.spine.server.model.DoNothing.getDefaultInstance(),
Empty.getDefaultInstance()
);
diff --git a/server/src/main/java/io/spine/server/model/MethodResults.java b/server/src/main/java/io/spine/server/model/MethodResults.java
index acc11185fad..25dddc8205c 100644
--- a/server/src/main/java/io/spine/server/model/MethodResults.java
+++ b/server/src/main/java/io/spine/server/model/MethodResults.java
@@ -32,6 +32,7 @@
import io.spine.base.CommandMessage;
import io.spine.base.EventMessage;
import io.spine.reflect.Types;
+import io.spine.server.event.NoReaction;
import io.spine.server.type.CommandClass;
import io.spine.server.type.EventClass;
import io.spine.type.MessageClass;
@@ -95,11 +96,12 @@ static
> ImmutableSet
collectMessageClasses(Method
* Checks if the class is a concrete {@linkplain CommandMessage command} or
* {@linkplain EventMessage event}.
*/
+ @SuppressWarnings("deprecation") // Handling of `Nothing` is kept for backward compatibility.
private static boolean isCommandOrEvent(Class cls) {
if (cls.isInterface()) {
return false;
}
- if (Nothing.class.equals(cls)) {
+ if (Nothing.class.equals(cls) || NoReaction.class.equals(cls)) {
return false;
}
var isCommandOrEvent = CommandMessage.class.isAssignableFrom(cls)
diff --git a/server/src/main/java/io/spine/server/tuple/Element.java b/server/src/main/java/io/spine/server/tuple/Element.java
index bcbbbb28958..855d282a1fd 100644
--- a/server/src/main/java/io/spine/server/tuple/Element.java
+++ b/server/src/main/java/io/spine/server/tuple/Element.java
@@ -30,6 +30,7 @@
import com.google.protobuf.GeneratedMessageV3;
import com.google.protobuf.Message;
import io.spine.base.EventMessage;
+import io.spine.server.event.NoReaction;
import io.spine.server.model.Nothing;
import java.io.IOException;
@@ -60,7 +61,10 @@ final class Element implements Serializable {
* Creates a tuple element with a value which can be {@link GeneratedMessageV3},
* {@link Optional}, or {@link Either}.
*/
- @SuppressWarnings("ChainOfInstanceofChecks")
+ @SuppressWarnings({
+ "ChainOfInstanceofChecks",
+ "deprecation" /* Keep using `Nothing` for backward compatibility. */
+ })
Element(Object value) {
if (value instanceof Either) {
this.type = Type.EITHER;
@@ -68,9 +72,9 @@ final class Element implements Serializable {
this.type = Type.OPTIONAL;
} else if (value instanceof GeneratedMessageV3) {
var messageV3 = (GeneratedMessageV3) value;
- // Treat `Nothing` as a special case, allowing its default instance
- // so that `Just` is possible.
- if (!(value instanceof Nothing)) {
+ // Treat `NoReaction` as a special case, allowing its default instance
+ // so that `Just` is possible.
+ if (!(value instanceof Nothing || value instanceof NoReaction)) {
checkNotDefault(messageV3);
}
this.type = Type.MESSAGE;
diff --git a/server/src/main/kotlin/io/spine/server/event/EventMessageExts.kt b/server/src/main/kotlin/io/spine/server/event/EventMessageExts.kt
new file mode 100644
index 00000000000..8b5eeb5450b
--- /dev/null
+++ b/server/src/main/kotlin/io/spine/server/event/EventMessageExts.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2024, TeamDev. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Redistribution and use in source and/or binary forms, with or without
+ * modification, must retain the above copyright notice and the following
+ * disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package io.spine.server.event
+
+import io.spine.base.EventMessage
+import io.spine.server.tuple.EitherOf2
+
+/**
+ * Converts this [EventMessage] into [EitherOf2], placing it into the slot of the type `A`.
+ */
+public fun E.asA(): EitherOf2 = EitherOf2.withA(this)
+
+/**
+ * Converts this [EventMessage] into [EitherOf2], placing it into the slot of the type `B`.
+ */
+public fun E.asB(): EitherOf2 = EitherOf2.withB(this)
diff --git a/server/src/main/kotlin/io/spine/server/event/Just.kt b/server/src/main/kotlin/io/spine/server/event/Just.kt
index 5a256804b2b..1f5a36517f9 100644
--- a/server/src/main/kotlin/io/spine/server/event/Just.kt
+++ b/server/src/main/kotlin/io/spine/server/event/Just.kt
@@ -1,11 +1,11 @@
/*
- * Copyright 2023, TeamDev. All rights reserved.
+ * Copyright 2024, TeamDev. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Redistribution and use in source and/or binary forms, with or without
* modification, must retain the above copyright notice and the following
@@ -27,7 +27,6 @@
package io.spine.server.event
import io.spine.base.EventMessage
-import io.spine.server.model.Nothing
import io.spine.server.tuple.Tuple
/**
@@ -36,7 +35,7 @@ import io.spine.server.tuple.Tuple
* Used when returning an `Iterable` from a handler method for better readability over
* `Iterable` or `List`.
*
- * @param E the type of the event.
+ * @param E The type of the event.
*/
public class Just(event: E) : Tuple(event) {
@@ -45,11 +44,23 @@ public class Just(event: E) : Tuple(event) {
@Suppress("ConstPropertyName") // Following Java conventions.
private const val serialVersionUID: Long = 0L
+ /**
+ * The instance of `Just`.
+ */
+ public val noReaction: Just by lazy {
+ Just(NoReaction.getDefaultInstance())
+ }
+
/**
* The instance of `Just`.
*/
- public val nothing: Just by lazy {
- Just(Nothing.getDefaultInstance())
+ @Deprecated(
+ message = "Please use `noReaction` instead.",
+ replaceWith = ReplaceWith("noReaction")
+ )
+ @Suppress("DEPRECATION") // propagating it by the annotation above.
+ public val nothing: Just by lazy {
+ Just(io.spine.server.model.Nothing.getDefaultInstance())
}
/**
@@ -62,12 +73,25 @@ public class Just(event: E) : Tuple(event) {
@JvmStatic
public fun just(event: E): Just = Just(event)
+ /**
+ * Obtains the instance of `Just` for Java code.
+ *
+ * Prefer the [noReaction] property of the companion object in Kotlin.
+ */
+ @JvmStatic
+ public fun noReaction(): Just = noReaction
+
/**
* Obtains the instance of `Just` for Java code.
*
* Prefer the [nothing] property of the companion object in Kotlin.
*/
@JvmStatic
- public fun nothing(): Just = nothing
+ @Deprecated(
+ message = "Please use `noReaction()` instead.",
+ replaceWith = ReplaceWith("noReaction()")
+ )
+ @Suppress("DEPRECATION") // propagating it by the annotation above.
+ public fun nothing(): Just = nothing
}
}
diff --git a/server/src/main/kotlin/io/spine/server/event/Policy.kt b/server/src/main/kotlin/io/spine/server/event/Policy.kt
index f762c8e622d..dc1c27c1320 100644
--- a/server/src/main/kotlin/io/spine/server/event/Policy.kt
+++ b/server/src/main/kotlin/io/spine/server/event/Policy.kt
@@ -66,8 +66,7 @@ import io.spine.string.joinBackticked
* from your Kotlin method, or `Just.nothing()` from Java.
*
* If you need to avoid the naming collision with [kotlin.Nothing], consider using
- * type aliases [NothingHappened][io.spine.server.model.NothingHappened] or
- * [NoReaction][io.spine.server.model.NoReaction].
+ * the [NoReaction][io.spine.server.event.NoReaction] type alias.
*
* ### Returning one event
* To return one event, declare `Just` as the return type of the [whenever] method.
@@ -90,9 +89,7 @@ import io.spine.string.joinBackticked
* @see [io.spine.server.tuple.Triplet]
* @see [io.spine.server.tuple.Quartet]
* @see [io.spine.server.tuple.Quintet]
- * @see [io.spine.server.model.Nothing]
- * @see [io.spine.server.model.NothingHappened]
- * @see [io.spine.server.model.NoReaction]
+ * @see [io.spine.server.event.NoReaction]
*/
public abstract class Policy : AbstractEventReactor(), WithLogging {
diff --git a/server/src/main/kotlin/io/spine/server/model/EventExts.kt b/server/src/main/kotlin/io/spine/server/model/EventExts.kt
index c81668eea02..569ac5df5d1 100644
--- a/server/src/main/kotlin/io/spine/server/model/EventExts.kt
+++ b/server/src/main/kotlin/io/spine/server/model/EventExts.kt
@@ -24,17 +24,25 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+@file:Suppress("DEPRECATION") /* We do not want the deprecation warning in Kotlin because of
+ our `Nothing` type deprecated in Java. We want deprecation warnings in Kotlin code
+ that are caused by deprecations in this file. */
+
package io.spine.server.model
/**
* The alias for cases of naming collisions between
* [io.spine.server.model.Nothing] and [kotlin.Nothing].
*/
+@Deprecated(message = "Please use `NoReaction` instead", replaceWith = ReplaceWith("NoReaction"))
public typealias NothingHappened = Nothing
/**
* The alias for cases of naming collisions between
* [io.spine.server.model.Nothing] and [kotlin.Nothing].
*/
+@Deprecated(
+ message = "Please use `io.spine.server.event.NoReaction` instead",
+ replaceWith = ReplaceWith("NoReaction", "io.spine.server.event"),
+)
public typealias NoReaction = Nothing
-
diff --git a/server/src/main/proto/spine/server/command/standard_commands.proto b/server/src/main/proto/spine/server/command/standard_commands.proto
new file mode 100644
index 00000000000..b3a145b18f9
--- /dev/null
+++ b/server/src/main/proto/spine/server/command/standard_commands.proto
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2024, TeamDev. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Redistribution and use in source and/or binary forms, with or without
+ * modification, must retain the above copyright notice and the following
+ * disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+syntax = "proto3";
+
+package spine.server.command;
+
+import "spine/options.proto";
+
+option (type_url_prefix) = "type.spine.io";
+option java_package = "io.spine.server.command";
+option java_outer_classname = "DoNothingProto";
+option java_multiple_files = true;
+
+// A system command that implies no action.
+//
+// Use this command type when a commanding method does not produce any output in response to
+// an event.
+//
+// This type is treated by the framework in a special way. A `DoNothing` command is never posted
+// for processing after being emitted. Neither is it stored.
+//
+// There can be no handlers for a `DoNothing` command.
+//
+// Deprecated: please use `spine.server.command.DoNothing` instead.
+//
+message DoNothing {
+}
diff --git a/server/src/main/proto/spine/server/event/standard_events.proto b/server/src/main/proto/spine/server/event/standard_events.proto
new file mode 100644
index 00000000000..d3bc8cb5327
--- /dev/null
+++ b/server/src/main/proto/spine/server/event/standard_events.proto
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2024, TeamDev. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Redistribution and use in source and/or binary forms, with or without
+ * modification, must retain the above copyright notice and the following
+ * disclaimer.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+syntax = "proto3";
+
+package spine.server.event;
+
+import "spine/options.proto";
+
+option (type_url_prefix) = "type.spine.io";
+option java_package = "io.spine.server.event";
+option java_outer_classname = "NoReactionProto";
+option java_multiple_files = true;
+
+// An empty event.
+//
+// Use this event type when a message processing does not produce any output.
+//
+// This type is treated by the framework in a special way.
+// A `NoReaction` event is never posted for processing after being emitted. Neither is it stored.
+//
+// An applier for a `NoReaction` event is never called.
+//
+message NoReaction {
+}
diff --git a/server/src/main/proto/spine/server/model/standard_commands.proto b/server/src/main/proto/spine/server/model/standard_commands.proto
index 7ee35f2d8fc..2456bc7698f 100644
--- a/server/src/main/proto/spine/server/model/standard_commands.proto
+++ b/server/src/main/proto/spine/server/model/standard_commands.proto
@@ -1,11 +1,11 @@
/*
- * Copyright 2022, TeamDev. All rights reserved.
+ * Copyright 2024, TeamDev. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Redistribution and use in source and/or binary forms, with or without
* modification, must retain the above copyright notice and the following
@@ -44,5 +44,8 @@ option java_multiple_files = true;
//
// There can be no handlers for a `DoNothing` command.
//
+// Deprecated: please use `spine.server.command.DoNothing` instead.
+//
message DoNothing {
+ option deprecated = true;
}
diff --git a/server/src/main/proto/spine/server/model/standard_events.proto b/server/src/main/proto/spine/server/model/standard_events.proto
index 7cfcb0a5f0e..0210f258954 100644
--- a/server/src/main/proto/spine/server/model/standard_events.proto
+++ b/server/src/main/proto/spine/server/model/standard_events.proto
@@ -1,11 +1,11 @@
/*
- * Copyright 2022, TeamDev. All rights reserved.
+ * Copyright 2024, TeamDev. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Redistribution and use in source and/or binary forms, with or without
* modification, must retain the above copyright notice and the following
@@ -42,6 +42,9 @@ option java_multiple_files = true;
// for processing after being emitted. Neither is it stored.
//
// An applier for a `Nothing` event is never called.
+
+// Deprecated: please use `spine.server.event.NoReaction` instead.
//
message Nothing {
+ option deprecated = true;
}
diff --git a/server/src/test/java/io/spine/server/aggregate/AggregateStorageTest.java b/server/src/test/java/io/spine/server/aggregate/AggregateStorageTest.java
index 0221ed71aa1..ddac5ac4eb9 100644
--- a/server/src/test/java/io/spine/server/aggregate/AggregateStorageTest.java
+++ b/server/src/test/java/io/spine/server/aggregate/AggregateStorageTest.java
@@ -45,7 +45,7 @@
import io.spine.server.aggregate.given.StorageRecords;
import io.spine.server.aggregate.given.repo.GivenAggregate;
import io.spine.server.aggregate.given.repo.ProjectAggregateRepository;
-import io.spine.server.model.Nothing;
+import io.spine.server.event.NoReaction;
import io.spine.server.storage.AbstractStorageTest;
import io.spine.test.aggregate.AggProject;
import io.spine.test.aggregate.IntegerProject;
@@ -471,7 +471,7 @@ void forEventContext() {
var context = ActorContext.newBuilder().buildPartial();
var messageId = MessageId.newBuilder()
.setId(AnyPacker.pack(newEventId()))
- .setTypeUrl(TypeUrl.of(Nothing.class)
+ .setTypeUrl(TypeUrl.of(NoReaction.class)
.value())
.buildPartial();
var origin = Origin.newBuilder()
diff --git a/server/src/test/java/io/spine/server/aggregate/given/aggregate/TestAggregate.java b/server/src/test/java/io/spine/server/aggregate/given/aggregate/TestAggregate.java
index 0b69a309b5b..cfbefd2e143 100644
--- a/server/src/test/java/io/spine/server/aggregate/given/aggregate/TestAggregate.java
+++ b/server/src/test/java/io/spine/server/aggregate/given/aggregate/TestAggregate.java
@@ -35,8 +35,8 @@
import io.spine.server.aggregate.given.dispatch.AggregateMessageDispatcher;
import io.spine.server.command.Assign;
import io.spine.server.entity.rejection.StandardRejections;
+import io.spine.server.event.NoReaction;
import io.spine.server.event.React;
-import io.spine.server.model.Nothing;
import io.spine.test.aggregate.AggProject;
import io.spine.test.aggregate.ProjectId;
import io.spine.test.aggregate.Status;
@@ -144,15 +144,15 @@ private void event(AggProjectArchived e) {
}
@React
- Nothing on(StandardRejections.CannotModifyDeletedEntity rejection, AggAddTask command) {
+ NoReaction on(StandardRejections.CannotModifyDeletedEntity rejection, AggAddTask command) {
rejectionWithCmdHandled = true;
- return nothing();
+ return noReaction();
}
@React
- Nothing on(StandardRejections.CannotModifyDeletedEntity rejection) {
+ NoReaction on(StandardRejections.CannotModifyDeletedEntity rejection) {
rejectionHandled = true;
- return nothing();
+ return noReaction();
}
@VisibleForTesting
diff --git a/server/src/test/java/io/spine/server/aggregate/given/klasse/EngineAggregate.java b/server/src/test/java/io/spine/server/aggregate/given/klasse/EngineAggregate.java
index 10b57cd3358..c06515caf3c 100644
--- a/server/src/test/java/io/spine/server/aggregate/given/klasse/EngineAggregate.java
+++ b/server/src/test/java/io/spine/server/aggregate/given/klasse/EngineAggregate.java
@@ -41,8 +41,8 @@
import io.spine.server.aggregate.given.klasse.rejection.EngineAlreadyStopped;
import io.spine.server.aggregate.given.klasse.rejection.Rejections;
import io.spine.server.command.Assign;
+import io.spine.server.event.NoReaction;
import io.spine.server.event.React;
-import io.spine.server.model.Nothing;
import static io.spine.server.aggregate.given.klasse.Engine.Status.STARTED;
import static io.spine.server.aggregate.given.klasse.Engine.Status.STOPPED;
@@ -106,13 +106,13 @@ EngineStopped on(TankEmpty event) {
****************************/
@React
- Nothing on(@External EmissionTestStarted event) {
- return nothing();
+ NoReaction on(@External EmissionTestStarted event) {
+ return noReaction();
}
@React
- Nothing on(@External EmissionTestStopped event) {
- return nothing();
+ NoReaction on(@External EmissionTestStopped event) {
+ return noReaction();
}
/*
@@ -125,13 +125,13 @@ Nothing on(@External EmissionTestStopped event) {
*********************************************************************/
@React
- Nothing on(Rejections.EngineAlreadyStarted rejection) {
- return nothing();
+ NoReaction on(Rejections.EngineAlreadyStarted rejection) {
+ return noReaction();
}
@React
- Nothing on(Rejections.EngineAlreadyStopped rejection) {
- return nothing();
+ NoReaction on(Rejections.EngineAlreadyStopped rejection) {
+ return noReaction();
}
/*
@@ -139,8 +139,8 @@ Nothing on(Rejections.EngineAlreadyStopped rejection) {
*************************************/
@React
- Nothing on(@External Rejections.CannotStartEmissionTest rejection) {
- return nothing();
+ NoReaction on(@External Rejections.CannotStartEmissionTest rejection) {
+ return noReaction();
}
/*
diff --git a/server/src/test/java/io/spine/server/command/model/given/commander/InvalidCommander.java b/server/src/test/java/io/spine/server/command/model/given/commander/InvalidCommander.java
index c9b28a05896..566e7e76b94 100644
--- a/server/src/test/java/io/spine/server/command/model/given/commander/InvalidCommander.java
+++ b/server/src/test/java/io/spine/server/command/model/given/commander/InvalidCommander.java
@@ -36,8 +36,8 @@
import io.spine.model.contexts.projects.command.SigStartTask;
import io.spine.server.command.AbstractCommander;
import io.spine.server.command.Command;
-import io.spine.server.model.DoNothing;
-import io.spine.server.model.Nothing;
+import io.spine.server.command.DoNothing;
+import io.spine.server.event.NoReaction;
import io.spine.server.model.given.SignatureTestCommand;
import io.spine.server.tuple.EitherOf3;
@@ -60,7 +60,7 @@ SigStartTask noParams() {
}
@Command
- SigStartTask nonCommandMessageParam(Nothing command) {
+ SigStartTask nonCommandMessageParam(NoReaction command) {
return TestCommandMessage.startTask();
}
@@ -80,7 +80,7 @@ SigStartTask threeParams(SigAssignTask command, CommandContext ctx, SigAssignTas
}
@Command
- SigStartTask wrongSecondParam(SigAssignTask command, Nothing message) {
+ SigStartTask wrongSecondParam(SigAssignTask command, NoReaction message) {
return TestCommandMessage.startTask();
}
@@ -95,8 +95,8 @@ void voidMethod(SigAssignTask command) {
}
@Command
- Nothing eventResult(SigAssignTask command) {
- return nothing();
+ NoReaction eventResult(SigAssignTask command) {
+ return noReaction();
}
@Command
@@ -121,7 +121,7 @@ SigStartTask interfaceAndContext(SignatureTestCommand command, CommandContext co
}
@Command
- Iterable wrongIterable(SigAddTaskToProject command) {
+ Iterable wrongIterable(SigAddTaskToProject command) {
return ImmutableList.of();
}
diff --git a/server/src/test/java/io/spine/server/command/model/given/handler/AssigneeReturnsNothing.java b/server/src/test/java/io/spine/server/command/model/given/handler/AssigneeReturnsNothing.java
index bd44f2ff6e8..010ceb21bdb 100644
--- a/server/src/test/java/io/spine/server/command/model/given/handler/AssigneeReturnsNothing.java
+++ b/server/src/test/java/io/spine/server/command/model/given/handler/AssigneeReturnsNothing.java
@@ -34,12 +34,12 @@
import java.util.List;
/**
- * Provides a handler method that returns {@link io.spine.server.model.Nothing}.
+ * Provides a handler method that returns {@link io.spine.server.event.NoReaction}.
*/
public class AssigneeReturnsNothing extends TestCommandAssignee {
@Assign
List handleTest(RefCreateProject cmd) {
- return ImmutableList.of(nothing());
+ return ImmutableList.of(noReaction());
}
}
diff --git a/server/src/test/java/io/spine/server/command/model/given/handler/InvalidAssignee.java b/server/src/test/java/io/spine/server/command/model/given/handler/InvalidAssignee.java
index af548c1d19c..c51d8c5755c 100644
--- a/server/src/test/java/io/spine/server/command/model/given/handler/InvalidAssignee.java
+++ b/server/src/test/java/io/spine/server/command/model/given/handler/InvalidAssignee.java
@@ -38,8 +38,8 @@
import io.spine.model.contexts.projects.event.SigTaskStarted;
import io.spine.server.command.AbstractAssignee;
import io.spine.server.command.Assign;
-import io.spine.server.model.DoNothing;
-import io.spine.server.model.Nothing;
+import io.spine.server.event.NoReaction;
+import io.spine.server.command.DoNothing;
import io.spine.server.model.given.SignatureTestCommand;
import io.spine.server.tuple.EitherOf3;
@@ -62,7 +62,7 @@ SigTaskStarted noParams() {
}
@Assign
- SigTaskStarted nonCommandMessageParam(Nothing command) {
+ SigTaskStarted nonCommandMessageParam(NoReaction command) {
return EventMessages.taskStarted();
}
@@ -82,12 +82,12 @@ SigTaskStarted threeParams(SigAssignTask command, CommandContext ctx, SigAssignT
}
@Assign
- SigTaskStarted wrongFirstParam(Nothing command, MessageContext msg) {
+ SigTaskStarted wrongFirstParam(NoReaction command, MessageContext msg) {
return EventMessages.taskStarted();
}
@Assign
- SigTaskStarted wrongSecondParam(SigAssignTask command, Nothing message) {
+ SigTaskStarted wrongSecondParam(SigAssignTask command, NoReaction message) {
return EventMessages.taskStarted();
}
@@ -122,9 +122,9 @@ SigTaskStarted interfaceAndContext(SignatureTestCommand command, CommandContext
}
@Assign
- EitherOf3
+ EitherOf3
eitherWithNothing(SigAddTaskToProject command) {
- return EitherOf3.withC(nothing());
+ return EitherOf3.withC(noReaction());
}
@Assign
@@ -134,7 +134,6 @@ Iterable wrongIterable(SigAddTaskToProject command) {
@Assign
SigSetProjectOwner wrongThrowable(SigCreateProject command) throws RuntimeException {
- throw newIllegalStateException("Command assignee " +
- "has declared an illegal exception.");
+ throw newIllegalStateException("Command assignee has declared an illegal exception.");
}
}
diff --git a/server/src/test/java/io/spine/server/command/model/given/handler/ProcessManagerDoingNothing.java b/server/src/test/java/io/spine/server/command/model/given/handler/ProcessManagerDoingNothing.java
index c92e8c223d4..5c853024936 100644
--- a/server/src/test/java/io/spine/server/command/model/given/handler/ProcessManagerDoingNothing.java
+++ b/server/src/test/java/io/spine/server/command/model/given/handler/ProcessManagerDoingNothing.java
@@ -29,7 +29,6 @@
import com.google.common.collect.ImmutableList;
import io.spine.base.EventMessage;
import io.spine.server.command.Assign;
-import io.spine.server.model.Nothing;
import io.spine.server.procman.ProcessManager;
import io.spine.server.test.shared.EmptyProcess;
import io.spine.test.reflect.command.RefCreateProject;
@@ -37,7 +36,8 @@
import java.util.List;
/**
- * A simple process manager that accepts a command and always returns {@link Nothing}.
+ * A simple process manager that accepts a command and always
+ * returns {@link io.spine.server.event.NoReaction}.
*
* The process manager does not modify its state when “handling” the passed command.
*/
@@ -50,6 +50,6 @@ public ProcessManagerDoingNothing(String id) {
@Assign
List handle(RefCreateProject cmd) {
- return ImmutableList.of(nothing());
+ return ImmutableList.of(noReaction());
}
}
diff --git a/server/src/test/java/io/spine/server/command/model/given/reaction/InvalidCommander.java b/server/src/test/java/io/spine/server/command/model/given/reaction/InvalidCommander.java
index 4c8aef5bd53..f22b31a4a34 100644
--- a/server/src/test/java/io/spine/server/command/model/given/reaction/InvalidCommander.java
+++ b/server/src/test/java/io/spine/server/command/model/given/reaction/InvalidCommander.java
@@ -36,8 +36,8 @@
import io.spine.model.contexts.projects.rejection.SigCannotCreateProject;
import io.spine.server.command.AbstractCommander;
import io.spine.server.command.Command;
+import io.spine.server.event.NoReaction;
import io.spine.server.event.React;
-import io.spine.server.model.Nothing;
import io.spine.server.model.given.SignatureTestEvent;
import java.io.IOException;
@@ -67,12 +67,12 @@ SigStartTask nonMessageParam(int event) {
}
@Command
- SigStartTask threeParams(SigTaskAddedToProject event, EventContext ctx, Nothing third) {
+ SigStartTask threeParams(SigTaskAddedToProject event, EventContext ctx, NoReaction third) {
return EventMessages.startTask();
}
@Command
- SigStartTask wrongSecondParam(SigTaskAddedToProject event, Nothing message) {
+ SigStartTask wrongSecondParam(SigTaskAddedToProject event, NoReaction message) {
return EventMessages.startTask();
}
diff --git a/server/src/test/java/io/spine/server/command/model/given/reaction/ReEitherWithNothing.java b/server/src/test/java/io/spine/server/command/model/given/reaction/ReEitherWithNothing.java
index f5927490f3d..879f7d9ea42 100644
--- a/server/src/test/java/io/spine/server/command/model/given/reaction/ReEitherWithNothing.java
+++ b/server/src/test/java/io/spine/server/command/model/given/reaction/ReEitherWithNothing.java
@@ -27,7 +27,7 @@
package io.spine.server.command.model.given.reaction;
import io.spine.server.command.Command;
-import io.spine.server.model.DoNothing;
+import io.spine.server.command.DoNothing;
import io.spine.server.tuple.EitherOf3;
import io.spine.test.command.CmdAddTask;
import io.spine.test.command.CmdStartTask;
diff --git a/server/src/test/java/io/spine/server/command/model/given/reaction/ValidCommander.java b/server/src/test/java/io/spine/server/command/model/given/reaction/ValidCommander.java
index fd87cc55a63..3e782ae43f4 100644
--- a/server/src/test/java/io/spine/server/command/model/given/reaction/ValidCommander.java
+++ b/server/src/test/java/io/spine/server/command/model/given/reaction/ValidCommander.java
@@ -39,7 +39,7 @@
import io.spine.model.contexts.projects.rejection.ProjectRejections;
import io.spine.server.command.AbstractCommander;
import io.spine.server.command.Command;
-import io.spine.server.model.DoNothing;
+import io.spine.server.command.DoNothing;
import io.spine.server.tuple.EitherOf3;
import io.spine.server.tuple.Pair;
diff --git a/server/src/test/java/io/spine/server/entity/given/tx/TxProcessManager.java b/server/src/test/java/io/spine/server/entity/given/tx/TxProcessManager.java
index ce7aa79f331..7244b920616 100644
--- a/server/src/test/java/io/spine/server/entity/given/tx/TxProcessManager.java
+++ b/server/src/test/java/io/spine/server/entity/given/tx/TxProcessManager.java
@@ -31,8 +31,8 @@
import io.spine.server.entity.given.tx.event.TxCreated;
import io.spine.server.entity.given.tx.event.TxErrorRequested;
import io.spine.server.entity.given.tx.event.TxStateErrorRequested;
+import io.spine.server.event.NoReaction;
import io.spine.server.event.React;
-import io.spine.server.model.Nothing;
import io.spine.server.procman.ProcessManager;
import java.util.List;
@@ -51,11 +51,11 @@ public TxProcessManager(Id id) {
}
@React
- Nothing event(TxCreated e) {
+ NoReaction event(TxCreated e) {
receivedEvents.add(e);
builder().setId(id())
.setName(e.getName());
- return nothing();
+ return noReaction();
}
/**
@@ -65,16 +65,16 @@ Nothing event(TxCreated e) {
* @see io.spine.server.procman.PmTransactionTest#failingInHandler()
*/
@React
- Nothing event(TxErrorRequested e) {
+ NoReaction event(TxErrorRequested e) {
throw new RuntimeException("that tests the tx behaviour for process manager");
}
@React
- Nothing event(TxStateErrorRequested e) {
- // By convention the first field of state is required.
+ NoReaction event(TxStateErrorRequested e) {
+ // By convention, the first field of state is required.
// Clearing it should fail the validation when the transaction is committed.
builder().clearId();
- return nothing();
+ return noReaction();
}
public List receivedEvents() {
diff --git a/server/src/test/java/io/spine/server/event/given/InvalidReactor.java b/server/src/test/java/io/spine/server/event/given/InvalidReactor.java
index 4ab4e1505e5..8cff0464bb7 100644
--- a/server/src/test/java/io/spine/server/event/given/InvalidReactor.java
+++ b/server/src/test/java/io/spine/server/event/given/InvalidReactor.java
@@ -39,8 +39,8 @@
import io.spine.model.contexts.projects.rejection.ProjectRejections;
import io.spine.model.contexts.projects.rejection.SigCannotCreateProject;
import io.spine.server.event.AbstractEventReactor;
+import io.spine.server.event.NoReaction;
import io.spine.server.event.React;
-import io.spine.server.model.Nothing;
import io.spine.server.model.given.SignatureTestEvent;
import java.io.IOException;
@@ -74,7 +74,7 @@ SigTaskStarted nonMessageParam(int event) {
}
@React
- SigTaskStarted wrongThreeParams(SigTaskAddedToProject e, EventContext ctx, Nothing third) {
+ SigTaskStarted wrongThreeParams(SigTaskAddedToProject e, EventContext ctx, NoReaction third) {
return taskStarted();
}
@@ -87,7 +87,7 @@ SigProjectCreated rejectionAndThreeMoreParams(ProjectRejections.SigCannotCreateP
}
@React
- SigTaskStarted wrongSecondParam(SigTaskAddedToProject event, Nothing message) {
+ SigTaskStarted wrongSecondParam(SigTaskAddedToProject event, NoReaction message) {
return taskStarted();
}
diff --git a/server/src/test/java/io/spine/server/event/given/ValidReactor.java b/server/src/test/java/io/spine/server/event/given/ValidReactor.java
index ca36fec7634..fd50e0f0e1d 100644
--- a/server/src/test/java/io/spine/server/event/given/ValidReactor.java
+++ b/server/src/test/java/io/spine/server/event/given/ValidReactor.java
@@ -39,8 +39,8 @@
import io.spine.model.contexts.projects.event.SigTaskStopped;
import io.spine.model.contexts.projects.rejection.ProjectRejections;
import io.spine.server.event.AbstractEventReactor;
+import io.spine.server.event.NoReaction;
import io.spine.server.event.React;
-import io.spine.server.model.Nothing;
import io.spine.server.tuple.EitherOf3;
import io.spine.server.tuple.Pair;
@@ -110,9 +110,9 @@ SigProjectCreated rejectionWithCommandAndCtx(ProjectRejections.SigCannotCreatePr
}
@React
- EitherOf3
+ EitherOf3
eitherOf3Result(SigTaskRemovedFromProject event) {
- return EitherOf3.withC(nothing());
+ return EitherOf3.withC(noReaction());
}
@React
diff --git a/server/src/test/java/io/spine/server/event/model/given/subscriber/InvalidSubscriber.java b/server/src/test/java/io/spine/server/event/model/given/subscriber/InvalidSubscriber.java
index 9e6008e3865..39f67831976 100644
--- a/server/src/test/java/io/spine/server/event/model/given/subscriber/InvalidSubscriber.java
+++ b/server/src/test/java/io/spine/server/event/model/given/subscriber/InvalidSubscriber.java
@@ -37,8 +37,8 @@
import io.spine.model.contexts.projects.rejection.ProjectRejections;
import io.spine.model.contexts.projects.rejection.SigCannotCreateProject;
import io.spine.server.event.AbstractEventSubscriber;
+import io.spine.server.event.NoReaction;
import io.spine.server.event.React;
-import io.spine.server.model.Nothing;
import io.spine.server.model.given.SignatureTestEvent;
import java.io.IOException;
@@ -71,7 +71,7 @@ void nonMessageParam(int event) {
}
@Subscribe
- void wrongThreeParams(SigTaskAddedToProject event, EventContext ctx, Nothing third) {
+ void wrongThreeParams(SigTaskAddedToProject event, EventContext ctx, NoReaction third) {
// do nothing.
}
@@ -84,7 +84,7 @@ void rejectionAndThreeMoreParams(ProjectRejections.SigCannotCreateProject reject
}
@Subscribe
- void wrongSecondParam(SigTaskAddedToProject event, Nothing message) {
+ void wrongSecondParam(SigTaskAddedToProject event, NoReaction message) {
// do nothing.
}
diff --git a/server/src/test/java/io/spine/server/model/TypeMatcherTest.java b/server/src/test/java/io/spine/server/model/TypeMatcherTest.java
index 4f0c57e5217..fbfc8f54dab 100644
--- a/server/src/test/java/io/spine/server/model/TypeMatcherTest.java
+++ b/server/src/test/java/io/spine/server/model/TypeMatcherTest.java
@@ -32,6 +32,8 @@
import io.spine.base.CommandMessage;
import io.spine.base.EventMessage;
import io.spine.core.UserId;
+import io.spine.server.event.NoReaction;
+import io.spine.server.command.DoNothing;
import io.spine.server.tuple.Pair;
import io.spine.server.tuple.Triplet;
import org.junit.jupiter.api.DisplayName;
@@ -47,8 +49,10 @@
import static io.spine.server.model.TypeMatcher.matches;
@DisplayName("`TypeMatcher` should")
-@SuppressWarnings({"SerializableNonStaticInnerClassWithoutSerialVersionUID",
- "SerializableInnerClassWithNonSerializableOuterClass"}) // using anonymous `TypeToken`s.
+@SuppressWarnings({
+ "SerializableNonStaticInnerClassWithoutSerialVersionUID",
+ "SerializableInnerClassWithNonSerializableOuterClass" /* using anonymous `TypeToken`s. */
+})
class TypeMatcherTest {
@Test
@@ -74,7 +78,7 @@ void matchSameTypes() {
"another one being neither a subclass nor of the same type")
void notMatchDifferentTypes() {
assertThat(matches(TypeToken.of(UserId.class),
- TypeToken.of(Nothing.class))
+ TypeToken.of(NoReaction.class))
).isFalse();
assertThat(matches(new TypeToken>() {},
@@ -119,7 +123,7 @@ void doNotMatchSubtypesWithDifferentGenerics() {
void matchGenericByGeneric() {
assertThat(matches(new TypeToken>() {},
- new TypeToken>() {})
+ new TypeToken>() {})
).isTrue();
assertThat(matches(new TypeToken>() {},
@@ -127,7 +131,7 @@ void matchGenericByGeneric() {
).isFalse();
assertThat(matches(new TypeToken>() {},
- new TypeToken>() {})
+ new TypeToken>() {})
).isFalse();
}
@@ -137,7 +141,7 @@ void matchGenericByGeneric() {
void unpackOptionalIfBothDefineGenericParams() {
assertThat(
matches(new TypeToken>() {},
- new TypeToken>() {})
+ new TypeToken>() {})
).isTrue();
assertThat(
@@ -157,7 +161,8 @@ void unpackOptionalIfBothDefineGenericParams() {
assertThat(
matches(new TypeToken>() {},
- new TypeToken>>() {})
+ new TypeToken>>() {
+ })
).isTrue();
}
@@ -167,7 +172,7 @@ void unpackOptionalIfBothDefineGenericParams() {
void notUnpackOptionalIfExpectedHasNoGenerics() {
assertThat(
matches(TypeToken.of(EventMessage.class),
- new TypeToken>() {})
+ new TypeToken>() {})
).isFalse();
}
diff --git a/server/src/test/java/io/spine/server/model/given/HandlerReturnTypeTestEnv.java b/server/src/test/java/io/spine/server/model/given/HandlerReturnTypeTestEnv.java
index 78f1917c10e..832df3fdf28 100644
--- a/server/src/test/java/io/spine/server/model/given/HandlerReturnTypeTestEnv.java
+++ b/server/src/test/java/io/spine/server/model/given/HandlerReturnTypeTestEnv.java
@@ -31,7 +31,7 @@
import com.google.protobuf.Message;
import io.spine.base.EventMessage;
import io.spine.base.RejectionMessage;
-import io.spine.server.model.Nothing;
+import io.spine.server.event.NoReaction;
import io.spine.server.tuple.EitherOf2;
import io.spine.server.tuple.EitherOf3;
import io.spine.server.tuple.Pair;
@@ -100,8 +100,8 @@ public EitherOf2 emitEither() {
public void returnVoid() {
}
- public Nothing returnNothing() {
- return Nothing.getDefaultInstance();
+ public NoReaction returnNothing() {
+ return NoReaction.getDefaultInstance();
}
public Empty returnEmpty() {
diff --git a/server/src/test/java/io/spine/server/model/given/external/TestCommander.java b/server/src/test/java/io/spine/server/model/given/external/TestCommander.java
index 143a3fa7804..113907c878a 100644
--- a/server/src/test/java/io/spine/server/model/given/external/TestCommander.java
+++ b/server/src/test/java/io/spine/server/model/given/external/TestCommander.java
@@ -29,7 +29,7 @@
import io.spine.core.External;
import io.spine.server.command.AbstractCommander;
import io.spine.server.command.Command;
-import io.spine.server.model.DoNothing;
+import io.spine.server.command.DoNothing;
import io.spine.test.model.external.ExtProjectCreated;
public final class TestCommander extends AbstractCommander {
diff --git a/server/src/test/java/io/spine/server/model/given/external/TestReactor.java b/server/src/test/java/io/spine/server/model/given/external/TestReactor.java
index a8c54fb7ef9..741bd5b4fbc 100644
--- a/server/src/test/java/io/spine/server/model/given/external/TestReactor.java
+++ b/server/src/test/java/io/spine/server/model/given/external/TestReactor.java
@@ -29,13 +29,13 @@
import io.spine.core.External;
import io.spine.server.event.AbstractEventReactor;
import io.spine.server.event.React;
-import io.spine.server.model.Nothing;
+import io.spine.server.event.NoReaction;
import io.spine.test.model.external.ExtProjectCreated;
public final class TestReactor extends AbstractEventReactor {
@React
- Nothing on(@External ExtProjectCreated event) {
- return nothing();
+ NoReaction on(@External ExtProjectCreated event) {
+ return noReaction();
}
}
diff --git a/server/src/test/java/io/spine/server/procman/given/pm/LastSignalMemo.java b/server/src/test/java/io/spine/server/procman/given/pm/LastSignalMemo.java
index 815a1c1893f..efb296e3bc3 100644
--- a/server/src/test/java/io/spine/server/procman/given/pm/LastSignalMemo.java
+++ b/server/src/test/java/io/spine/server/procman/given/pm/LastSignalMemo.java
@@ -34,8 +34,8 @@
import io.spine.server.command.Command;
import io.spine.server.entity.rejection.EntityAlreadyArchived;
import io.spine.server.entity.rejection.StandardRejections;
+import io.spine.server.event.NoReaction;
import io.spine.server.event.React;
-import io.spine.server.model.Nothing;
import io.spine.server.procman.ProcessManager;
import io.spine.server.tuple.Pair;
import io.spine.test.procman.ElephantProcess;
@@ -219,15 +219,15 @@ Optional on(PmIterationPlanned event) {
************************/
@React
- Nothing on(PmProjectCreated event) {
+ NoReaction on(PmProjectCreated event) {
remember(event);
- return nothing();
+ return noReaction();
}
@React
- Nothing on(PmTaskAdded event) {
+ NoReaction on(PmTaskAdded event) {
remember(event);
- return nothing();
+ return noReaction();
}
@React
@@ -246,8 +246,8 @@ PmCreateProject on(@External PmQuizStarted event) {
}
@React
- Nothing on(@External PmQuestionAnswered event) {
- return nothing();
+ NoReaction on(@External PmQuestionAnswered event) {
+ return noReaction();
}
/*
@@ -255,14 +255,14 @@ Nothing on(@External PmQuestionAnswered event) {
**************************/
@React
- Nothing on(StandardRejections.EntityAlreadyArchived rejection, PmAddTask command) {
+ NoReaction on(StandardRejections.EntityAlreadyArchived rejection, PmAddTask command) {
remember(command); // We check the command in the test.
- return nothing();
+ return noReaction();
}
@React
- Nothing on(StandardRejections.EntityAlreadyArchived rejection) {
+ NoReaction on(StandardRejections.EntityAlreadyArchived rejection) {
remember(rejection);
- return nothing();
+ return noReaction();
}
}
diff --git a/server/src/test/java/io/spine/server/procman/given/repo/TestProcessManager.java b/server/src/test/java/io/spine/server/procman/given/repo/TestProcessManager.java
index b0bb5c9abf5..d966e175bed 100644
--- a/server/src/test/java/io/spine/server/procman/given/repo/TestProcessManager.java
+++ b/server/src/test/java/io/spine/server/procman/given/repo/TestProcessManager.java
@@ -36,8 +36,8 @@
import io.spine.server.command.Command;
import io.spine.server.entity.rejection.EntityAlreadyArchived;
import io.spine.server.entity.rejection.StandardRejections;
+import io.spine.server.event.NoReaction;
import io.spine.server.event.React;
-import io.spine.server.model.Nothing;
import io.spine.server.procman.ProcessManager;
import io.spine.server.tuple.Pair;
import io.spine.test.procman.Project;
@@ -186,39 +186,39 @@ List handle(PmThrowEntityAlreadyArchived command) throws EntityAlr
}
@React
- Nothing on(StandardRejections.EntityAlreadyArchived rejection) {
+ NoReaction on(StandardRejections.EntityAlreadyArchived rejection) {
keep(rejection);
- return nothing();
+ return noReaction();
}
@React
- Nothing on(StandardRejections.EntityAlreadyDeleted rejection) {
- return nothing();
+ NoReaction on(StandardRejections.EntityAlreadyDeleted rejection) {
+ return noReaction();
}
@React
- Nothing on(PmTaskAdded event) {
+ NoReaction on(PmTaskAdded event) {
keep(event);
var task = event.getTask();
handleTaskAdded(task);
- return nothing();
+ return noReaction();
}
@React
- Nothing on(PmProjectStarted event) {
+ NoReaction on(PmProjectStarted event) {
keep(event);
handleProjectStarted();
- return nothing();
+ return noReaction();
}
@React
- Nothing on(PmProjectCreated event, EventContext ignored) {
+ NoReaction on(PmProjectCreated event, EventContext ignored) {
keep(event);
handleProjectCreated(event.getProjectId());
- return nothing();
+ return noReaction();
}
@Override
diff --git a/server/src/test/java/io/spine/server/trace/given/airport/BoardingProcman.java b/server/src/test/java/io/spine/server/trace/given/airport/BoardingProcman.java
index 91121f41266..c55a89cfece 100644
--- a/server/src/test/java/io/spine/server/trace/given/airport/BoardingProcman.java
+++ b/server/src/test/java/io/spine/server/trace/given/airport/BoardingProcman.java
@@ -29,8 +29,8 @@
import io.spine.core.CommandContext;
import io.spine.server.command.Assign;
import io.spine.server.command.Command;
+import io.spine.server.event.NoReaction;
import io.spine.server.event.React;
-import io.spine.server.model.Nothing;
import io.spine.server.procman.ProcessManager;
import io.spine.test.trace.Boarding;
import io.spine.test.trace.BoardingCanceled;
@@ -73,10 +73,10 @@ BoardingStarted on(FlightScheduled event) {
}
@React
- Nothing to(BoardingStarted event) {
+ NoReaction to(BoardingStarted event) {
builder().setWhenStarted(event.getWhen())
.setStatus(STARTED);
- return nothing();
+ return noReaction();
}
@Assign
@@ -106,9 +106,9 @@ BoardingCanceled handle(CancelBoarding command, CommandContext context) {
}
@React
- Nothing on(BoardingCanceled event) {
+ NoReaction on(BoardingCanceled event) {
builder().setWhenEnded(event.getWhen());
- return nothing();
+ return noReaction();
}
private static ZonedDateTime now(CommandContext context) {
diff --git a/server/src/test/java/io/spine/system/server/given/entity/PersonNamePart.java b/server/src/test/java/io/spine/system/server/given/entity/PersonNamePart.java
index daec578a71c..a4dfda62e5f 100644
--- a/server/src/test/java/io/spine/system/server/given/entity/PersonNamePart.java
+++ b/server/src/test/java/io/spine/system/server/given/entity/PersonNamePart.java
@@ -29,8 +29,8 @@
import io.spine.server.aggregate.AggregatePart;
import io.spine.server.aggregate.Apply;
import io.spine.server.command.Assign;
+import io.spine.server.event.NoReaction;
import io.spine.server.event.React;
-import io.spine.server.model.Nothing;
import io.spine.system.server.CreatePersonName;
import io.spine.system.server.PersonFirstName;
import io.spine.system.server.PersonId;
@@ -51,8 +51,8 @@ private PersonNamePart(PersonRoot root) {
}
@React
- Nothing reactOn(PersonRenamed event) {
- return nothing();
+ NoReaction reactOn(PersonRenamed event) {
+ return noReaction();
}
@Assign
diff --git a/server/src/test/java/io/spine/system/server/given/entity/PersonProcman.java b/server/src/test/java/io/spine/system/server/given/entity/PersonProcman.java
index f6b3851929e..9a7cdcfd709 100644
--- a/server/src/test/java/io/spine/system/server/given/entity/PersonProcman.java
+++ b/server/src/test/java/io/spine/system/server/given/entity/PersonProcman.java
@@ -27,8 +27,8 @@
package io.spine.system.server.given.entity;
import io.spine.server.command.Assign;
+import io.spine.server.event.NoReaction;
import io.spine.server.event.React;
-import io.spine.server.model.Nothing;
import io.spine.server.procman.ProcessManager;
import io.spine.system.server.CompletePersonCreation;
import io.spine.system.server.PersonCreation;
@@ -71,9 +71,9 @@ PersonCreationCompleted handle(CompletePersonCreation command) {
}
@React
- Nothing reactOn(PersonNameCreated event) {
+ NoReaction reactOn(PersonNameCreated event) {
builder().setId(event.getId())
.setCreated(true);
- return nothing();
+ return noReaction();
}
}
diff --git a/server/src/test/kotlin/io/spine/server/event/PolicySpec.kt b/server/src/test/kotlin/io/spine/server/event/PolicySpec.kt
index 2a639095c31..f71e186cc50 100644
--- a/server/src/test/kotlin/io/spine/server/event/PolicySpec.kt
+++ b/server/src/test/kotlin/io/spine/server/event/PolicySpec.kt
@@ -28,7 +28,6 @@ package io.spine.server.event
import io.kotest.matchers.shouldBe
import io.spine.core.External
-import io.spine.server.model.Nothing
import io.spine.server.tuple.EitherOf2
import io.spine.test.shared.event.SomethingHappened
import org.junit.jupiter.api.DisplayName
@@ -49,28 +48,28 @@ internal class PolicySpec {
fun `allow using 'Just' in return value`() {
val policy = object : Policy() {
@React
- public override fun whenever(event: SomethingHappened): Just {
- return Just.nothing
+ public override fun whenever(event: SomethingHappened): Just {
+ return Just.noReaction
}
}
- policy.whenever(somethingHappened) shouldBe Just.nothing
+ policy.whenever(somethingHappened) shouldBe Just.noReaction
}
@Test
fun `allow using 'Either' in return value`() {
object : Policy() {
@React
- public override fun whenever(event: SomethingHappened): EitherOf2 {
- return EitherOf2.withA(nothing)
- }
+ public override fun whenever(
+ event: SomethingHappened
+ ): EitherOf2 = noReaction().asA()
}.let {
- it.whenever(somethingHappened) shouldBe EitherOf2.withA(nothing)
+ it.whenever(somethingHappened) shouldBe EitherOf2.withA(noReaction)
}
}
companion object {
- val somethingHappened = SomethingHappened.getDefaultInstance()
- val nothing = Nothing.getDefaultInstance()
+ val somethingHappened: SomethingHappened = SomethingHappened.getDefaultInstance()
+ val noReaction: NoReaction = NoReaction.getDefaultInstance()
}
}
@@ -78,13 +77,13 @@ internal class PolicySpec {
* The policy which attempts to define a `@React` receptor to handle more than one
* event type, as required by the `Policy` contract.
*/
-private class GreedyPolicy : Policy() {
+private class GreedyPolicy : Policy() {
@React
- override fun whenever(@External event: Nothing): Just =
- Just.nothing
+ override fun whenever(@External event: NoReaction): Just =
+ Just.noReaction
@React
- fun on(@Suppress("UNUSED_PARAMETER") e: SomethingHappened): Just =
- Just.nothing
+ fun on(@Suppress("UNUSED_PARAMETER") e: SomethingHappened): Just =
+ Just.noReaction
}
diff --git a/server/src/test/kotlin/io/spine/server/procman/ProcessManagerSpec.kt b/server/src/test/kotlin/io/spine/server/procman/ProcessManagerSpec.kt
index fe9b33aac9f..9b0d3572b5f 100644
--- a/server/src/test/kotlin/io/spine/server/procman/ProcessManagerSpec.kt
+++ b/server/src/test/kotlin/io/spine/server/procman/ProcessManagerSpec.kt
@@ -41,7 +41,7 @@ import io.spine.protobuf.AnyPacker
import io.spine.protobuf.pack
import io.spine.server.entity.given.Given
import io.spine.server.entity.rejection.StandardRejections.EntityAlreadyArchived
-import io.spine.server.model.Nothing
+import io.spine.server.event.NoReaction
import io.spine.server.procman.given.dispatch.PmDispatcher
import io.spine.server.procman.given.pm.GivenMessages
import io.spine.server.procman.given.pm.GivenMessages.addTask
@@ -436,7 +436,7 @@ internal class ProcessManagerSpec {
*
* As a reaction to [Question Answered][PmQuestionAnswered]
* the process manager emits an [EitherOf3][io.spine.server.tuple.EitherOf3]
- * containing [Nothing]. This is done because the answered
+ * containing [io.spine.server.event.NoReaction]. This is done because the answered
* question is not part of a quiz.
*
* @see io.spine.server.procman.given.pm.QuizProcess
@@ -459,7 +459,7 @@ internal class ProcessManagerSpec {
it.receivesCommands(commands).assertEvents()
}
- assertEvents.withType(Nothing::class.java)
+ assertEvents.withType(NoReaction::class.java)
.isEmpty()
assertEvents.withType(PmQuizStarted::class.java)
.hasSize(1)
diff --git a/server/src/test/kotlin/io/spine/server/procman/given/pm/QuizProcess.kt b/server/src/test/kotlin/io/spine/server/procman/given/pm/QuizProcess.kt
index e39918e27a8..0957e1de2a5 100644
--- a/server/src/test/kotlin/io/spine/server/procman/given/pm/QuizProcess.kt
+++ b/server/src/test/kotlin/io/spine/server/procman/given/pm/QuizProcess.kt
@@ -28,8 +28,10 @@ package io.spine.server.procman.given.pm
import io.spine.core.Subscribe
import io.spine.server.command.Assign
import io.spine.server.entity.alter
+import io.spine.server.event.NoReaction
import io.spine.server.event.React
-import io.spine.server.model.Nothing
+import io.spine.server.event.asA
+import io.spine.server.event.asB
import io.spine.server.procman.ProcessManager
import io.spine.server.projection.Projection
import io.spine.server.tuple.EitherOf2
@@ -77,17 +79,17 @@ internal class QuizProcess(id: PmQuizId) : ProcessManager {
+ fun on(event: PmQuestionAnswered): EitherOf3 {
val answer = event.answer
val question = answer.question
if (question.isClosed()) {
- return EitherOf3.withC(nothing())
+ return EitherOf3.withC(noReaction())
}
return if (answer.correct) {
EitherOf3.withA(pmQuestionSolved {
@@ -109,7 +111,7 @@ internal class QuizProcess(id: PmQuizId) : ProcessManager {
+ fun on(event: PmQuestionSolved): EitherOf2 {
val question = event.question
alter {
removeOpenQuestion(question)
@@ -119,7 +121,7 @@ internal class QuizProcess(id: PmQuizId) : ProcessManager {
+ fun on(event: PmQuestionFailed): EitherOf2 {
val question = event.question
alter {
removeOpenQuestion(question)
@@ -134,17 +136,17 @@ internal class QuizProcess(id: PmQuizId) : ProcessManager {
+ private fun onAnsweredQuestion(): EitherOf2 {
return if (builder().openQuestionList.isEmpty()) {
val loaded = select(PmQuizStats::class.java).findById(id())
- EitherOf2.withB(pmQuizFinished {
+ pmQuizFinished {
quiz = id()
loaded?.let {
stats = it
}
- })
+ }.asB()
} else {
- EitherOf2.withA(nothing())
+ noReaction().asA()
}
}
}
diff --git a/server/src/test/kotlin/io/spine/server/query/QueryingClientSpec.kt b/server/src/test/kotlin/io/spine/server/query/QueryingClientSpec.kt
index e21b0dce0e7..b1af475629f 100644
--- a/server/src/test/kotlin/io/spine/server/query/QueryingClientSpec.kt
+++ b/server/src/test/kotlin/io/spine/server/query/QueryingClientSpec.kt
@@ -39,6 +39,7 @@ import io.spine.server.given.context.counting.range
import io.spine.testing.client.TestActorRequestFactory
import org.junit.jupiter.api.AfterAll
import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Disabled
import org.junit.jupiter.api.DisplayName
import org.junit.jupiter.api.Test
@@ -88,6 +89,7 @@ internal class QueryingClientSpec {
}
@Test
+ @Disabled("Until Validation support field references in constraints.")
fun `fetch the only one`() {
val client = QueryingClient(context, RangeStats::class.java, actor)
val rangeStats = client.findById(range)
@@ -97,6 +99,7 @@ internal class QueryingClientSpec {
}
@Test
+ @Disabled("Until Validation support field references in constraints.")
fun `fetch none`() {
val client = QueryingClient(context, RangeStats::class.java, actor)
val nonExisting = range {
diff --git a/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/BbProjectFailerProcess.java b/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/BbProjectFailerProcess.java
index 2d085e6325c..3bda41cfee2 100644
--- a/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/BbProjectFailerProcess.java
+++ b/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/BbProjectFailerProcess.java
@@ -27,8 +27,8 @@
package io.spine.testing.server.blackbox.given;
import io.spine.server.command.Assign;
+import io.spine.server.event.NoReaction;
import io.spine.server.event.React;
-import io.spine.server.model.Nothing;
import io.spine.server.procman.ProcessManager;
import io.spine.testing.server.blackbox.BbProjectFailer;
import io.spine.testing.server.blackbox.BbProjectId;
@@ -51,7 +51,7 @@ BbProjectFailed on(BbFailProject c) {
@React
@SuppressWarnings("DoNotCallSuggester") // Does not apply to this test env. case.
- Nothing on(BbProjectFailed e) {
+ NoReaction on(BbProjectFailed e) {
throw new RuntimeException("Reaction on the event failed unexpectedly.");
}
}
diff --git a/testutil-server/src/test/java/io/spine/testing/server/model/given/ModelTestsTestEnv.java b/testutil-server/src/test/java/io/spine/testing/server/model/given/ModelTestsTestEnv.java
index 3fa6b2e4559..877ba65c856 100644
--- a/testutil-server/src/test/java/io/spine/testing/server/model/given/ModelTestsTestEnv.java
+++ b/testutil-server/src/test/java/io/spine/testing/server/model/given/ModelTestsTestEnv.java
@@ -49,7 +49,7 @@ private TestCommandAssignee() {
@Assign
List handle(TuRemoveProject cmd) {
- return ImmutableList.of(nothing());
+ return ImmutableList.of(noReaction());
}
}
@@ -63,7 +63,7 @@ private DuplicatedCommandAssignee() {
*/
@Assign
List handle(TuRemoveProject cmd) {
- return ImmutableList.of(nothing());
+ return ImmutableList.of(noReaction());
}
}
}
diff --git a/version.gradle.kts b/version.gradle.kts
index 8eaec221631..9447c1f75cd 100644
--- a/version.gradle.kts
+++ b/version.gradle.kts
@@ -29,4 +29,4 @@
*
* For versions of Spine-based dependencies, please see [io.spine.internal.dependency.Spine].
*/
-val versionToPublish: String by extra("2.0.0-SNAPSHOT.176")
+val versionToPublish: String by extra("2.0.0-SNAPSHOT.177")