SpineEventEngine · yevhenii-nadtochii · Jan 4, 2022 · Jan 4, 2022 · Jan 4, 2022 · Jan 5, 2022
diff --git a/license-report.md b/license-report.md
@@ -1,6 +1,6 @@
 
 
-# Dependencies of `io.spine:spine-client:2.0.0-SNAPSHOT.91`
+# Dependencies of `io.spine:spine-client:2.0.0-SNAPSHOT.92`
 
 ## Runtime
 1.  **Group** : com.google.android. **Name** : annotations. **Version** : 4.1.1.4.
@@ -512,12 +512,12 @@
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Wed Jan 05 17:43:57 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Mon Jan 10 12:20:17 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine:spine-core:2.0.0-SNAPSHOT.91`
+# Dependencies of `io.spine:spine-core:2.0.0-SNAPSHOT.92`
 
 ## Runtime
 1.  **Group** : com.google.code.findbugs. **Name** : jsr305. **Version** : 3.0.2.
@@ -989,12 +989,12 @@ This report was generated on **Wed Jan 05 17:43:57 EET 2022** using [Gradle-Lice
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Wed Jan 05 17:43:57 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Mon Jan 10 12:20:17 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.tools:spine-model-assembler:2.0.0-SNAPSHOT.91`
+# Dependencies of `io.spine.tools:spine-model-assembler:2.0.0-SNAPSHOT.92`
 
 ## Runtime
 1.  **Group** : com.google.android. **Name** : annotations. **Version** : 4.1.1.4.
@@ -1506,12 +1506,12 @@ This report was generated on **Wed Jan 05 17:43:57 EET 2022** using [Gradle-Lice
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Wed Jan 05 17:43:58 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Mon Jan 10 12:20:18 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.tools:spine-model-verifier:2.0.0-SNAPSHOT.91`
+# Dependencies of `io.spine.tools:spine-model-verifier:2.0.0-SNAPSHOT.92`
 
 ## Runtime
 1.  **Group** : com.github.ben-manes.caffeine. **Name** : caffeine. **Version** : 2.8.8.
@@ -2123,12 +2123,12 @@ This report was generated on **Wed Jan 05 17:43:58 EET 2022** using [Gradle-Lice
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Wed Jan 05 17:44:01 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Mon Jan 10 12:20:19 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine:spine-server:2.0.0-SNAPSHOT.91`
+# Dependencies of `io.spine:spine-server:2.0.0-SNAPSHOT.92`
 
 ## Runtime
 1.  **Group** : com.google.android. **Name** : annotations. **Version** : 4.1.1.4.
@@ -2648,12 +2648,12 @@ This report was generated on **Wed Jan 05 17:44:01 EET 2022** using [Gradle-Lice
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Wed Jan 05 17:44:05 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Mon Jan 10 12:20:22 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.tools:spine-testutil-client:2.0.0-SNAPSHOT.91`
+# Dependencies of `io.spine.tools:spine-testutil-client:2.0.0-SNAPSHOT.92`
 
 ## Runtime
 1.  **Group** : com.google.android. **Name** : annotations. **Version** : 4.1.1.4.
@@ -3217,12 +3217,12 @@ This report was generated on **Wed Jan 05 17:44:05 EET 2022** using [Gradle-Lice
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Wed Jan 05 17:44:06 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Mon Jan 10 12:20:22 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.tools:spine-testutil-core:2.0.0-SNAPSHOT.91`
+# Dependencies of `io.spine.tools:spine-testutil-core:2.0.0-SNAPSHOT.92`
 
 ## Runtime
 1.  **Group** : com.google.android. **Name** : annotations. **Version** : 4.1.1.4.
@@ -3786,12 +3786,12 @@ This report was generated on **Wed Jan 05 17:44:06 EET 2022** using [Gradle-Lice
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Wed Jan 05 17:44:07 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Mon Jan 10 12:20:23 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
 
 
 
 
-# Dependencies of `io.spine.tools:spine-testutil-server:2.0.0-SNAPSHOT.91`
+# Dependencies of `io.spine.tools:spine-testutil-server:2.0.0-SNAPSHOT.92`
 
 ## Runtime
 1.  **Group** : com.google.android. **Name** : annotations. **Version** : 4.1.1.4.
@@ -4399,4 +4399,4 @@ This report was generated on **Wed Jan 05 17:44:07 EET 2022** using [Gradle-Lice
 
 The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
-This report was generated on **Wed Jan 05 17:44:22 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
+This report was generated on **Mon Jan 10 12:20:32 EET 2022** using [Gradle-License-Report plugin](https://github.com/jk1/Gradle-License-Report) by Evgeny Naumenko, licensed under [Apache 2.0 License](https://github.com/jk1/Gradle-License-Report/blob/master/LICENSE).
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject.
  -->
 <groupId>io.spine</groupId>
 <artifactId>spine-core-java</artifactId>
-<version>2.0.0-SNAPSHOT.91</version>
+<version>2.0.0-SNAPSHOT.92</version>
 
 <inceptionYear>2015</inceptionYear>
 

diff --git a/server/src/main/java/io/spine/server/ServerEnvironment.java b/server/src/main/java/io/spine/server/ServerEnvironment.java
@@ -319,8 +319,6 @@ public void reset() {
         tracerFactory.reset();
         storageFactory.reset();
         delivery.reset();
-        var currentEnv = environment().type();
-        delivery.use(Delivery.local(), currentEnv);
         resetDeploymentType();
     }
 

diff --git a/server/src/main/java/io/spine/server/aggregate/Aggregate.java b/server/src/main/java/io/spine/server/aggregate/Aggregate.java
@@ -241,7 +241,7 @@ protected DispatchOutcome dispatchCommand(CommandEnvelope command) {
     /**
      * Dispatches the event on which the aggregate reacts.
      *
-     * <p>Reacting on a event may result in emitting event messages.
+     * <p>Reacting on an event may result in emitting event messages.
      * All the {@linkplain Empty empty} messages are filtered out from the result.
      *
      * @param event
@@ -329,7 +329,7 @@ final BatchDispatchOutcome replay(AggregateHistory history) {
      * the {@code events} list is of size 3, the applied events will have versions {@code 43},
      * {@code 44}, and {@code 45}.
      *
-     * <p>All the events applied to the aggregate instance are
+     * <p>All the events successfully applied to the aggregate instance are
      * {@linkplain UncommittedHistory#startTracking(int) tracked} as a part of the aggregate's
      * {@link UncommittedHistory} and later are stored.
      *
@@ -359,8 +359,8 @@ final BatchDispatchOutcome apply(List<Event> events, int snapshotTrigger) {
      * <p>If this event is new in the aggregate history (e.g. it's not already stored), it is
      * recorded as a part of the aggregate's {@link UncommittedHistory}.
      */
-    final void onAfterEventPlayed(EventEnvelope event) {
-        uncommittedHistory.track(event);
+    final void onAfterEventPlayed(EventEnvelope event, DispatchOutcome outcome) {
+        uncommittedHistory.track(event, outcome);
     }
 
     /**
@@ -394,7 +394,7 @@ UncommittedEvents getUncommittedEvents() {
     }
 
     /**
-     * Tells if there any uncommitted events.
+     * Tells if there are any uncommitted events.
      */
     boolean hasUncommittedEvents() {
         return uncommittedHistory.hasEvents();
@@ -483,7 +483,7 @@ protected final RecentHistory recentHistory() {
     /**
      * Creates an iterator of the aggregate event history with reverse traversal.
      *
-     * <p>The records are returned sorted by timestamp in a descending order (from newer to older).
+     * <p>The records are returned sorted by timestamp in descending order (from newer to older).
      *
      * <p>The iterator is empty if there's no history for the aggregate.
      *

diff --git a/server/src/main/java/io/spine/server/aggregate/AggregateTransaction.java b/server/src/main/java/io/spine/server/aggregate/AggregateTransaction.java
@@ -41,7 +41,7 @@
  *
  * @param <I> the type of aggregate IDs
  * @param <S> the type of aggregate state
- * @param <B> the type of a {@code ValidatingBuilder} for the aggregate state
+ * @param <B> the type of {@code ValidatingBuilder} for the aggregate state
  */
 @Internal
 public class AggregateTransaction<I,
@@ -84,7 +84,7 @@ protected final DispatchOutcome dispatch(Aggregate<I, S, B> aggregate, EventEnve
     @Override
     public DispatchOutcome play(EventEnvelope event) {
         var outcome = super.play(event);
-        entity().onAfterEventPlayed(event);
+        entity().onAfterEventPlayed(event, outcome);
         return outcome;
     }
 

diff --git a/server/src/main/java/io/spine/server/aggregate/UncommittedHistory.java b/server/src/main/java/io/spine/server/aggregate/UncommittedHistory.java
@@ -28,6 +28,7 @@
 
 import com.google.common.collect.ImmutableList;
 import io.spine.core.Event;
+import io.spine.server.dispatch.DispatchOutcome;
 import io.spine.server.type.EventEnvelope;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -42,20 +43,27 @@
  * Uncommitted events and snapshots created for this aggregate during the dispatching.
  *
  * <p>Watches how the events {@linkplain Aggregate#invokeApplier(EventEnvelope) are sent}
- * to the {@link Aggregate} applier methods. Remembers all such events as uncommitted.
+ * to the {@link Aggregate} applier methods. Remembers all successfully applied events
+ * as uncommitted.
  *
  * <p>Once an aggregate is loaded from the storage, the {@code UncommittedHistory}
  * {@linkplain #onAggregateRestored(AggregateHistory) remembers} the event count
  * after the last snapshot.
  *
- * <p>If during the dispatching of events the number of events since the last snapshot exceeds
+ * <p>If during the tracking the number of events since the last snapshot exceeds
  * the snapshot trigger, a snapshot is created and remembered as a part of uncommitted history.
  *
  * <p>In order to ignore the events fed to the aggregate when it's being loaded from the storage,
  * the {@code UncommittedHistory}'s tracking is only {@linkplain #startTracking(int) activated}
  * when the new and truly un-yet-committed events are dispatched to the applier methods.
- * The tracking {@linkplain #stopTracking() stops} after all the new events have been played
- * on the aggregate instance.
+ *
+ * <p>The tracking stops in two cases:
+ * <ul>
+ *     <li>all new events have been played on the aggregate instance
+ *     and the tracking {@linkplain #stopTracking() explicitly deactivated};</li>
+ *     <li>the history {@linkplain #track(EventEnvelope, DispatchOutcome) received} an event
+ *     with non-successful outcome.</li>
+ * </ul>
  *
  * @see Aggregate#apply(List, int) on activation and deactivation of event tracking
  * @see Aggregate#replay(AggregateHistory) on supplying the history stats when loading aggregate
@@ -84,8 +92,8 @@ final class UncommittedHistory {
     /**
      * Enables the tracking of events.
      *
-     * <p>All events {@linkplain #track(EventEnvelope) sent} to this instance will now be counted
-     * as new and uncommitted events in the aggregate's history.
+     * <p>All events {@linkplain #track(EventEnvelope, DispatchOutcome) sent} to this instance
+     * will now be counted as new and uncommitted events in the aggregate's history.
      *
      * @param snapshotTrigger
      *         the snapshot trigger to consider each time a new event is tracked
@@ -98,8 +106,8 @@ void startTracking(int snapshotTrigger) {
     /**
      * Stops the tracking of the events.
      *
-     * <p>All the events {@linkplain #track(EventEnvelope) sent to the tracking} will be counted
-     * as the events already present in the aggregate storage.
+     * <p>All the events {@linkplain #track(EventEnvelope, DispatchOutcome) sent to the tracking}
+     * will be counted as the events already present in the aggregate storage.
      */
     void stopTracking() {
         enabled = false;
@@ -110,30 +118,39 @@ void stopTracking() {
      * Tracks the event dispatched to the Aggregate's applier.
      *
      * <p>If the tracking is not {@linkplain #startTracking(int) started}, the event is considered
-     * an old one and such as not requiring storage and tracking. In this case, this method
+     * old and such as not requiring storage and tracking. In this case, this method
      * does nothing.
      *
-     * <p>If the event is a new one, it is remembered as a part of the uncommitted history.
-     *
      * <p>If the number of events since the last snapshot equals or exceeds the snapshot trigger,
      * a new snapshot is made and saved to the uncommitted history.
      *
+     * <p>If the event has non-successful outcome, the history will
+     * {@linkplain #stopTracking() stop tracking}, the erroneous event will not be remembered.
+     *
      * @param envelope
      *         an event to track
+     * @param outcome
+     *         an outcome of dispatching
      */
-    void track(EventEnvelope envelope) {
-        if (!enabled) {
+    void track(EventEnvelope envelope, DispatchOutcome outcome) {
+        if (!outcome.hasSuccess()) {
+            stopTracking();
+        }
+        if (!enabled || envelope.isRejection()) {
             return;
         }
+
         requireNonNull(snapshotTrigger,
                        "The snapshot trigger must be set" +
                                " to track the events applied to an `Aggregate`.");
 
-        var event = envelope.outerObject();
-        if (event.isRejection()) {
-            return;
-        }
+        doTrack(envelope.outerObject());
+    }
+
+    @SuppressWarnings("ConstantConditions" /* Preconditions are checked right before the call. */)
+    private void doTrack(Event event) {
         currentSegment.add(event);
+
         var eventsInSegment = currentSegment.size();
         if (eventCountAfterLastSnapshot + eventsInSegment >= snapshotTrigger) {
             var snapshot = makeSnapshot.get();
@@ -165,8 +182,7 @@ ImmutableList<AggregateHistory> get() {
      */
     UncommittedEvents events() {
         var events = get().stream()
-                                  .flatMap(segment -> segment.getEventList()
-                                                             .stream())
+                                  .flatMap(segment -> segment.getEventList().stream())
                                   .collect(toList());
         return UncommittedEvents.ofNone()
                                 .append(events);

diff --git a/server/src/main/java/io/spine/server/delivery/InboxMessageMixin.java b/server/src/main/java/io/spine/server/delivery/InboxMessageMixin.java
@@ -54,7 +54,7 @@ default TenantId tenant() {
     }
 
     /**
-     * Generates a new {@code InboxMessageId} with a auto-generated UUID and the given shard
+     * Generates a new {@code InboxMessageId} with an auto-generated UUID and the given shard
      * index as parts.
      */
     static InboxMessageId generateIdWith(ShardIndex index) {

diff --git a/server/src/main/java/io/spine/server/entity/EventPlayingTransaction.java b/server/src/main/java/io/spine/server/entity/EventPlayingTransaction.java
@@ -45,7 +45,7 @@
  * @param <S>
  *         the type of entity state
  * @param <B>
- *         the type of a {@code ValidatingBuilder} for the entity state
+ *         the type of {@code ValidatingBuilder} for the entity state
  */
 @Internal
 public abstract

diff --git a/server/src/main/java/io/spine/server/event/model/EventReactorClass.java b/server/src/main/java/io/spine/server/event/model/EventReactorClass.java
@@ -69,7 +69,7 @@ private EventReactorClass(Class<? extends S> cls) {
         @SuppressWarnings("unchecked")
         var result = (EventReactorClass<S>)
                 get(cls, EventReactorClass.class, () -> new EventReactorClass<>(cls));
-        return (result);
+        return result;
     }
 
     @Override