From 7b692a94acdbfd5c02f12e46966682e0417eae94 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Fri, 21 Feb 2020 17:47:44 +0200
Subject: [PATCH 01/32] Implement HandlerMethodSite

---
 .../server/entity/HandlerMethodSite.java      | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 server/src/main/java/io/spine/server/entity/HandlerMethodSite.java

diff --git a/server/src/main/java/io/spine/server/entity/HandlerMethodSite.java b/server/src/main/java/io/spine/server/entity/HandlerMethodSite.java
new file mode 100644
index 00000000000..ecfe4759e14
--- /dev/null
+++ b/server/src/main/java/io/spine/server/entity/HandlerMethodSite.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2020, TeamDev. All rights reserved.
+ *
+ * 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.entity;
+
+import com.google.common.base.Objects;
+import com.google.common.flogger.LogSite;
+import com.google.errorprone.annotations.Immutable;
+import io.spine.code.java.ClassName;
+
+import java.lang.reflect.Method;
+import java.util.stream.Stream;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.lang.String.format;
+import static java.util.stream.Collectors.joining;
+
+@Immutable
+final class HandlerMethodSite extends LogSite {
+
+    private final String fileName;
+    private final ClassName name;
+    private final String methodName;
+
+    HandlerMethodSite(Method method) {
+        checkNotNull(method);
+        this.name = ClassName.of(method.getDeclaringClass());
+        this.fileName = name.topLevelClass().value();
+        String params = Stream.of(method.getParameterTypes())
+                              .map(Class::getSimpleName)
+                              .collect(joining(", "));
+        this.methodName = format("%s(%s)", method.getName(), params);
+    }
+
+    @Override
+    public String getClassName() {
+        return name.canonicalName();
+    }
+
+    @Override
+    public String getMethodName() {
+        return methodName;
+    }
+
+    @Override
+    public int getLineNumber() {
+        return UNKNOWN_LINE;
+    }
+
+    @Override
+    public String getFileName() {
+        return fileName;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof HandlerMethodSite)) {
+            return false;
+        }
+        HandlerMethodSite site = (HandlerMethodSite) o;
+        return Objects.equal(getFileName(), site.getFileName()) &&
+                Objects.equal(name, site.name) &&
+                Objects.equal(getMethodName(), site.getMethodName());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(getFileName(), name, getMethodName());
+    }
+}

From 1f8febf636bbb803865f78c71bbc9ebfd44f9450 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 24 Feb 2020 18:38:36 +0200
Subject: [PATCH 02/32] Implement `LoggingEntity`

---
 .../spine/server/entity/AbstractEntity.java   |  24 +++-
 .../server/entity/HandlerMethodSite.java      |   8 +-
 .../io/spine/server/entity/LoggingEntity.java | 117 ++++++++++++++++++
 .../server/model/AbstractHandlerMethod.java   |  39 +++++-
 4 files changed, 180 insertions(+), 8 deletions(-)
 create mode 100644 server/src/main/java/io/spine/server/entity/LoggingEntity.java

diff --git a/server/src/main/java/io/spine/server/entity/AbstractEntity.java b/server/src/main/java/io/spine/server/entity/AbstractEntity.java
index b2d732854b3..60df3ab970f 100644
--- a/server/src/main/java/io/spine/server/entity/AbstractEntity.java
+++ b/server/src/main/java/io/spine/server/entity/AbstractEntity.java
@@ -22,6 +22,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
+import com.google.common.flogger.LogSite;
 import com.google.errorprone.annotations.concurrent.LazyInit;
 import com.google.protobuf.Any;
 import com.google.protobuf.Message;
@@ -34,13 +35,16 @@
 import io.spine.server.entity.model.EntityClass;
 import io.spine.server.entity.rejection.CannotModifyArchivedEntity;
 import io.spine.server.entity.rejection.CannotModifyDeletedEntity;
+import io.spine.server.model.HandlerMethod;
 import io.spine.string.Stringifiers;
 import io.spine.validate.ConstraintViolation;
 import io.spine.validate.Validate;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Function;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -61,7 +65,7 @@
             fields. See Effective Java 2nd Ed. Item #71. */,
         "AbstractClassWithoutAbstractMethods",
         "ClassWithTooManyMethods"})
-public abstract class AbstractEntity<I, S extends EntityState> implements Entity<I, S> {
+public abstract class AbstractEntity<I, S extends EntityState> implements Entity<I, S>, LoggingEntity {
 
     /**
      * Lazily initialized reference to the model class of this entity.
@@ -108,6 +112,8 @@ public abstract class AbstractEntity<I, S extends EntityState> implements Entity
      */
     private volatile boolean lifecycleFlagsChanged;
 
+    private @Nullable LogSite logSite;
+
     /**
      * Creates a new instance with the zero version and cleared lifecycle flags.
      *
@@ -508,6 +514,22 @@ public Timestamp whenModified() {
         return version.getTimestamp();
     }
 
+    @Override
+    public void resetLog() {
+        this.logSite = null;
+    }
+
+    @Override
+    public Optional<LogSite> handlerSite() {
+        return Optional.ofNullable(logSite);
+    }
+
+    @Override
+    public void enter(HandlerMethod<?, ?, ?, ?> method) {
+        checkNotNull(method);
+        this.logSite = new HandlerMethodSite(method);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
diff --git a/server/src/main/java/io/spine/server/entity/HandlerMethodSite.java b/server/src/main/java/io/spine/server/entity/HandlerMethodSite.java
index ecfe4759e14..9d6f5d080ef 100644
--- a/server/src/main/java/io/spine/server/entity/HandlerMethodSite.java
+++ b/server/src/main/java/io/spine/server/entity/HandlerMethodSite.java
@@ -24,6 +24,7 @@
 import com.google.common.flogger.LogSite;
 import com.google.errorprone.annotations.Immutable;
 import io.spine.code.java.ClassName;
+import io.spine.server.model.HandlerMethod;
 
 import java.lang.reflect.Method;
 import java.util.stream.Stream;
@@ -39,7 +40,12 @@ final class HandlerMethodSite extends LogSite {
     private final ClassName name;
     private final String methodName;
 
-    HandlerMethodSite(Method method) {
+    HandlerMethodSite(HandlerMethod<?, ?, ?, ?> method) {
+        this(method.rawMethod());
+    }
+
+    private HandlerMethodSite(Method method) {
+        super();
         checkNotNull(method);
         this.name = ClassName.of(method.getDeclaringClass());
         this.fileName = name.topLevelClass().value();
diff --git a/server/src/main/java/io/spine/server/entity/LoggingEntity.java b/server/src/main/java/io/spine/server/entity/LoggingEntity.java
new file mode 100644
index 00000000000..5e49664d778
--- /dev/null
+++ b/server/src/main/java/io/spine/server/entity/LoggingEntity.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2020, TeamDev. All rights reserved.
+ *
+ * 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.entity;
+
+import com.google.common.flogger.FluentLogger;
+import com.google.common.flogger.LogSite;
+import io.spine.logging.Logging;
+import io.spine.server.model.HandlerMethod;
+
+import java.util.Optional;
+
+public interface LoggingEntity extends Logging {
+
+    Optional<LogSite> handlerSite();
+
+    void enter(HandlerMethod<?, ?, ?, ?> method);
+
+    void resetLog();
+
+    @Override
+    default FluentLogger.Api _severe() {
+        FluentLogger.Api log = Logging.super._severe();
+        return handlerSite()
+                .map(log::withInjectedLogSite)
+                .orElse(log);
+    }
+
+    @Override
+    default FluentLogger.Api _error() {
+        FluentLogger.Api log = Logging.super._error();
+        return handlerSite()
+                .map(log::withInjectedLogSite)
+                .orElse(log);
+    }
+
+    @Override
+    default FluentLogger.Api _warn() {
+        FluentLogger.Api log = Logging.super._warn();
+        return handlerSite()
+                .map(log::withInjectedLogSite)
+                .orElse(log);
+    }
+
+    @Override
+    default FluentLogger.Api _info() {
+        FluentLogger.Api log = Logging.super._info();
+        return handlerSite()
+                .map(log::withInjectedLogSite)
+                .orElse(log);
+    }
+
+    @Override
+    default FluentLogger.Api _config() {
+        FluentLogger.Api log = Logging.super._config();
+        return handlerSite()
+                .map(log::withInjectedLogSite)
+                .orElse(log);
+    }
+
+    @Override
+    default FluentLogger.Api _fine() {
+        FluentLogger.Api log = Logging.super._fine();
+        return handlerSite()
+                .map(log::withInjectedLogSite)
+                .orElse(log);
+    }
+
+    @Override
+    default FluentLogger.Api _debug() {
+        FluentLogger.Api log = Logging.super._debug();
+        return handlerSite()
+                .map(log::withInjectedLogSite)
+                .orElse(log);
+    }
+
+    @Override
+    default FluentLogger.Api _finer() {
+        FluentLogger.Api log = Logging.super._finer();
+        return handlerSite()
+                .map(log::withInjectedLogSite)
+                .orElse(log);
+    }
+
+    @Override
+    default FluentLogger.Api _finest() {
+        FluentLogger.Api log = Logging.super._finest();
+        return handlerSite()
+                .map(log::withInjectedLogSite)
+                .orElse(log);
+    }
+
+    @Override
+    default FluentLogger.Api _trace() {
+        FluentLogger.Api log = Logging.super._trace();
+        return handlerSite()
+                .map(log::withInjectedLogSite)
+                .orElse(log);
+    }
+}
diff --git a/server/src/main/java/io/spine/server/model/AbstractHandlerMethod.java b/server/src/main/java/io/spine/server/model/AbstractHandlerMethod.java
index 4645ea0a2e6..522cd80ee49 100644
--- a/server/src/main/java/io/spine/server/model/AbstractHandlerMethod.java
+++ b/server/src/main/java/io/spine/server/model/AbstractHandlerMethod.java
@@ -29,6 +29,7 @@
 import io.spine.core.Signal;
 import io.spine.server.dispatch.DispatchOutcome;
 import io.spine.server.dispatch.Success;
+import io.spine.server.entity.LoggingEntity;
 import io.spine.server.type.MessageEnvelope;
 import io.spine.type.MessageClass;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -250,13 +251,12 @@ public DispatchOutcome invoke(T target, E envelope) {
         checkNotNull(envelope);
         checkAttributesMatch(envelope);
         MessageId signal = envelope.outerObject().messageId();
+        configureLog(target);
         DispatchOutcome.Builder outcome = DispatchOutcome
                 .newBuilder()
                 .setPropagatedSignal(signal);
         try {
-            Object[] arguments = parameterSpec.extractArguments(envelope);
-            Object rawOutput = method.invoke(target, arguments);
-            Success success = toSuccessfulOutcome(rawOutput, target, envelope);
+            Success success = doInvoke(target, envelope);
             outcome.setSuccess(success);
         } catch (IllegalOutcomeException e) {
             Error error = fromThrowable(e);
@@ -265,9 +265,7 @@ public DispatchOutcome invoke(T target, E envelope) {
             Throwable cause = e.getCause();
             checkNotNull(cause);
             if (cause instanceof ThrowableMessage) {
-                ThrowableMessage throwable = (ThrowableMessage) cause;
-                Optional<Success> maybeSuccess = handleRejection(throwable, target, envelope);
-                Success success = maybeSuccess.orElseThrow(this::cannotThrowRejections);
+                Success success = asRejection(target, envelope, cause);
                 outcome.setSuccess(success);
             } else {
                 Error error = causeOf(cause);
@@ -275,10 +273,39 @@ public DispatchOutcome invoke(T target, E envelope) {
             }
         } catch (IllegalArgumentException | IllegalAccessException e) {
             throw illegalStateWithCauseOf(e);
+        } finally {
+            resetLog(target);
         }
         return outcome.build();
     }
 
+    private Success doInvoke(T target, E envelope)
+            throws IllegalAccessException, InvocationTargetException {
+        Object[] arguments = parameterSpec.extractArguments(envelope);
+        Object rawOutput = method.invoke(target, arguments);
+        return toSuccessfulOutcome(rawOutput, target, envelope);
+    }
+
+    private Success asRejection(T target, E envelope, Throwable cause) {
+        ThrowableMessage throwable = (ThrowableMessage) cause;
+        Optional<Success> maybeSuccess = handleRejection(throwable, target, envelope);
+        return maybeSuccess.orElseThrow(this::cannotThrowRejections);
+    }
+
+    private void configureLog(T target) {
+        if (target instanceof LoggingEntity) {
+            LoggingEntity logging = (LoggingEntity) target;
+            logging.enter(this);
+        }
+    }
+
+    private void resetLog(T target) {
+        if (target instanceof LoggingEntity) {
+            LoggingEntity logging = (LoggingEntity) target;
+            logging.resetLog();
+        }
+    }
+
     private RuntimeException cannotThrowRejections() {
         String errorMessage = format("`%s` may not throw rejections.", this);
         return new IllegalOutcomeException(errorMessage);

From 0e930c6564fe883928ab2f03455c6ff2a9c70591 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 24 Feb 2020 18:56:04 +0200
Subject: [PATCH 03/32] Update config

---
 config            |  2 +-
 license-report.md | 32 ++++++++++++++++----------------
 pom.xml           |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/config b/config
index 2f239bb2534..d1b59186a3d 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit 2f239bb25349e117902a8a0d0b1df57d2a7d48f9
+Subproject commit d1b59186a3d2b4c0cfcc0a5f55c1578909d2e931
diff --git a/license-report.md b/license-report.md
index c1e95d419c7..63d88726d9b 100644
--- a/license-report.md
+++ b/license-report.md
@@ -191,7 +191,7 @@
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -415,7 +415,7 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Wed Feb 19 16:08:16 EET 2020** 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 Feb 24 18:36:48 EET 2020** 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).
 
 
 
@@ -567,7 +567,7 @@ This report was generated on **Wed Feb 19 16:08:16 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -791,7 +791,7 @@ This report was generated on **Wed Feb 19 16:08:16 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Wed Feb 19 16:08:16 EET 2020** 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 Feb 24 18:36:48 EET 2020** 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).
 
 
 
@@ -987,7 +987,7 @@ This report was generated on **Wed Feb 19 16:08:16 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -1206,7 +1206,7 @@ This report was generated on **Wed Feb 19 16:08:16 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Wed Feb 19 16:08:17 EET 2020** 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 Feb 24 18:36:49 EET 2020** 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).
 
 
 
@@ -1438,7 +1438,7 @@ This report was generated on **Wed Feb 19 16:08:17 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -1681,7 +1681,7 @@ This report was generated on **Wed Feb 19 16:08:17 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Wed Feb 19 16:08:17 EET 2020** 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 Feb 24 18:36:49 EET 2020** 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).
 
 
 
@@ -1885,7 +1885,7 @@ This report was generated on **Wed Feb 19 16:08:17 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -2113,7 +2113,7 @@ This report was generated on **Wed Feb 19 16:08:17 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Wed Feb 19 16:08:18 EET 2020** 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 Feb 24 18:36:50 EET 2020** 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).
 
 
 
@@ -2367,7 +2367,7 @@ This report was generated on **Wed Feb 19 16:08:18 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -2586,7 +2586,7 @@ This report was generated on **Wed Feb 19 16:08:18 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Wed Feb 19 16:08:21 EET 2020** 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 Feb 24 18:36:52 EET 2020** 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).
 
 
 
@@ -2848,7 +2848,7 @@ This report was generated on **Wed Feb 19 16:08:21 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -3067,7 +3067,7 @@ This report was generated on **Wed Feb 19 16:08:21 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Wed Feb 19 16:08:22 EET 2020** 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 Feb 24 18:36:53 EET 2020** 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).
 
 
 
@@ -3321,7 +3321,7 @@ This report was generated on **Wed Feb 19 16:08:22 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -3584,4 +3584,4 @@ This report was generated on **Wed Feb 19 16:08:22 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Wed Feb 19 16:08:26 EET 2020** 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).
\ No newline at end of file
+This report was generated on **Mon Feb 24 18:36:56 EET 2020** 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).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 436f588c7e0..5b5b069f33b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protoc</artifactId>
-    <version>3.11.3</version>
+    <version>3.11.1</version>
   </dependency>
   <dependency>
     <groupId>io.grpc</groupId>

From 4b454f2623cf4d3805b3316057eadfb3c630f62f Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Tue, 25 Feb 2020 15:10:33 +0200
Subject: [PATCH 04/32] Remove unnecessary stack trace

---
 .../io/spine/testing/server/blackbox/DiagnosticLog.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/DiagnosticLog.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/DiagnosticLog.java
index 91241e27e61..1de167fb8d6 100644
--- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/DiagnosticLog.java
+++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/DiagnosticLog.java
@@ -20,7 +20,8 @@
 
 package io.spine.testing.server.blackbox;
 
-import com.google.common.flogger.FluentLogger;
+import com.google.common.flogger.FluentLogger.Api;
+import com.google.common.flogger.StackSize;
 import com.google.errorprone.annotations.FormatMethod;
 import com.google.errorprone.annotations.FormatString;
 import io.spine.base.EventMessage;
@@ -128,7 +129,9 @@ void on(AggregateHistoryCorrupted event) {
     @FormatMethod
     private void log(EventMessage event, @FormatString String errorMessage, Object... formatArgs) {
         String msg = format(errorMessage, formatArgs);
-        FluentLogger.Api severeLogger = logger().atSevere();
+        Api severeLogger = logger()
+                .atSevere()
+                .withStackTrace(StackSize.NONE);
         boolean loggingEnabled = severeLogger.isEnabled();
         if (loggingEnabled) {
             severeLogger.log(msg);

From eb726f4778a03a284fdb0e478512ae439cc614df Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Tue, 25 Feb 2020 17:49:35 +0200
Subject: [PATCH 05/32] Update base version

---
 license-report.md | 48 +++++++++++++++++++++++------------------------
 pom.xml           | 20 ++++++++++----------
 version.gradle    |  4 ++--
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/license-report.md b/license-report.md
index 63d88726d9b..2c47aa95113 100644
--- a/license-report.md
+++ b/license-report.md
@@ -1,6 +1,6 @@
 
     
-# Dependencies of `io.spine:spine-client:1.4.7`
+# Dependencies of `io.spine:spine-client:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -191,7 +191,7 @@
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -415,12 +415,12 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Feb 24 18:36:48 EET 2020** 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 **Tue Feb 25 17:48:18 EET 2020** 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:1.4.7`
+# Dependencies of `io.spine:spine-core:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
@@ -567,7 +567,7 @@ This report was generated on **Mon Feb 24 18:36:48 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -791,12 +791,12 @@ This report was generated on **Mon Feb 24 18:36:48 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Feb 24 18:36:48 EET 2020** 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 **Tue Feb 25 17:48:18 EET 2020** 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:1.4.7`
+# Dependencies of `io.spine.tools:spine-model-assembler:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -987,7 +987,7 @@ This report was generated on **Mon Feb 24 18:36:48 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -1206,12 +1206,12 @@ This report was generated on **Mon Feb 24 18:36:48 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Feb 24 18:36:49 EET 2020** 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 **Tue Feb 25 17:48:19 EET 2020** 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:1.4.7`
+# Dependencies of `io.spine.tools:spine-model-verifier:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -1438,7 +1438,7 @@ This report was generated on **Mon Feb 24 18:36:49 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -1681,12 +1681,12 @@ This report was generated on **Mon Feb 24 18:36:49 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Feb 24 18:36:49 EET 2020** 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 **Tue Feb 25 17:48:19 EET 2020** 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:1.4.7`
+# Dependencies of `io.spine:spine-server:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -1885,7 +1885,7 @@ This report was generated on **Mon Feb 24 18:36:49 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -2113,12 +2113,12 @@ This report was generated on **Mon Feb 24 18:36:49 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Feb 24 18:36:50 EET 2020** 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 **Tue Feb 25 17:48:20 EET 2020** 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-testutil-client:1.4.7`
+# Dependencies of `io.spine:spine-testutil-client:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -2367,7 +2367,7 @@ This report was generated on **Mon Feb 24 18:36:50 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -2586,12 +2586,12 @@ This report was generated on **Mon Feb 24 18:36:50 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Feb 24 18:36:52 EET 2020** 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 **Tue Feb 25 17:48:22 EET 2020** 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-testutil-core:1.4.7`
+# Dependencies of `io.spine:spine-testutil-core:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -2848,7 +2848,7 @@ This report was generated on **Mon Feb 24 18:36:52 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -3067,12 +3067,12 @@ This report was generated on **Mon Feb 24 18:36:52 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Feb 24 18:36:53 EET 2020** 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 **Tue Feb 25 17:48:24 EET 2020** 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-testutil-server:1.4.7`
+# Dependencies of `io.spine:spine-testutil-server:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -3321,7 +3321,7 @@ This report was generated on **Mon Feb 24 18:36:53 EET 2020** using [Gradle-Lice
      * **Manifest Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
 
-1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.1
+1. **Group:** com.google.protobuf **Name:** protoc **Version:** 3.11.3
      * **POM Project URL:** [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
      * **POM License: 3-Clause BSD License** - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)
      * **POM License: The Apache Software License, Version 2.0** - [http://www.apache.org/licenses/LICENSE-2.0.txt](http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -3584,4 +3584,4 @@ This report was generated on **Mon Feb 24 18:36:53 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Feb 24 18:36:56 EET 2020** 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).
\ No newline at end of file
+This report was generated on **Tue Feb 25 17:48:26 EET 2020** 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).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5b5b069f33b..3f384c614a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@ all modules and does not describe the project structure per-subproject.
 
 <groupId>io.spine</groupId>
 <artifactId>spine-core-java</artifactId>
-<version>1.4.7</version>
+<version>1.4.8</version>
 
 <inceptionYear>2015</inceptionYear>
 
@@ -70,7 +70,7 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine</groupId>
     <artifactId>spine-base</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.8</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
@@ -82,13 +82,13 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-model-compiler</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.8</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-plugin-base</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.8</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
@@ -130,7 +130,7 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine</groupId>
     <artifactId>spine-testlib</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.8</version>
     <scope>test</scope>
   </dependency>
   <dependency>
@@ -142,13 +142,13 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-mute-logging</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.8</version>
     <scope>test</scope>
   </dependency>
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-plugin-testlib</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.8</version>
     <scope>test</scope>
   </dependency>
   <dependency>
@@ -200,7 +200,7 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protoc</artifactId>
-    <version>3.11.1</version>
+    <version>3.11.3</version>
   </dependency>
   <dependency>
     <groupId>io.grpc</groupId>
@@ -210,12 +210,12 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-javadoc-filter</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.8</version>
   </dependency>
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-protoc-plugin</artifactId>
-    <version>1.4.5</version>
+    <version>1.4.8</version>
   </dependency>
   <dependency>
     <groupId>net.sourceforge.pmd</groupId>
diff --git a/version.gradle b/version.gradle
index 750a6a31893..dac82b689e0 100644
--- a/version.gradle
+++ b/version.gradle
@@ -25,14 +25,14 @@
  * as we want to manage the versions in a single source.
  */
 
-final def spineVersion = '1.4.7'
+final def spineVersion = '1.4.8'
 
 ext {
     // The version of the modules in this project.
     versionToPublish = spineVersion
 
     // Depend on `base` for the general definitions and a model compiler.
-    spineBaseVersion = '1.4.5'
+    spineBaseVersion = '1.4.8'
 
     // Depend on `time` for `ZoneId`, `ZoneOffset` and other date/time types and utilities.
     spineTimeVersion = '1.4.1'

From b6beb0600548e8fcbf829a972a701a68e016b569 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Thu, 27 Feb 2020 19:30:31 +0200
Subject: [PATCH 06/32] Extract handler logging into a separate API

---
 license-report.md                             | 16 +++----
 .../spine/server/entity/AbstractEntity.java   | 38 +++++++++------
 .../java/io/spine/server/log/HandlerLog.java  | 46 +++++++++++++++++++
 .../{entity => log}/HandlerMethodSite.java    | 42 ++++++++---------
 .../server/log/LogAwareMessageHandler.java    | 34 ++++++++++++++
 .../io/spine/server/log/package-info.java     | 27 +++++++++++
 .../server/model/AbstractHandlerMethod.java   | 27 ++++-------
 7 files changed, 170 insertions(+), 60 deletions(-)
 create mode 100644 server/src/main/java/io/spine/server/log/HandlerLog.java
 rename server/src/main/java/io/spine/server/{entity => log}/HandlerMethodSite.java (73%)
 create mode 100644 server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java
 create mode 100644 server/src/main/java/io/spine/server/log/package-info.java

diff --git a/license-report.md b/license-report.md
index 2c47aa95113..ba3d10413f4 100644
--- a/license-report.md
+++ b/license-report.md
@@ -415,7 +415,7 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Feb 25 17:48:18 EET 2020** 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 **Thu Feb 27 19:27:33 EET 2020** 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).
 
 
 
@@ -791,7 +791,7 @@ This report was generated on **Tue Feb 25 17:48:18 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Feb 25 17:48:18 EET 2020** 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 **Thu Feb 27 19:27:34 EET 2020** 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).
 
 
 
@@ -1206,7 +1206,7 @@ This report was generated on **Tue Feb 25 17:48:18 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Feb 25 17:48:19 EET 2020** 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 **Thu Feb 27 19:27:35 EET 2020** 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).
 
 
 
@@ -1681,7 +1681,7 @@ This report was generated on **Tue Feb 25 17:48:19 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Feb 25 17:48:19 EET 2020** 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 **Thu Feb 27 19:27:35 EET 2020** 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).
 
 
 
@@ -2113,7 +2113,7 @@ This report was generated on **Tue Feb 25 17:48:19 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Feb 25 17:48:20 EET 2020** 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 **Thu Feb 27 19:27:36 EET 2020** 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).
 
 
 
@@ -2586,7 +2586,7 @@ This report was generated on **Tue Feb 25 17:48:20 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Feb 25 17:48:22 EET 2020** 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 **Thu Feb 27 19:27:39 EET 2020** 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).
 
 
 
@@ -3067,7 +3067,7 @@ This report was generated on **Tue Feb 25 17:48:22 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Feb 25 17:48:24 EET 2020** 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 **Thu Feb 27 19:27:40 EET 2020** 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).
 
 
 
@@ -3584,4 +3584,4 @@ This report was generated on **Tue Feb 25 17:48:24 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Feb 25 17:48:26 EET 2020** 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).
\ No newline at end of file
+This report was generated on **Thu Feb 27 19:27:43 EET 2020** 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).
\ No newline at end of file
diff --git a/server/src/main/java/io/spine/server/entity/AbstractEntity.java b/server/src/main/java/io/spine/server/entity/AbstractEntity.java
index 60df3ab970f..92ee4f0fe5b 100644
--- a/server/src/main/java/io/spine/server/entity/AbstractEntity.java
+++ b/server/src/main/java/io/spine/server/entity/AbstractEntity.java
@@ -22,7 +22,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
-import com.google.common.flogger.LogSite;
+import com.google.common.flogger.FluentLogger;
 import com.google.errorprone.annotations.concurrent.LazyInit;
 import com.google.protobuf.Any;
 import com.google.protobuf.Message;
@@ -32,9 +32,13 @@
 import io.spine.base.Identifier;
 import io.spine.core.Version;
 import io.spine.core.Versions;
+import io.spine.logging.Logging;
 import io.spine.server.entity.model.EntityClass;
 import io.spine.server.entity.rejection.CannotModifyArchivedEntity;
 import io.spine.server.entity.rejection.CannotModifyDeletedEntity;
+import io.spine.server.log.HandlerLog;
+import io.spine.server.log.HandlerMethodSite;
+import io.spine.server.log.LogAwareMessageHandler;
 import io.spine.server.model.HandlerMethod;
 import io.spine.string.Stringifiers;
 import io.spine.validate.ConstraintViolation;
@@ -44,11 +48,11 @@
 
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.function.Function;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
+import static io.spine.logging.Logging.loggerFor;
 import static io.spine.util.Exceptions.newIllegalArgumentException;
 import static io.spine.validate.Validate.checkValid;
 
@@ -63,9 +67,8 @@
 @SuppressWarnings({
         "SynchronizeOnThis" /* This class uses double-check idiom for lazy init of some
             fields. See Effective Java 2nd Ed. Item #71. */,
-        "AbstractClassWithoutAbstractMethods",
         "ClassWithTooManyMethods"})
-public abstract class AbstractEntity<I, S extends EntityState> implements Entity<I, S>, LoggingEntity {
+public abstract class AbstractEntity<I, S extends EntityState> implements Entity<I, S>, LogAwareMessageHandler {
 
     /**
      * Lazily initialized reference to the model class of this entity.
@@ -112,7 +115,7 @@ public abstract class AbstractEntity<I, S extends EntityState> implements Entity
      */
     private volatile boolean lifecycleFlagsChanged;
 
-    private @Nullable LogSite logSite;
+    private @Nullable HandlerLog handlerLog;
 
     /**
      * Creates a new instance with the zero version and cleared lifecycle flags.
@@ -515,19 +518,28 @@ public Timestamp whenModified() {
     }
 
     @Override
-    public void resetLog() {
-        this.logSite = null;
+    @Internal
+    public final void enter(HandlerMethod<?, ?, ?, ?> method) {
+        checkNotNull(method);
+        FluentLogger logger = loggerFor(getClass());
+        HandlerMethodSite site = new HandlerMethodSite(method);
+        this.handlerLog = new HandlerLog(logger, site);
     }
 
+    @Internal
     @Override
-    public Optional<LogSite> handlerSite() {
-        return Optional.ofNullable(logSite);
+    public void resetLog() {
+        this.handlerLog = null;
     }
 
-    @Override
-    public void enter(HandlerMethod<?, ?, ?, ?> method) {
-        checkNotNull(method);
-        this.logSite = new HandlerMethodSite(method);
+    protected final HandlerLog log() {
+        checkState(handlerLog != null,
+                   "Unable to get a handler log for `%s`." +
+                           "A handler log is available only in message handler methods. " +
+                           "Use `%s` instead.",
+                   getClass().getSimpleName(),
+                   Logging.class.getName());
+        return handlerLog;
     }
 
     @Override
diff --git a/server/src/main/java/io/spine/server/log/HandlerLog.java b/server/src/main/java/io/spine/server/log/HandlerLog.java
new file mode 100644
index 00000000000..87461bd34ec
--- /dev/null
+++ b/server/src/main/java/io/spine/server/log/HandlerLog.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020, TeamDev. All rights reserved.
+ *
+ * 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.log;
+
+import com.google.common.flogger.FluentLogger;
+import com.google.common.flogger.LogSite;
+
+import java.util.logging.Level;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.flogger.StackSize.SMALL;
+
+public final class HandlerLog {
+
+    private final FluentLogger logger;
+    private final LogSite logSite;
+
+    public HandlerLog(FluentLogger logger, LogSite logSite) {
+        this.logger = checkNotNull(logger);
+        this.logSite = checkNotNull(logSite);
+    }
+
+    public FluentLogger.Api at(Level level) {
+        return logger.at(level)
+                     .withStackTrace(SMALL)
+                     .withInjectedLogSite(logSite);
+    }
+}
diff --git a/server/src/main/java/io/spine/server/entity/HandlerMethodSite.java b/server/src/main/java/io/spine/server/log/HandlerMethodSite.java
similarity index 73%
rename from server/src/main/java/io/spine/server/entity/HandlerMethodSite.java
rename to server/src/main/java/io/spine/server/log/HandlerMethodSite.java
index 9d6f5d080ef..46d75e57fb4 100644
--- a/server/src/main/java/io/spine/server/entity/HandlerMethodSite.java
+++ b/server/src/main/java/io/spine/server/log/HandlerMethodSite.java
@@ -18,12 +18,14 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.spine.server.entity;
+package io.spine.server.log;
 
 import com.google.common.base.Objects;
 import com.google.common.flogger.LogSite;
 import com.google.errorprone.annotations.Immutable;
+import io.spine.annotation.Internal;
 import io.spine.code.java.ClassName;
+import io.spine.code.java.SimpleClassName;
 import io.spine.server.model.HandlerMethod;
 
 import java.lang.reflect.Method;
@@ -33,35 +35,31 @@
 import static java.lang.String.format;
 import static java.util.stream.Collectors.joining;
 
+@Internal
 @Immutable
-final class HandlerMethodSite extends LogSite {
+public final class HandlerMethodSite extends LogSite {
 
-    private final String fileName;
-    private final ClassName name;
-    private final String methodName;
+    @SuppressWarnings("Immutable")
+    private final Method method;
 
-    HandlerMethodSite(HandlerMethod<?, ?, ?, ?> method) {
-        this(method.rawMethod());
-    }
-
-    private HandlerMethodSite(Method method) {
+    public HandlerMethodSite(HandlerMethod<?, ?, ?, ?> method) {
         super();
         checkNotNull(method);
-        this.name = ClassName.of(method.getDeclaringClass());
-        this.fileName = name.topLevelClass().value();
-        String params = Stream.of(method.getParameterTypes())
-                              .map(Class::getSimpleName)
-                              .collect(joining(", "));
-        this.methodName = format("%s(%s)", method.getName(), params);
+        this.method = method.rawMethod();
     }
 
     @Override
     public String getClassName() {
-        return name.canonicalName();
+        return method.getDeclaringClass()
+                     .getName();
     }
 
     @Override
     public String getMethodName() {
+        String params = Stream.of(method.getParameterTypes())
+                              .map(Class::getSimpleName)
+                              .collect(joining(", "));
+        String methodName = format("%s(%s)", method.getName(), params);
         return methodName;
     }
 
@@ -72,7 +70,9 @@ public int getLineNumber() {
 
     @Override
     public String getFileName() {
-        return fileName;
+        SimpleClassName className = ClassName.of(method.getDeclaringClass())
+                                        .topLevelClass();
+        return className.value() + ".java";
     }
 
     @Override
@@ -84,13 +84,11 @@ public boolean equals(Object o) {
             return false;
         }
         HandlerMethodSite site = (HandlerMethodSite) o;
-        return Objects.equal(getFileName(), site.getFileName()) &&
-                Objects.equal(name, site.name) &&
-                Objects.equal(getMethodName(), site.getMethodName());
+        return Objects.equal(method, site.method);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(getFileName(), name, getMethodName());
+        return Objects.hashCode(method);
     }
 }
diff --git a/server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java b/server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java
new file mode 100644
index 00000000000..9e272b5e12d
--- /dev/null
+++ b/server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020, TeamDev. All rights reserved.
+ *
+ * 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.log;
+
+import io.spine.annotation.Internal;
+import io.spine.server.model.HandlerMethod;
+
+@Internal
+public interface LogAwareMessageHandler {
+
+    @Internal
+    void enter(HandlerMethod<?, ?, ?, ?> method);
+
+    @Internal
+    void resetLog();
+}
diff --git a/server/src/main/java/io/spine/server/log/package-info.java b/server/src/main/java/io/spine/server/log/package-info.java
new file mode 100644
index 00000000000..bb1efee08e6
--- /dev/null
+++ b/server/src/main/java/io/spine/server/log/package-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020, TeamDev. All rights reserved.
+ *
+ * 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.
+ */
+
+@CheckReturnValue
+@ParametersAreNonnullByDefault
+package io.spine.server.log;
+
+import com.google.errorprone.annotations.CheckReturnValue;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/src/main/java/io/spine/server/model/AbstractHandlerMethod.java b/server/src/main/java/io/spine/server/model/AbstractHandlerMethod.java
index 522cd80ee49..e3cf686c482 100644
--- a/server/src/main/java/io/spine/server/model/AbstractHandlerMethod.java
+++ b/server/src/main/java/io/spine/server/model/AbstractHandlerMethod.java
@@ -29,7 +29,7 @@
 import io.spine.core.Signal;
 import io.spine.server.dispatch.DispatchOutcome;
 import io.spine.server.dispatch.Success;
-import io.spine.server.entity.LoggingEntity;
+import io.spine.server.log.LogAwareMessageHandler;
 import io.spine.server.type.MessageEnvelope;
 import io.spine.type.MessageClass;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -251,10 +251,15 @@ public DispatchOutcome invoke(T target, E envelope) {
         checkNotNull(envelope);
         checkAttributesMatch(envelope);
         MessageId signal = envelope.outerObject().messageId();
-        configureLog(target);
         DispatchOutcome.Builder outcome = DispatchOutcome
                 .newBuilder()
                 .setPropagatedSignal(signal);
+        LogAwareMessageHandler asLogAware = target instanceof LogAwareMessageHandler
+                                            ? (LogAwareMessageHandler) target
+                                            : null;
+        if (asLogAware != null) {
+            asLogAware.enter(this);
+        }
         try {
             Success success = doInvoke(target, envelope);
             outcome.setSuccess(success);
@@ -274,7 +279,9 @@ public DispatchOutcome invoke(T target, E envelope) {
         } catch (IllegalArgumentException | IllegalAccessException e) {
             throw illegalStateWithCauseOf(e);
         } finally {
-            resetLog(target);
+            if (asLogAware != null) {
+                asLogAware.resetLog();
+            }
         }
         return outcome.build();
     }
@@ -292,20 +299,6 @@ private Success asRejection(T target, E envelope, Throwable cause) {
         return maybeSuccess.orElseThrow(this::cannotThrowRejections);
     }
 
-    private void configureLog(T target) {
-        if (target instanceof LoggingEntity) {
-            LoggingEntity logging = (LoggingEntity) target;
-            logging.enter(this);
-        }
-    }
-
-    private void resetLog(T target) {
-        if (target instanceof LoggingEntity) {
-            LoggingEntity logging = (LoggingEntity) target;
-            logging.resetLog();
-        }
-    }
-
     private RuntimeException cannotThrowRejections() {
         String errorMessage = format("`%s` may not throw rejections.", this);
         return new IllegalOutcomeException(errorMessage);

From 7b51242b948131242c492f6355d67ebdb2008bd5 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Fri, 28 Feb 2020 13:00:00 +0200
Subject: [PATCH 07/32] Update Gradle

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 58702 -> 58695 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index cc4fdc293d0e50b0ad9b65c16e7ddd1db2f6025b..f3d88b1c2faf2fc91d853cd5d4242b5547257070 100644
GIT binary patch
delta 12333
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

delta 12451
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ba94df8451f..4a6ebceacd2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 08745a6e4f52d44ed58ee73699a96fd942d59d86 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Fri, 28 Feb 2020 15:45:07 +0200
Subject: [PATCH 08/32] Add a test env for the handler log tests

---
 license-report.md                             |  16 +--
 .../java/io/spine/server/log/given/Books.java |  77 +++++++++++
 .../spine/server/log/given/CardAggregate.java | 126 ++++++++++++++++++
 .../server/log/given/CardRepository.java      |  39 ++++++
 .../server/log/given/TestLogHandler.java      |  50 +++++++
 .../spine/server/log/given/package-info.java  |  27 ++++
 .../test/proto/spine/test/library/card.proto  |  40 ++++++
 .../proto/spine/test/library/commands.proto   |  21 +++
 .../proto/spine/test/library/events.proto     |  22 +++
 .../proto/spine/test/library/rejections.proto |  15 +++
 10 files changed, 425 insertions(+), 8 deletions(-)
 create mode 100644 server/src/test/java/io/spine/server/log/given/Books.java
 create mode 100644 server/src/test/java/io/spine/server/log/given/CardAggregate.java
 create mode 100644 server/src/test/java/io/spine/server/log/given/CardRepository.java
 create mode 100644 server/src/test/java/io/spine/server/log/given/TestLogHandler.java
 create mode 100644 server/src/test/java/io/spine/server/log/given/package-info.java
 create mode 100644 server/src/test/proto/spine/test/library/card.proto
 create mode 100644 server/src/test/proto/spine/test/library/commands.proto
 create mode 100644 server/src/test/proto/spine/test/library/events.proto
 create mode 100644 server/src/test/proto/spine/test/library/rejections.proto

diff --git a/license-report.md b/license-report.md
index ba3d10413f4..44471d803ea 100644
--- a/license-report.md
+++ b/license-report.md
@@ -415,7 +415,7 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Feb 27 19:27:33 EET 2020** 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 **Fri Feb 28 15:09:56 EET 2020** 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).
 
 
 
@@ -791,7 +791,7 @@ This report was generated on **Thu Feb 27 19:27:33 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Feb 27 19:27:34 EET 2020** 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 **Fri Feb 28 15:09:57 EET 2020** 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).
 
 
 
@@ -1206,7 +1206,7 @@ This report was generated on **Thu Feb 27 19:27:34 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Feb 27 19:27:35 EET 2020** 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 **Fri Feb 28 15:09:57 EET 2020** 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).
 
 
 
@@ -1681,7 +1681,7 @@ This report was generated on **Thu Feb 27 19:27:35 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Feb 27 19:27:35 EET 2020** 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 **Fri Feb 28 15:09:58 EET 2020** 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).
 
 
 
@@ -2113,7 +2113,7 @@ This report was generated on **Thu Feb 27 19:27:35 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Feb 27 19:27:36 EET 2020** 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 **Fri Feb 28 15:09:58 EET 2020** 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).
 
 
 
@@ -2586,7 +2586,7 @@ This report was generated on **Thu Feb 27 19:27:36 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Feb 27 19:27:39 EET 2020** 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 **Fri Feb 28 15:10:01 EET 2020** 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).
 
 
 
@@ -3067,7 +3067,7 @@ This report was generated on **Thu Feb 27 19:27:39 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Feb 27 19:27:40 EET 2020** 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 **Fri Feb 28 15:10:03 EET 2020** 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).
 
 
 
@@ -3584,4 +3584,4 @@ This report was generated on **Thu Feb 27 19:27:40 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Feb 27 19:27:43 EET 2020** 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).
\ No newline at end of file
+This report was generated on **Fri Feb 28 15:10:07 EET 2020** 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).
\ No newline at end of file
diff --git a/server/src/test/java/io/spine/server/log/given/Books.java b/server/src/test/java/io/spine/server/log/given/Books.java
new file mode 100644
index 00000000000..9bb565c5ca2
--- /dev/null
+++ b/server/src/test/java/io/spine/server/log/given/Books.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2020, TeamDev. All rights reserved.
+ *
+ * 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.log.given;
+
+import io.spine.people.PersonName;
+import io.spine.server.log.Book;
+import io.spine.server.log.Isbn;
+
+public final class Books {
+
+    public static final Isbn BIG_BLUE_BOOK = isbn("978-0321125217");
+    public static final Isbn BIG_RED_BOOK = isbn("978-0321834577");
+    public static final Isbn SMALL_GREEN_BOOK = isbn("978-0134434421");
+
+    private static final String PUBLISHER = "A-W";
+
+    /**
+     * Prevents the utility class instantiation.
+     */
+    private Books() {
+    }
+
+    public static Book domainDrivenDesign() {
+        return Book
+                .newBuilder()
+                .setIsbn(BIG_BLUE_BOOK)
+                .setTitle("Domain-Driven Design")
+                .addAuthor(PersonName.newBuilder().setGivenName("Eric"))
+                .setPublisher(PUBLISHER)
+                .vBuild();
+    }
+
+    public static Book implementingDdd() {
+        return Book
+                .newBuilder()
+                .setIsbn(BIG_BLUE_BOOK)
+                .setTitle("Implementing DDD")
+                .addAuthor(PersonName.newBuilder().setGivenName("Vaughn"))
+                .setPublisher(PUBLISHER)
+                .vBuild();
+    }
+
+    public static Book dddDistilled() {
+        return Book
+                .newBuilder()
+                .setIsbn(BIG_BLUE_BOOK)
+                .setTitle("DDD Distilled")
+                .addAuthor(PersonName.newBuilder().setGivenName("Vaughn"))
+                .setPublisher(PUBLISHER)
+                .vBuild();
+    }
+
+    private static Isbn isbn(String value) {
+        return Isbn
+                .newBuilder()
+                .setValue(value)
+                .build();
+    }
+}
diff --git a/server/src/test/java/io/spine/server/log/given/CardAggregate.java b/server/src/test/java/io/spine/server/log/given/CardAggregate.java
new file mode 100644
index 00000000000..d48b39d7bc7
--- /dev/null
+++ b/server/src/test/java/io/spine/server/log/given/CardAggregate.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2020, TeamDev. All rights reserved.
+ *
+ * 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.log.given;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.spine.people.PersonName;
+import io.spine.server.aggregate.Aggregate;
+import io.spine.server.aggregate.Apply;
+import io.spine.server.command.Assign;
+import io.spine.server.log.Book;
+import io.spine.server.log.BookReturned;
+import io.spine.server.log.BooksBorrowed;
+import io.spine.server.log.BorrowBooks;
+import io.spine.server.log.Isbn;
+import io.spine.server.log.LibraryCard;
+import io.spine.server.log.LibraryCardId;
+import io.spine.server.log.ReturnBook;
+import io.spine.server.log.UnknownBook;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static io.spine.server.log.given.Books.BIG_BLUE_BOOK;
+import static io.spine.server.log.given.Books.BIG_RED_BOOK;
+import static io.spine.server.log.given.Books.SMALL_GREEN_BOOK;
+import static io.spine.server.log.given.Books.dddDistilled;
+import static io.spine.server.log.given.Books.domainDrivenDesign;
+import static io.spine.server.log.given.Books.implementingDdd;
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.SEVERE;
+import static java.util.logging.Level.WARNING;
+
+public final class CardAggregate
+        extends Aggregate<LibraryCardId, LibraryCard, LibraryCard.Builder> {
+
+    private static final ImmutableMap<Isbn, Book> knownBooks = ImmutableMap.of(
+            BIG_BLUE_BOOK, domainDrivenDesign(),
+            BIG_RED_BOOK, implementingDdd(),
+            SMALL_GREEN_BOOK, dddDistilled()
+    );
+
+    @Assign
+    BooksBorrowed handle(BorrowBooks command) throws UnknownBook {
+        BooksBorrowed.Builder event = BooksBorrowed
+                .newBuilder()
+                .setCard(id());
+        List<Isbn> unknownBooks = new ArrayList<>();
+        for (Isbn bookId : command.getBookIdList()) {
+            Book book = knownBooks.get(bookId);
+            if (book != null) {
+                event.addBook(book);
+                List<PersonName> authors = book.getAuthorList();
+                PersonName firstAuthor = authors.get(0);
+                log().at(FINE)
+                     .log("Adding to order: %s by %s %s",
+                          book.getTitle(), firstAuthor.getGivenName(), firstAuthor.getFamilyName());
+            } else {
+                log().at(WARNING)
+                     .log("Cannot lend an unknown book. ISBN: `%s`", bookId.getValue());
+                unknownBooks.add(bookId);
+            }
+        }
+        if (!unknownBooks.isEmpty()) {
+            throw UnknownBook
+                    .newBuilder()
+                    .addAllBook(unknownBooks)
+                    .build();
+        } else {
+            return event.vBuild();
+        }
+    }
+
+    @Assign
+    BookReturned handle(ReturnBook command) throws UnknownBook {
+        Isbn isbn = command.getBook();
+        Book book = knownBooks.get(isbn);
+        if (book != null) {
+            UnknownBook rejection = UnknownBook
+                    .newBuilder()
+                    .addAllBook(ImmutableList.of(isbn))
+                    .build();
+            log().at(SEVERE)
+                 .withCause(rejection)
+                 .log("Cannot return an unknown book. ISBN: `%s`", isbn.getValue());
+            throw rejection;
+        } else {
+            return BookReturned
+                    .newBuilder()
+                    .setCard(id())
+                    .setBook(book)
+                    .vBuild();
+        }
+    }
+
+    @Apply
+    private void on(BooksBorrowed event) {
+        builder().addAllBook(event.getBookList());
+    }
+
+    @Apply
+    private void on(BookReturned event) {
+        List<Book> list = builder().getBookList();
+        Book book = event.getBook();
+        int bookIndex = list.indexOf(book);
+        builder().removeBook(bookIndex);
+    }
+}
diff --git a/server/src/test/java/io/spine/server/log/given/CardRepository.java b/server/src/test/java/io/spine/server/log/given/CardRepository.java
new file mode 100644
index 00000000000..0f37a5a8c2b
--- /dev/null
+++ b/server/src/test/java/io/spine/server/log/given/CardRepository.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2020, TeamDev. All rights reserved.
+ *
+ * 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.log.given;
+
+import io.spine.server.aggregate.AggregateRepository;
+import io.spine.server.log.BorrowBooks;
+import io.spine.server.log.LibraryCardId;
+import io.spine.server.route.CommandRouting;
+
+public final class CardRepository extends AggregateRepository<LibraryCardId, CardAggregate> {
+
+    @Override
+    protected void setupCommandRouting(CommandRouting<LibraryCardId> routing) {
+        super.setupCommandRouting(routing);
+        routing.route(BorrowBooks.class,
+                      (message, context) -> LibraryCardId
+                              .newBuilder()
+                              .setReader(context.getActorContext().getActor())
+                              .build());
+    }
+}
diff --git a/server/src/test/java/io/spine/server/log/given/TestLogHandler.java b/server/src/test/java/io/spine/server/log/given/TestLogHandler.java
new file mode 100644
index 00000000000..6bb09bbe1a3
--- /dev/null
+++ b/server/src/test/java/io/spine/server/log/given/TestLogHandler.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020, TeamDev. All rights reserved.
+ *
+ * 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.log.given;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Handler;
+import java.util.logging.LogRecord;
+
+public class TestLogHandler extends Handler {
+
+    private final List<LogRecord> records = new ArrayList<>();
+
+    public ImmutableList<LogRecord> records() {
+        return ImmutableList.copyOf(records);
+    }
+
+    @Override
+    public void publish(LogRecord record) {
+        records.add(record);
+    }
+
+    @Override
+    public void flush() {
+    }
+
+    @Override
+    public void close() throws SecurityException {
+    }
+}
diff --git a/server/src/test/java/io/spine/server/log/given/package-info.java b/server/src/test/java/io/spine/server/log/given/package-info.java
new file mode 100644
index 00000000000..a82ffd855f6
--- /dev/null
+++ b/server/src/test/java/io/spine/server/log/given/package-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020, TeamDev. All rights reserved.
+ *
+ * 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.
+ */
+
+@CheckReturnValue
+@ParametersAreNonnullByDefault
+package io.spine.server.log.given;
+
+import com.google.errorprone.annotations.CheckReturnValue;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/server/src/test/proto/spine/test/library/card.proto b/server/src/test/proto/spine/test/library/card.proto
new file mode 100644
index 00000000000..d839db4e064
--- /dev/null
+++ b/server/src/test/proto/spine/test/library/card.proto
@@ -0,0 +1,40 @@
+syntax = "proto3";
+
+package spine.test.server.log;
+
+import "spine/options.proto";
+
+option (type_url_prefix) = "type.spine.io";
+option java_package = "io.spine.server.log";
+option java_outer_classname = "LibraryProto";
+option java_multiple_files = true;
+
+import "spine/people/person_name.proto";
+import "spine/time/time.proto";
+import "spine/core/user_id.proto";
+
+message Isbn {
+    string value = 1;
+}
+
+message Book {
+
+    Isbn isbn = 1;
+    string title = 2;
+    repeated people.PersonName author = 3;
+    int32 year_when_published = 4;
+    string publisher = 5;
+}
+
+message LibraryCardId {
+
+    core.UserId reader = 1;
+}
+
+message LibraryCard {
+    option (entity).kind = AGGREGATE;
+
+    LibraryCardId id = 1;
+
+    repeated Book book = 2;
+}
diff --git a/server/src/test/proto/spine/test/library/commands.proto b/server/src/test/proto/spine/test/library/commands.proto
new file mode 100644
index 00000000000..8de16c7032a
--- /dev/null
+++ b/server/src/test/proto/spine/test/library/commands.proto
@@ -0,0 +1,21 @@
+syntax = "proto3";
+
+package spine.test.server.log;
+
+import "spine/options.proto";
+
+option (type_url_prefix) = "type.spine.io";
+option java_package = "io.spine.server.log";
+option java_outer_classname = "LibraryCommandsProto";
+option java_multiple_files = true;
+
+import "spine/test/library/card.proto";
+
+message BorrowBooks {
+    repeated Isbn book_id = 1 [(required) = true, (validate) = true];
+}
+
+message ReturnBook {
+    LibraryCardId card = 1 [(required) = true, (validate) = true];
+    Isbn book = 2 [(required) = true, (validate) = true];
+}
diff --git a/server/src/test/proto/spine/test/library/events.proto b/server/src/test/proto/spine/test/library/events.proto
new file mode 100644
index 00000000000..83b80f70d72
--- /dev/null
+++ b/server/src/test/proto/spine/test/library/events.proto
@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+package spine.test.server.log;
+
+import "spine/options.proto";
+
+option (type_url_prefix) = "type.spine.io";
+option java_package = "io.spine.server.log";
+option java_outer_classname = "LibraryEventsProto";
+option java_multiple_files = true;
+
+import "spine/test/library/card.proto";
+
+message BooksBorrowed {
+    LibraryCardId card = 1;
+    repeated Book book = 2 [(required) = true];
+}
+
+message BookReturned {
+    LibraryCardId card = 1;
+    Book book = 2 [(required) = true];
+}
diff --git a/server/src/test/proto/spine/test/library/rejections.proto b/server/src/test/proto/spine/test/library/rejections.proto
new file mode 100644
index 00000000000..f2d29809539
--- /dev/null
+++ b/server/src/test/proto/spine/test/library/rejections.proto
@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+package spine.test.server.log;
+
+import "spine/options.proto";
+
+option (type_url_prefix) = "type.spine.io";
+option java_package = "io.spine.server.log";
+option java_outer_classname = "LibraryRejections";
+
+import "spine/test/library/card.proto";
+
+message UnknownBook {
+    repeated Isbn book = 1 [(required) = true];
+}

From f12ccf6934c6bedad7e2d72ff15db4a196fa0925 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Fri, 28 Feb 2020 19:03:51 +0200
Subject: [PATCH 09/32] Post signals to BlackBoxBoundedContext with a pre-set
 actor

---
 .../spine/testing/server/blackbox/Actor.java  | 74 +++++++++++++++++++
 .../blackbox/BlackBoxBoundedContext.java      | 25 +++++++
 .../blackbox/MultitenantBlackBoxContext.java  |  7 +-
 .../blackbox/SingleTenantBlackBoxContext.java | 10 ++-
 4 files changed, 111 insertions(+), 5 deletions(-)
 create mode 100644 testutil-server/src/main/java/io/spine/testing/server/blackbox/Actor.java

diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/Actor.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/Actor.java
new file mode 100644
index 00000000000..0b0b3134fe3
--- /dev/null
+++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/Actor.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2020, TeamDev. All rights reserved.
+ *
+ * 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.testing.server.blackbox;
+
+import io.spine.core.ActorContext;
+import io.spine.core.UserId;
+
+import java.util.function.Supplier;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static io.spine.base.Time.currentTime;
+import static io.spine.util.Preconditions2.checkNotEmptyOrBlank;
+import static io.spine.validate.Validate.checkValid;
+
+final class Actor {
+
+    private static final Actor defaultActor = from(BlackBoxBoundedContext.class.getName());
+
+    private final Supplier<ActorContext> context;
+
+    private Actor(Supplier<ActorContext> context) {
+        this.context = context;
+    }
+
+    public static Actor from(String userId) {
+        checkNotEmptyOrBlank(userId);
+        UserId id = UserId
+                .newBuilder()
+                .setValue(userId)
+                .build();
+        return from(id);
+    }
+
+    public static Actor from(UserId userId) {
+        checkNotNull(userId);
+        return new Actor(() -> ActorContext
+                .newBuilder()
+                .setActor(userId)
+                .setTimestamp(currentTime())
+                .vBuild());
+    }
+
+    public static Actor with(ActorContext context) {
+        checkNotNull(context);
+        checkValid(context);
+        return new Actor(() -> context);
+    }
+
+    public static Actor defaultActor() {
+        return defaultActor;
+    }
+
+    public ActorContext context() {
+        return context.get();
+    }
+}
diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxBoundedContext.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxBoundedContext.java
index 67839b215d2..81e5e7c20eb 100644
--- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxBoundedContext.java
+++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxBoundedContext.java
@@ -37,9 +37,11 @@
 import io.spine.client.Subscription;
 import io.spine.client.Topic;
 import io.spine.core.Ack;
+import io.spine.core.ActorContext;
 import io.spine.core.BoundedContextName;
 import io.spine.core.Command;
 import io.spine.core.Event;
+import io.spine.core.UserId;
 import io.spine.grpc.MemoizingObserver;
 import io.spine.logging.Logging;
 import io.spine.protobuf.AnyPacker;
@@ -90,6 +92,7 @@
 import static io.spine.core.BoundedContextNames.assumingTestsValue;
 import static io.spine.grpc.StreamObservers.memoizingObserver;
 import static io.spine.server.entity.model.EntityClass.stateClassOf;
+import static io.spine.testing.server.blackbox.Actor.defaultActor;
 import static io.spine.util.Exceptions.illegalStateWithCauseOf;
 import static java.util.Collections.singletonList;
 import static java.util.Collections.synchronizedSet;
@@ -120,6 +123,11 @@ public abstract class BlackBoxBoundedContext<T extends BlackBoxBoundedContext<T>
         extends AbstractEventSubscriber
         implements Logging {
 
+    private static final UserId DEFAULT_ACTOR = UserId
+            .newBuilder()
+            .setValue(BlackBoxBoundedContext.class.getName())
+            .build();
+
     private final BoundedContext context;
 
     /**
@@ -162,6 +170,8 @@ public abstract class BlackBoxBoundedContext<T extends BlackBoxBoundedContext<T>
 
     private final Map<Class<? extends EntityState>, Repository<?, ?>> repositories;
 
+    private Actor actor;
+
     @SuppressWarnings("ThisEscapedInObjectConstruction") // to inject self as event dispatcher.
     protected BlackBoxBoundedContext(boolean multitenant,
                                      EventEnricher enricher,
@@ -185,6 +195,7 @@ protected BlackBoxBoundedContext(boolean multitenant,
         this.repositories = newHashMap();
         this.context.registerEventDispatcher(this);
         this.context.registerEventDispatcher(DiagnosticLog.instance());
+        this.actor = defaultActor();
     }
 
     /**
@@ -323,6 +334,20 @@ public BoundedContextName name() {
         return context.name();
     }
 
+    public final T withActor(UserId user) {
+        this.actor = Actor.from(user);
+        return thisRef();
+    }
+
+    public final T withActor(ActorContext context) {
+        this.actor = Actor.with(context);
+        return thisRef();
+    }
+
+    protected final ActorContext context() {
+        return actor.context();
+    }
+
     /**
      * Obtains set of type names of entities known to this Bounded Context.
      */
diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/MultitenantBlackBoxContext.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/MultitenantBlackBoxContext.java
index bd6b65fc854..6568eb39395 100644
--- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/MultitenantBlackBoxContext.java
+++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/MultitenantBlackBoxContext.java
@@ -22,6 +22,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import io.spine.core.ActorContext;
 import io.spine.core.Command;
 import io.spine.core.Event;
 import io.spine.core.TenantId;
@@ -66,7 +67,11 @@ public MultitenantBlackBoxContext withTenant(TenantId tenant) {
 
     @Override
     protected TestActorRequestFactory requestFactory() {
-        return new TestActorRequestFactory(MultitenantBlackBoxContext.class, tenantId());
+        ActorContext context = context();
+        return new TestActorRequestFactory(tenantId(),
+                                           context.getActor(),
+                                           context.getZoneOffset(),
+                                           context.getZoneId());
     }
 
     @Override
diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/SingleTenantBlackBoxContext.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/SingleTenantBlackBoxContext.java
index f9eafa23736..297a98e5395 100644
--- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/SingleTenantBlackBoxContext.java
+++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/SingleTenantBlackBoxContext.java
@@ -22,6 +22,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import io.spine.core.ActorContext;
 import io.spine.core.Command;
 import io.spine.core.Event;
 import io.spine.server.event.EventEnricher;
@@ -34,9 +35,6 @@
 public final class SingleTenantBlackBoxContext
         extends BlackBoxBoundedContext<SingleTenantBlackBoxContext> {
 
-    private final TestActorRequestFactory requestFactory =
-            new TestActorRequestFactory(SingleTenantBlackBoxContext.class);
-
     SingleTenantBlackBoxContext(String name, EventEnricher enricher) {
         super(false, enricher, name);
     }
@@ -53,6 +51,10 @@ protected ImmutableList<Event> select(EventCollector collector) {
 
     @Override
     protected TestActorRequestFactory requestFactory() {
-        return requestFactory;
+        ActorContext context = context();
+        return new TestActorRequestFactory(null,
+                                           context.getActor(),
+                                           context.getZoneOffset(),
+                                           context.getZoneId());
     }
 }

From 75f31fdca2cd07f7ecc8f8dfb07a41c42b16800d Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Fri, 28 Feb 2020 19:04:03 +0200
Subject: [PATCH 10/32] Add tests for HandlerLog

---
 .../io/spine/server/log/HandlerLogTest.java   | 108 ++++++++++++++++++
 .../proto/spine/test/library/commands.proto   |   3 +-
 version.gradle                                |   4 +-
 3 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 server/src/test/java/io/spine/server/log/HandlerLogTest.java

diff --git a/server/src/test/java/io/spine/server/log/HandlerLogTest.java b/server/src/test/java/io/spine/server/log/HandlerLogTest.java
new file mode 100644
index 00000000000..6dc6d02b135
--- /dev/null
+++ b/server/src/test/java/io/spine/server/log/HandlerLogTest.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2020, TeamDev. All rights reserved.
+ *
+ * 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.log;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.flogger.FluentLogger;
+import com.google.common.flogger.LoggerConfig;
+import io.spine.core.UserId;
+import io.spine.logging.Logging;
+import io.spine.server.log.given.Books;
+import io.spine.server.log.given.CardAggregate;
+import io.spine.server.log.given.CardRepository;
+import io.spine.server.log.given.TestLogHandler;
+import io.spine.testing.core.given.GivenUserId;
+import io.spine.testing.logging.LogRecordSubject;
+import io.spine.testing.server.blackbox.BlackBoxBoundedContext;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import java.util.logging.LogRecord;
+
+import static com.google.common.truth.Truth.assertThat;
+import static io.spine.testing.logging.LogTruth.assertThat;
+import static java.util.logging.Level.ALL;
+import static java.util.logging.Level.FINE;
+
+@DisplayName("`HandlerLog` should")
+class HandlerLogTest {
+
+    private FluentLogger logger;
+    private TestLogHandler handler;
+
+    @BeforeEach
+    void setUpLog() {
+        logger = Logging.loggerFor(CardAggregate.class);
+        handler = new TestLogHandler();
+        LoggerConfig config = LoggerConfig.of(logger);
+        config.addHandler(handler);
+        config.setLevel(ALL);
+    }
+
+    @AfterEach
+    void resetLog() {
+        LoggerConfig.of(logger).removeHandler(handler);
+        handler.close();
+    }
+
+    @Test
+    @DisplayName("log handler method name and parameters")
+    void includeSignalName() {
+        UserId user = GivenUserId.generated();
+        LibraryCardId id = LibraryCardId
+                .newBuilder()
+                .setReader(user)
+                .build();
+        BorrowBooks command = BorrowBooks
+                .newBuilder()
+                .setCard(id)
+                .addBookId(Books.BIG_RED_BOOK)
+                .addBookId(Books.BIG_BLUE_BOOK)
+                .vBuild();
+        BlackBoxBoundedContext
+                .singleTenant()
+                .withActor(user)
+                .with(new CardRepository())
+                .receivesCommand(command);
+        ImmutableList<LogRecord> records = handler.records();
+
+        assertThat(records)
+                .hasSize(2);
+
+        LogRecordSubject firstLog = assertThat(records.get(0));
+        firstLog.hasLevelThat()
+                .isEqualTo(FINE);
+        firstLog.hasMessageThat()
+                .contains(Books.implementingDdd().getTitle());
+        firstLog.hasMethodNameThat()
+                .contains(command.getClass().getSimpleName());
+
+        LogRecordSubject secondLog = assertThat(records.get(1));
+        secondLog.hasLevelThat()
+                 .isEqualTo(FINE);
+        secondLog.hasMessageThat()
+                 .contains(Books.domainDrivenDesign().getTitle());
+        secondLog.hasMethodNameThat()
+                 .contains(command.getClass().getSimpleName());
+    }
+}
diff --git a/server/src/test/proto/spine/test/library/commands.proto b/server/src/test/proto/spine/test/library/commands.proto
index 8de16c7032a..240948da4c6 100644
--- a/server/src/test/proto/spine/test/library/commands.proto
+++ b/server/src/test/proto/spine/test/library/commands.proto
@@ -12,7 +12,8 @@ option java_multiple_files = true;
 import "spine/test/library/card.proto";
 
 message BorrowBooks {
-    repeated Isbn book_id = 1 [(required) = true, (validate) = true];
+    LibraryCardId card = 1 [(required) = true, (validate) = true];
+    repeated Isbn book_id = 2 [(required) = true, (validate) = true];
 }
 
 message ReturnBook {
diff --git a/version.gradle b/version.gradle
index dac82b689e0..e38531d25dd 100644
--- a/version.gradle
+++ b/version.gradle
@@ -25,14 +25,14 @@
  * as we want to manage the versions in a single source.
  */
 
-final def spineVersion = '1.4.8'
+final def spineVersion = '1.4.9'
 
 ext {
     // The version of the modules in this project.
     versionToPublish = spineVersion
 
     // Depend on `base` for the general definitions and a model compiler.
-    spineBaseVersion = '1.4.8'
+    spineBaseVersion = '1.4.9'
 
     // Depend on `time` for `ZoneId`, `ZoneOffset` and other date/time types and utilities.
     spineTimeVersion = '1.4.1'

From 6cf86dccdd0c8fa8003b7ef8a5c17103e3e32912 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Fri, 28 Feb 2020 19:09:42 +0200
Subject: [PATCH 11/32] Add more tests for HandlerLog

---
 .../io/spine/server/log/HandlerLogTest.java   | 61 +++++++++++++------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/server/src/test/java/io/spine/server/log/HandlerLogTest.java b/server/src/test/java/io/spine/server/log/HandlerLogTest.java
index 6dc6d02b135..9f75a152cad 100644
--- a/server/src/test/java/io/spine/server/log/HandlerLogTest.java
+++ b/server/src/test/java/io/spine/server/log/HandlerLogTest.java
@@ -69,16 +69,7 @@ void resetLog() {
     @DisplayName("log handler method name and parameters")
     void includeSignalName() {
         UserId user = GivenUserId.generated();
-        LibraryCardId id = LibraryCardId
-                .newBuilder()
-                .setReader(user)
-                .build();
-        BorrowBooks command = BorrowBooks
-                .newBuilder()
-                .setCard(id)
-                .addBookId(Books.BIG_RED_BOOK)
-                .addBookId(Books.BIG_BLUE_BOOK)
-                .vBuild();
+        BorrowBooks command = borrowBooks(user);
         BlackBoxBoundedContext
                 .singleTenant()
                 .withActor(user)
@@ -89,20 +80,54 @@ void includeSignalName() {
         assertThat(records)
                 .hasSize(2);
 
-        LogRecordSubject firstLog = assertThat(records.get(0));
-        firstLog.hasLevelThat()
+        LogRecordSubject assertFirstLog = assertThat(records.get(0));
+        assertFirstLog.hasLevelThat()
                 .isEqualTo(FINE);
-        firstLog.hasMessageThat()
+        assertFirstLog.hasMessageThat()
                 .contains(Books.implementingDdd().getTitle());
-        firstLog.hasMethodNameThat()
+        assertFirstLog.hasMethodNameThat()
                 .contains(command.getClass().getSimpleName());
 
-        LogRecordSubject secondLog = assertThat(records.get(1));
-        secondLog.hasLevelThat()
+        LogRecordSubject assertSecondLog = assertThat(records.get(1));
+        assertSecondLog.hasLevelThat()
                  .isEqualTo(FINE);
-        secondLog.hasMessageThat()
+        assertSecondLog.hasMessageThat()
                  .contains(Books.domainDrivenDesign().getTitle());
-        secondLog.hasMethodNameThat()
+        assertSecondLog.hasMethodNameThat()
                  .contains(command.getClass().getSimpleName());
     }
+
+    @Test
+    @DisplayName("log handler class name")
+    void includeClassName() {
+        UserId user = GivenUserId.generated();
+        BorrowBooks command = borrowBooks(user);
+        BlackBoxBoundedContext
+                .singleTenant()
+                .withActor(user)
+                .with(new CardRepository())
+                .receivesCommand(command);
+        ImmutableList<LogRecord> records = handler.records();
+
+        assertThat(records)
+                .hasSize(2);
+        for (LogRecord record : records) {
+            assertThat(record).hasClassNameThat()
+                              .isEqualTo(CardAggregate.class.getName());
+        }
+    }
+
+    private static BorrowBooks borrowBooks(UserId reader) {
+        LibraryCardId id = LibraryCardId
+                .newBuilder()
+                .setReader(reader)
+                .build();
+        BorrowBooks command = BorrowBooks
+                .newBuilder()
+                .setCard(id)
+                .addBookId(Books.BIG_RED_BOOK)
+                .addBookId(Books.BIG_BLUE_BOOK)
+                .vBuild();
+        return command;
+    }
 }

From ea7291747f300f68c76b4dd2116a6704669edbf5 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 14:35:24 +0200
Subject: [PATCH 12/32] Remove an unused constant

---
 license-report.md                             | 32 +++++++++----------
 pom.xml                                       | 18 +++++------
 .../blackbox/BlackBoxBoundedContext.java      |  5 ---
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/license-report.md b/license-report.md
index 44471d803ea..384622bc981 100644
--- a/license-report.md
+++ b/license-report.md
@@ -1,6 +1,6 @@
 
     
-# Dependencies of `io.spine:spine-client:1.4.8`
+# Dependencies of `io.spine:spine-client:1.4.9`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -415,12 +415,12 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Fri Feb 28 15:09:56 EET 2020** 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 Mar 02 14:33:43 EET 2020** 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:1.4.8`
+# Dependencies of `io.spine:spine-core:1.4.9`
 
 ## Runtime
 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
@@ -791,12 +791,12 @@ This report was generated on **Fri Feb 28 15:09:56 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Fri Feb 28 15:09:57 EET 2020** 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 Mar 02 14:33:43 EET 2020** 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:1.4.8`
+# Dependencies of `io.spine.tools:spine-model-assembler:1.4.9`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -1206,12 +1206,12 @@ This report was generated on **Fri Feb 28 15:09:57 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Fri Feb 28 15:09:57 EET 2020** 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 Mar 02 14:33:44 EET 2020** 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:1.4.8`
+# Dependencies of `io.spine.tools:spine-model-verifier:1.4.9`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -1681,12 +1681,12 @@ This report was generated on **Fri Feb 28 15:09:57 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Fri Feb 28 15:09:58 EET 2020** 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 Mar 02 14:33:45 EET 2020** 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:1.4.8`
+# Dependencies of `io.spine:spine-server:1.4.9`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -2113,12 +2113,12 @@ This report was generated on **Fri Feb 28 15:09:58 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Fri Feb 28 15:09:58 EET 2020** 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 Mar 02 14:33:45 EET 2020** 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-testutil-client:1.4.8`
+# Dependencies of `io.spine:spine-testutil-client:1.4.9`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -2586,12 +2586,12 @@ This report was generated on **Fri Feb 28 15:09:58 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Fri Feb 28 15:10:01 EET 2020** 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 Mar 02 14:33:48 EET 2020** 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-testutil-core:1.4.8`
+# Dependencies of `io.spine:spine-testutil-core:1.4.9`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -3067,12 +3067,12 @@ This report was generated on **Fri Feb 28 15:10:01 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Fri Feb 28 15:10:03 EET 2020** 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 Mar 02 14:33:50 EET 2020** 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-testutil-server:1.4.8`
+# Dependencies of `io.spine:spine-testutil-server:1.4.9`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -3584,4 +3584,4 @@ This report was generated on **Fri Feb 28 15:10:03 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Fri Feb 28 15:10:07 EET 2020** 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).
\ No newline at end of file
+This report was generated on **Mon Mar 02 14:33:54 EET 2020** 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).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3f384c614a1..83f6a16cfee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@ all modules and does not describe the project structure per-subproject.
 
 <groupId>io.spine</groupId>
 <artifactId>spine-core-java</artifactId>
-<version>1.4.8</version>
+<version>1.4.9</version>
 
 <inceptionYear>2015</inceptionYear>
 
@@ -70,7 +70,7 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine</groupId>
     <artifactId>spine-base</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
@@ -82,13 +82,13 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-model-compiler</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-plugin-base</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
@@ -130,7 +130,7 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine</groupId>
     <artifactId>spine-testlib</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
     <scope>test</scope>
   </dependency>
   <dependency>
@@ -142,13 +142,13 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-mute-logging</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
     <scope>test</scope>
   </dependency>
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-plugin-testlib</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
     <scope>test</scope>
   </dependency>
   <dependency>
@@ -210,12 +210,12 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-javadoc-filter</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
   </dependency>
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-protoc-plugin</artifactId>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
   </dependency>
   <dependency>
     <groupId>net.sourceforge.pmd</groupId>
diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxBoundedContext.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxBoundedContext.java
index 81e5e7c20eb..18f98018883 100644
--- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxBoundedContext.java
+++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxBoundedContext.java
@@ -123,11 +123,6 @@ public abstract class BlackBoxBoundedContext<T extends BlackBoxBoundedContext<T>
         extends AbstractEventSubscriber
         implements Logging {
 
-    private static final UserId DEFAULT_ACTOR = UserId
-            .newBuilder()
-            .setValue(BlackBoxBoundedContext.class.getName())
-            .build();
-
     private final BoundedContext context;
 
     /**

From dfe203106c85674ce202bbd381e7229ee7b41d53 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 14:37:06 +0200
Subject: [PATCH 13/32] Fix `core` version

---
 version.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.gradle b/version.gradle
index e38531d25dd..b95a029b1c3 100644
--- a/version.gradle
+++ b/version.gradle
@@ -25,7 +25,7 @@
  * as we want to manage the versions in a single source.
  */
 
-final def spineVersion = '1.4.9'
+final def spineVersion = '1.4.8'
 
 ext {
     // The version of the modules in this project.

From 4a97afeb4c25a9a3654710c490eb455daed5fbe5 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 14:48:53 +0200
Subject: [PATCH 14/32] Update reports

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 83f6a16cfee..46cb51b5902 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@ all modules and does not describe the project structure per-subproject.
 
 <groupId>io.spine</groupId>
 <artifactId>spine-core-java</artifactId>
-<version>1.4.9</version>
+<version>1.4.8</version>
 
 <inceptionYear>2015</inceptionYear>
 

From 276376f03e420d82923653b9f7a06e404ff1956e Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 15:08:08 +0200
Subject: [PATCH 15/32] Delete an unused class

---
 .../io/spine/server/entity/LoggingEntity.java | 117 ------------------
 1 file changed, 117 deletions(-)
 delete mode 100644 server/src/main/java/io/spine/server/entity/LoggingEntity.java

diff --git a/server/src/main/java/io/spine/server/entity/LoggingEntity.java b/server/src/main/java/io/spine/server/entity/LoggingEntity.java
deleted file mode 100644
index 5e49664d778..00000000000
--- a/server/src/main/java/io/spine/server/entity/LoggingEntity.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2020, TeamDev. All rights reserved.
- *
- * 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.entity;
-
-import com.google.common.flogger.FluentLogger;
-import com.google.common.flogger.LogSite;
-import io.spine.logging.Logging;
-import io.spine.server.model.HandlerMethod;
-
-import java.util.Optional;
-
-public interface LoggingEntity extends Logging {
-
-    Optional<LogSite> handlerSite();
-
-    void enter(HandlerMethod<?, ?, ?, ?> method);
-
-    void resetLog();
-
-    @Override
-    default FluentLogger.Api _severe() {
-        FluentLogger.Api log = Logging.super._severe();
-        return handlerSite()
-                .map(log::withInjectedLogSite)
-                .orElse(log);
-    }
-
-    @Override
-    default FluentLogger.Api _error() {
-        FluentLogger.Api log = Logging.super._error();
-        return handlerSite()
-                .map(log::withInjectedLogSite)
-                .orElse(log);
-    }
-
-    @Override
-    default FluentLogger.Api _warn() {
-        FluentLogger.Api log = Logging.super._warn();
-        return handlerSite()
-                .map(log::withInjectedLogSite)
-                .orElse(log);
-    }
-
-    @Override
-    default FluentLogger.Api _info() {
-        FluentLogger.Api log = Logging.super._info();
-        return handlerSite()
-                .map(log::withInjectedLogSite)
-                .orElse(log);
-    }
-
-    @Override
-    default FluentLogger.Api _config() {
-        FluentLogger.Api log = Logging.super._config();
-        return handlerSite()
-                .map(log::withInjectedLogSite)
-                .orElse(log);
-    }
-
-    @Override
-    default FluentLogger.Api _fine() {
-        FluentLogger.Api log = Logging.super._fine();
-        return handlerSite()
-                .map(log::withInjectedLogSite)
-                .orElse(log);
-    }
-
-    @Override
-    default FluentLogger.Api _debug() {
-        FluentLogger.Api log = Logging.super._debug();
-        return handlerSite()
-                .map(log::withInjectedLogSite)
-                .orElse(log);
-    }
-
-    @Override
-    default FluentLogger.Api _finer() {
-        FluentLogger.Api log = Logging.super._finer();
-        return handlerSite()
-                .map(log::withInjectedLogSite)
-                .orElse(log);
-    }
-
-    @Override
-    default FluentLogger.Api _finest() {
-        FluentLogger.Api log = Logging.super._finest();
-        return handlerSite()
-                .map(log::withInjectedLogSite)
-                .orElse(log);
-    }
-
-    @Override
-    default FluentLogger.Api _trace() {
-        FluentLogger.Api log = Logging.super._trace();
-        return handlerSite()
-                .map(log::withInjectedLogSite)
-                .orElse(log);
-    }
-}

From da0a678099c8c5a0ef1ef53e8f336d50c1c0e20f Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 15:08:23 +0200
Subject: [PATCH 16/32] Add doc

---
 .../io/spine/server/entity/AbstractEntity.java    |  5 +++--
 .../spine/server/log/LogAwareMessageHandler.java  | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/io/spine/server/entity/AbstractEntity.java b/server/src/main/java/io/spine/server/entity/AbstractEntity.java
index 92ee4f0fe5b..7021519700c 100644
--- a/server/src/main/java/io/spine/server/entity/AbstractEntity.java
+++ b/server/src/main/java/io/spine/server/entity/AbstractEntity.java
@@ -68,7 +68,8 @@
         "SynchronizeOnThis" /* This class uses double-check idiom for lazy init of some
             fields. See Effective Java 2nd Ed. Item #71. */,
         "ClassWithTooManyMethods"})
-public abstract class AbstractEntity<I, S extends EntityState> implements Entity<I, S>, LogAwareMessageHandler {
+public abstract class AbstractEntity<I, S extends EntityState>
+        implements Entity<I, S>, LogAwareMessageHandler {
 
     /**
      * Lazily initialized reference to the model class of this entity.
@@ -517,8 +518,8 @@ public Timestamp whenModified() {
         return version.getTimestamp();
     }
 
-    @Override
     @Internal
+    @Override
     public final void enter(HandlerMethod<?, ?, ?, ?> method) {
         checkNotNull(method);
         FluentLogger logger = loggerFor(getClass());
diff --git a/server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java b/server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java
index 9e272b5e12d..6b52899f7c8 100644
--- a/server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java
+++ b/server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java
@@ -23,12 +23,27 @@
 import io.spine.annotation.Internal;
 import io.spine.server.model.HandlerMethod;
 
+/**
+ * A message handler which, depending on the handled message, alters its own log output.
+ */
 @Internal
 public interface LogAwareMessageHandler {
 
+    /**
+     * Enters the handler method invocation.
+     *
+     * <p>After calling this method, the message handler should start including the handler method
+     * info into the log.
+     */
     @Internal
     void enter(HandlerMethod<?, ?, ?, ?> method);
 
+    /**
+     * Exists the current handler method invocation.
+     *
+     * <p>After calling this method, the message handler should not include any handler method info
+     * into the log.
+     */
     @Internal
     void resetLog();
 }

From ac9fce7b3c10339810089ff8360b7dcd5c652a60 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 15:08:36 +0200
Subject: [PATCH 17/32] Update report

---
 license-report.md | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/license-report.md b/license-report.md
index 384622bc981..79aaef7a6bf 100644
--- a/license-report.md
+++ b/license-report.md
@@ -1,6 +1,6 @@
 
     
-# Dependencies of `io.spine:spine-client:1.4.9`
+# Dependencies of `io.spine:spine-client:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -415,12 +415,12 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:33:43 EET 2020** 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 Mar 02 14:42:30 EET 2020** 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:1.4.9`
+# Dependencies of `io.spine:spine-core:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
@@ -791,12 +791,12 @@ This report was generated on **Mon Mar 02 14:33:43 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:33:43 EET 2020** 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 Mar 02 14:42:30 EET 2020** 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:1.4.9`
+# Dependencies of `io.spine.tools:spine-model-assembler:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -1206,12 +1206,12 @@ This report was generated on **Mon Mar 02 14:33:43 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:33:44 EET 2020** 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 Mar 02 14:42:31 EET 2020** 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:1.4.9`
+# Dependencies of `io.spine.tools:spine-model-verifier:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -1681,12 +1681,12 @@ This report was generated on **Mon Mar 02 14:33:44 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:33:45 EET 2020** 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 Mar 02 14:42:32 EET 2020** 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:1.4.9`
+# Dependencies of `io.spine:spine-server:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -2113,12 +2113,12 @@ This report was generated on **Mon Mar 02 14:33:45 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:33:45 EET 2020** 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 Mar 02 14:42:32 EET 2020** 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-testutil-client:1.4.9`
+# Dependencies of `io.spine:spine-testutil-client:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -2586,12 +2586,12 @@ This report was generated on **Mon Mar 02 14:33:45 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:33:48 EET 2020** 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 Mar 02 14:42:34 EET 2020** 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-testutil-core:1.4.9`
+# Dependencies of `io.spine:spine-testutil-core:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -3067,12 +3067,12 @@ This report was generated on **Mon Mar 02 14:33:48 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:33:50 EET 2020** 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 Mar 02 14:42:36 EET 2020** 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-testutil-server:1.4.9`
+# Dependencies of `io.spine:spine-testutil-server:1.4.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -3584,4 +3584,4 @@ This report was generated on **Mon Mar 02 14:33:50 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:33:54 EET 2020** 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).
\ No newline at end of file
+This report was generated on **Mon Mar 02 14:42:39 EET 2020** 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).
\ No newline at end of file

From fcda1ade83ba35537715d7b9df72ba6cb897f882 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 16:12:42 +0200
Subject: [PATCH 18/32] Add another test and remove stack trace shortening

---
 license-report.md                             | 16 ++---
 .../spine/server/entity/AbstractEntity.java   |  4 +-
 .../java/io/spine/server/log/HandlerLog.java  | 22 ++++--
 .../spine/server/log/HandlerMethodSite.java   |  2 +-
 .../io/spine/server/log/HandlerLogTest.java   | 72 ++++++++++++++++---
 .../java/io/spine/server/log/given/Books.java |  2 +
 .../spine/server/log/given/CardAggregate.java |  2 +-
 7 files changed, 92 insertions(+), 28 deletions(-)

diff --git a/license-report.md b/license-report.md
index 79aaef7a6bf..46f30ecf9c3 100644
--- a/license-report.md
+++ b/license-report.md
@@ -415,7 +415,7 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:42:30 EET 2020** 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 Mar 02 16:11:17 EET 2020** 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).
 
 
 
@@ -791,7 +791,7 @@ This report was generated on **Mon Mar 02 14:42:30 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:42:30 EET 2020** 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 Mar 02 16:11:17 EET 2020** 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).
 
 
 
@@ -1206,7 +1206,7 @@ This report was generated on **Mon Mar 02 14:42:30 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:42:31 EET 2020** 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 Mar 02 16:11:18 EET 2020** 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).
 
 
 
@@ -1681,7 +1681,7 @@ This report was generated on **Mon Mar 02 14:42:31 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:42:32 EET 2020** 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 Mar 02 16:11:18 EET 2020** 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).
 
 
 
@@ -2113,7 +2113,7 @@ This report was generated on **Mon Mar 02 14:42:32 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:42:32 EET 2020** 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 Mar 02 16:11:19 EET 2020** 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).
 
 
 
@@ -2586,7 +2586,7 @@ This report was generated on **Mon Mar 02 14:42:32 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:42:34 EET 2020** 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 Mar 02 16:11:21 EET 2020** 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).
 
 
 
@@ -3067,7 +3067,7 @@ This report was generated on **Mon Mar 02 14:42:34 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:42:36 EET 2020** 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 Mar 02 16:11:22 EET 2020** 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).
 
 
 
@@ -3584,4 +3584,4 @@ This report was generated on **Mon Mar 02 14:42:36 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 14:42:39 EET 2020** 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).
\ No newline at end of file
+This report was generated on **Mon Mar 02 16:11:25 EET 2020** 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).
\ No newline at end of file
diff --git a/server/src/main/java/io/spine/server/entity/AbstractEntity.java b/server/src/main/java/io/spine/server/entity/AbstractEntity.java
index 7021519700c..43f6e6ca4f4 100644
--- a/server/src/main/java/io/spine/server/entity/AbstractEntity.java
+++ b/server/src/main/java/io/spine/server/entity/AbstractEntity.java
@@ -37,7 +37,6 @@
 import io.spine.server.entity.rejection.CannotModifyArchivedEntity;
 import io.spine.server.entity.rejection.CannotModifyDeletedEntity;
 import io.spine.server.log.HandlerLog;
-import io.spine.server.log.HandlerMethodSite;
 import io.spine.server.log.LogAwareMessageHandler;
 import io.spine.server.model.HandlerMethod;
 import io.spine.string.Stringifiers;
@@ -523,8 +522,7 @@ public Timestamp whenModified() {
     public final void enter(HandlerMethod<?, ?, ?, ?> method) {
         checkNotNull(method);
         FluentLogger logger = loggerFor(getClass());
-        HandlerMethodSite site = new HandlerMethodSite(method);
-        this.handlerLog = new HandlerLog(logger, site);
+        this.handlerLog = new HandlerLog(logger, method);
     }
 
     @Internal
diff --git a/server/src/main/java/io/spine/server/log/HandlerLog.java b/server/src/main/java/io/spine/server/log/HandlerLog.java
index 87461bd34ec..9e544f362e2 100644
--- a/server/src/main/java/io/spine/server/log/HandlerLog.java
+++ b/server/src/main/java/io/spine/server/log/HandlerLog.java
@@ -22,25 +22,39 @@
 
 import com.google.common.flogger.FluentLogger;
 import com.google.common.flogger.LogSite;
+import io.spine.annotation.Internal;
+import io.spine.server.model.HandlerMethod;
 
 import java.util.logging.Level;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.flogger.StackSize.SMALL;
 
+/**
+ * A log for handler methods.
+ *
+ * <p>The log is set up with a {@link HandlerMethod} from which it should be accessed. By default,
+ * the log will include the given method as the logging {@linkplain LogSite site}.
+ */
 public final class HandlerLog {
 
     private final FluentLogger logger;
     private final LogSite logSite;
 
-    public HandlerLog(FluentLogger logger, LogSite logSite) {
+    @Internal
+    public HandlerLog(FluentLogger logger, HandlerMethod<?, ?, ?, ?> method) {
         this.logger = checkNotNull(logger);
-        this.logSite = checkNotNull(logSite);
+        checkNotNull(method);
+        this.logSite = new HandlerMethodSite(method);
     }
 
+    /**
+     * Returns a fluent logging API appropriate for the specified log level.
+     *
+     * <p>By default, the log produced by this API will include the name of the handler method, as
+     * well as its parameter types.
+     */
     public FluentLogger.Api at(Level level) {
         return logger.at(level)
-                     .withStackTrace(SMALL)
                      .withInjectedLogSite(logSite);
     }
 }
diff --git a/server/src/main/java/io/spine/server/log/HandlerMethodSite.java b/server/src/main/java/io/spine/server/log/HandlerMethodSite.java
index 46d75e57fb4..e19f92e09b5 100644
--- a/server/src/main/java/io/spine/server/log/HandlerMethodSite.java
+++ b/server/src/main/java/io/spine/server/log/HandlerMethodSite.java
@@ -42,7 +42,7 @@ public final class HandlerMethodSite extends LogSite {
     @SuppressWarnings("Immutable")
     private final Method method;
 
-    public HandlerMethodSite(HandlerMethod<?, ?, ?, ?> method) {
+    HandlerMethodSite(HandlerMethod<?, ?, ?, ?> method) {
         super();
         checkNotNull(method);
         this.method = method.rawMethod();
diff --git a/server/src/test/java/io/spine/server/log/HandlerLogTest.java b/server/src/test/java/io/spine/server/log/HandlerLogTest.java
index 9f75a152cad..432d5d65fd5 100644
--- a/server/src/test/java/io/spine/server/log/HandlerLogTest.java
+++ b/server/src/test/java/io/spine/server/log/HandlerLogTest.java
@@ -31,38 +31,56 @@
 import io.spine.server.log.given.TestLogHandler;
 import io.spine.testing.core.given.GivenUserId;
 import io.spine.testing.logging.LogRecordSubject;
+import io.spine.testing.logging.MuteLogging;
 import io.spine.testing.server.blackbox.BlackBoxBoundedContext;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import java.util.logging.Handler;
+import java.util.logging.Level;
 import java.util.logging.LogRecord;
 
 import static com.google.common.truth.Truth.assertThat;
+import static io.spine.server.log.given.Books.THE_HOBBIT;
 import static io.spine.testing.logging.LogTruth.assertThat;
 import static java.util.logging.Level.ALL;
 import static java.util.logging.Level.FINE;
 
+@MuteLogging
 @DisplayName("`HandlerLog` should")
 class HandlerLogTest {
 
     private FluentLogger logger;
     private TestLogHandler handler;
+    private Handler[] defaultHandlers;
+    private @Nullable Level defaultLevel;
 
     @BeforeEach
     void setUpLog() {
         logger = Logging.loggerFor(CardAggregate.class);
         handler = new TestLogHandler();
         LoggerConfig config = LoggerConfig.of(logger);
+        defaultHandlers = config.getHandlers();
+        for (Handler defaultHandler : defaultHandlers) {
+            config.removeHandler(defaultHandler);
+        }
         config.addHandler(handler);
+        defaultLevel = config.getLevel();
         config.setLevel(ALL);
     }
 
     @AfterEach
     void resetLog() {
-        LoggerConfig.of(logger).removeHandler(handler);
+        LoggerConfig config = LoggerConfig.of(logger);
+        config.removeHandler(handler);
         handler.close();
+        for (Handler defaultHandler : defaultHandlers) {
+            config.addHandler(defaultHandler);
+        }
+        config.setLevel(defaultLevel);
     }
 
     @Test
@@ -82,19 +100,23 @@ void includeSignalName() {
 
         LogRecordSubject assertFirstLog = assertThat(records.get(0));
         assertFirstLog.hasLevelThat()
-                .isEqualTo(FINE);
+                      .isEqualTo(FINE);
         assertFirstLog.hasMessageThat()
-                .contains(Books.implementingDdd().getTitle());
+                      .contains(Books.implementingDdd()
+                                     .getTitle());
         assertFirstLog.hasMethodNameThat()
-                .contains(command.getClass().getSimpleName());
+                      .contains(command.getClass()
+                                       .getSimpleName());
 
         LogRecordSubject assertSecondLog = assertThat(records.get(1));
         assertSecondLog.hasLevelThat()
-                 .isEqualTo(FINE);
+                       .isEqualTo(FINE);
         assertSecondLog.hasMessageThat()
-                 .contains(Books.domainDrivenDesign().getTitle());
+                       .contains(Books.domainDrivenDesign()
+                                      .getTitle());
         assertSecondLog.hasMethodNameThat()
-                 .contains(command.getClass().getSimpleName());
+                       .contains(command.getClass()
+                                        .getSimpleName());
     }
 
     @Test
@@ -117,11 +139,32 @@ void includeClassName() {
         }
     }
 
-    private static BorrowBooks borrowBooks(UserId reader) {
-        LibraryCardId id = LibraryCardId
+    @Test
+    @DisplayName("pass the throwable unchanged")
+    void withCause() {
+        UserId user = GivenUserId.generated();
+        ReturnBook command = ReturnBook
                 .newBuilder()
-                .setReader(reader)
-                .build();
+                .setCard(cardId(user))
+                .setBook(THE_HOBBIT)
+                .vBuild();
+        BlackBoxBoundedContext
+                .singleTenant()
+                .withActor(user)
+                .with(new CardRepository())
+                .receivesCommand(command);
+        ImmutableList<LogRecord> records = handler.records();
+        assertThat(records)
+                .hasSize(1);
+        LogRecord record = records.get(0);
+        LogRecordSubject assertRecord = assertThat(record);
+        assertRecord.isError();
+        assertRecord.hasThrowableThat()
+                    .isInstanceOf(UnknownBook.class);
+    }
+
+    private static BorrowBooks borrowBooks(UserId reader) {
+        LibraryCardId id = cardId(reader);
         BorrowBooks command = BorrowBooks
                 .newBuilder()
                 .setCard(id)
@@ -130,4 +173,11 @@ private static BorrowBooks borrowBooks(UserId reader) {
                 .vBuild();
         return command;
     }
+
+    private static LibraryCardId cardId(UserId reader) {
+        return LibraryCardId
+                    .newBuilder()
+                    .setReader(reader)
+                    .build();
+    }
 }
diff --git a/server/src/test/java/io/spine/server/log/given/Books.java b/server/src/test/java/io/spine/server/log/given/Books.java
index 9bb565c5ca2..f02d28d084d 100644
--- a/server/src/test/java/io/spine/server/log/given/Books.java
+++ b/server/src/test/java/io/spine/server/log/given/Books.java
@@ -30,6 +30,8 @@ public final class Books {
     public static final Isbn BIG_RED_BOOK = isbn("978-0321834577");
     public static final Isbn SMALL_GREEN_BOOK = isbn("978-0134434421");
 
+    public static final Isbn THE_HOBBIT = isbn("978-0547928241");
+
     private static final String PUBLISHER = "A-W";
 
     /**
diff --git a/server/src/test/java/io/spine/server/log/given/CardAggregate.java b/server/src/test/java/io/spine/server/log/given/CardAggregate.java
index d48b39d7bc7..50241764a1e 100644
--- a/server/src/test/java/io/spine/server/log/given/CardAggregate.java
+++ b/server/src/test/java/io/spine/server/log/given/CardAggregate.java
@@ -93,7 +93,7 @@ BooksBorrowed handle(BorrowBooks command) throws UnknownBook {
     BookReturned handle(ReturnBook command) throws UnknownBook {
         Isbn isbn = command.getBook();
         Book book = knownBooks.get(isbn);
-        if (book != null) {
+        if (book == null) {
             UnknownBook rejection = UnknownBook
                     .newBuilder()
                     .addAllBook(ImmutableList.of(isbn))

From b1f3f5c491941c4456eb2962a1c817278458f295 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 16:19:29 +0200
Subject: [PATCH 19/32] Add doc

---
 .../java/io/spine/server/log/HandlerMethodSite.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/server/src/main/java/io/spine/server/log/HandlerMethodSite.java b/server/src/main/java/io/spine/server/log/HandlerMethodSite.java
index e19f92e09b5..fa9d0416e50 100644
--- a/server/src/main/java/io/spine/server/log/HandlerMethodSite.java
+++ b/server/src/main/java/io/spine/server/log/HandlerMethodSite.java
@@ -23,7 +23,6 @@
 import com.google.common.base.Objects;
 import com.google.common.flogger.LogSite;
 import com.google.errorprone.annotations.Immutable;
-import io.spine.annotation.Internal;
 import io.spine.code.java.ClassName;
 import io.spine.code.java.SimpleClassName;
 import io.spine.server.model.HandlerMethod;
@@ -35,9 +34,14 @@
 import static java.lang.String.format;
 import static java.util.stream.Collectors.joining;
 
-@Internal
+/**
+ * A {@link LogSite} of a signal handler method.
+ *
+ * <p>The site provides the name of the class and the name of the method with its parameter types.
+ * The site never provides a line number or a file name.
+ */
 @Immutable
-public final class HandlerMethodSite extends LogSite {
+final class HandlerMethodSite extends LogSite {
 
     @SuppressWarnings("Immutable")
     private final Method method;

From fe37072d320e2777870abca7723e8d523bc967d7 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 16:19:38 +0200
Subject: [PATCH 20/32] Update report

---
 license-report.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/license-report.md b/license-report.md
index 46f30ecf9c3..6d7bf2b3aa3 100644
--- a/license-report.md
+++ b/license-report.md
@@ -415,7 +415,7 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:11:17 EET 2020** 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 Mar 02 16:18:04 EET 2020** 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).
 
 
 
@@ -791,7 +791,7 @@ This report was generated on **Mon Mar 02 16:11:17 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:11:17 EET 2020** 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 Mar 02 16:18:05 EET 2020** 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).
 
 
 
@@ -1206,7 +1206,7 @@ This report was generated on **Mon Mar 02 16:11:17 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:11:18 EET 2020** 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 Mar 02 16:18:05 EET 2020** 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).
 
 
 
@@ -1681,7 +1681,7 @@ This report was generated on **Mon Mar 02 16:11:18 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:11:18 EET 2020** 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 Mar 02 16:18:06 EET 2020** 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).
 
 
 
@@ -2113,7 +2113,7 @@ This report was generated on **Mon Mar 02 16:11:18 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:11:19 EET 2020** 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 Mar 02 16:18:07 EET 2020** 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).
 
 
 
@@ -2586,7 +2586,7 @@ This report was generated on **Mon Mar 02 16:11:19 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:11:21 EET 2020** 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 Mar 02 16:18:10 EET 2020** 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).
 
 
 
@@ -3067,7 +3067,7 @@ This report was generated on **Mon Mar 02 16:11:21 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:11:22 EET 2020** 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 Mar 02 16:18:11 EET 2020** 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).
 
 
 
@@ -3584,4 +3584,4 @@ This report was generated on **Mon Mar 02 16:11:22 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:11:25 EET 2020** 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).
\ No newline at end of file
+This report was generated on **Mon Mar 02 16:18:15 EET 2020** 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).
\ No newline at end of file

From bc229c9a7d2a915ac19e9d8fe953d277a073b734 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 16:26:32 +0200
Subject: [PATCH 21/32] Clean up doc

---
 .../java/io/spine/server/log/LogAwareMessageHandler.java  | 8 ++++----
 .../src/main/java/io/spine/server/log/package-info.java   | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java b/server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java
index 6b52899f7c8..7c6c193b67c 100644
--- a/server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java
+++ b/server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java
@@ -24,7 +24,7 @@
 import io.spine.server.model.HandlerMethod;
 
 /**
- * A message handler which, depending on the handled message, alters its own log output.
+ * A message handler which, depending on the message, alters its own log output.
  */
 @Internal
 public interface LogAwareMessageHandler {
@@ -32,7 +32,7 @@ public interface LogAwareMessageHandler {
     /**
      * Enters the handler method invocation.
      *
-     * <p>After calling this method, the message handler should start including the handler method
+     * <p>After this method is called, the message handler should start including the handler method
      * info into the log.
      */
     @Internal
@@ -41,8 +41,8 @@ public interface LogAwareMessageHandler {
     /**
      * Exists the current handler method invocation.
      *
-     * <p>After calling this method, the message handler should not include any handler method info
-     * into the log.
+     * <p>After this method is called, the message handler should not include any handler method
+     * info into the log.
      */
     @Internal
     void resetLog();
diff --git a/server/src/main/java/io/spine/server/log/package-info.java b/server/src/main/java/io/spine/server/log/package-info.java
index bb1efee08e6..f3998d0f18c 100644
--- a/server/src/main/java/io/spine/server/log/package-info.java
+++ b/server/src/main/java/io/spine/server/log/package-info.java
@@ -18,6 +18,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/**
+ * Contains utilities which work with server-side logs.
+ */
+
 @CheckReturnValue
 @ParametersAreNonnullByDefault
 package io.spine.server.log;

From 6d8abff03d71615a9f7edc2c295195fd19b817e6 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 16:26:41 +0200
Subject: [PATCH 22/32] Clean up test env

---
 .../io/spine/server/log/HandlerLogTest.java   | 27 ++++++-------
 .../server/log/given/CardRepository.java      | 39 -------------------
 2 files changed, 11 insertions(+), 55 deletions(-)
 delete mode 100644 server/src/test/java/io/spine/server/log/given/CardRepository.java

diff --git a/server/src/test/java/io/spine/server/log/HandlerLogTest.java b/server/src/test/java/io/spine/server/log/HandlerLogTest.java
index 432d5d65fd5..13d46171221 100644
--- a/server/src/test/java/io/spine/server/log/HandlerLogTest.java
+++ b/server/src/test/java/io/spine/server/log/HandlerLogTest.java
@@ -25,14 +25,15 @@
 import com.google.common.flogger.LoggerConfig;
 import io.spine.core.UserId;
 import io.spine.logging.Logging;
+import io.spine.server.DefaultRepository;
 import io.spine.server.log.given.Books;
 import io.spine.server.log.given.CardAggregate;
-import io.spine.server.log.given.CardRepository;
 import io.spine.server.log.given.TestLogHandler;
 import io.spine.testing.core.given.GivenUserId;
 import io.spine.testing.logging.LogRecordSubject;
 import io.spine.testing.logging.MuteLogging;
 import io.spine.testing.server.blackbox.BlackBoxBoundedContext;
+import io.spine.testing.server.blackbox.SingleTenantBlackBoxContext;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -88,11 +89,7 @@ void resetLog() {
     void includeSignalName() {
         UserId user = GivenUserId.generated();
         BorrowBooks command = borrowBooks(user);
-        BlackBoxBoundedContext
-                .singleTenant()
-                .withActor(user)
-                .with(new CardRepository())
-                .receivesCommand(command);
+        context().receivesCommand(command);
         ImmutableList<LogRecord> records = handler.records();
 
         assertThat(records)
@@ -124,11 +121,7 @@ void includeSignalName() {
     void includeClassName() {
         UserId user = GivenUserId.generated();
         BorrowBooks command = borrowBooks(user);
-        BlackBoxBoundedContext
-                .singleTenant()
-                .withActor(user)
-                .with(new CardRepository())
-                .receivesCommand(command);
+        context().receivesCommand(command);
         ImmutableList<LogRecord> records = handler.records();
 
         assertThat(records)
@@ -148,11 +141,7 @@ void withCause() {
                 .setCard(cardId(user))
                 .setBook(THE_HOBBIT)
                 .vBuild();
-        BlackBoxBoundedContext
-                .singleTenant()
-                .withActor(user)
-                .with(new CardRepository())
-                .receivesCommand(command);
+        context().receivesCommand(command);
         ImmutableList<LogRecord> records = handler.records();
         assertThat(records)
                 .hasSize(1);
@@ -163,6 +152,12 @@ void withCause() {
                     .isInstanceOf(UnknownBook.class);
     }
 
+    private static SingleTenantBlackBoxContext context() {
+        return BlackBoxBoundedContext
+                .singleTenant()
+                .with(DefaultRepository.of(CardAggregate.class));
+    }
+
     private static BorrowBooks borrowBooks(UserId reader) {
         LibraryCardId id = cardId(reader);
         BorrowBooks command = BorrowBooks
diff --git a/server/src/test/java/io/spine/server/log/given/CardRepository.java b/server/src/test/java/io/spine/server/log/given/CardRepository.java
deleted file mode 100644
index 0f37a5a8c2b..00000000000
--- a/server/src/test/java/io/spine/server/log/given/CardRepository.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2020, TeamDev. All rights reserved.
- *
- * 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.log.given;
-
-import io.spine.server.aggregate.AggregateRepository;
-import io.spine.server.log.BorrowBooks;
-import io.spine.server.log.LibraryCardId;
-import io.spine.server.route.CommandRouting;
-
-public final class CardRepository extends AggregateRepository<LibraryCardId, CardAggregate> {
-
-    @Override
-    protected void setupCommandRouting(CommandRouting<LibraryCardId> routing) {
-        super.setupCommandRouting(routing);
-        routing.route(BorrowBooks.class,
-                      (message, context) -> LibraryCardId
-                              .newBuilder()
-                              .setReader(context.getActorContext().getActor())
-                              .build());
-    }
-}

From 86289f37ebca2b024ea5262e60dc818921b3b7f7 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 16:31:59 +0200
Subject: [PATCH 23/32] Use a library test API instead of an own fixture

---
 .../io/spine/server/log/HandlerLogTest.java   | 10 ++--
 .../server/log/given/TestLogHandler.java      | 50 -------------------
 2 files changed, 5 insertions(+), 55 deletions(-)
 delete mode 100644 server/src/test/java/io/spine/server/log/given/TestLogHandler.java

diff --git a/server/src/test/java/io/spine/server/log/HandlerLogTest.java b/server/src/test/java/io/spine/server/log/HandlerLogTest.java
index 13d46171221..484d6801830 100644
--- a/server/src/test/java/io/spine/server/log/HandlerLogTest.java
+++ b/server/src/test/java/io/spine/server/log/HandlerLogTest.java
@@ -20,15 +20,14 @@
 
 package io.spine.server.log;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.flogger.FluentLogger;
 import com.google.common.flogger.LoggerConfig;
+import com.google.common.testing.TestLogHandler;
 import io.spine.core.UserId;
 import io.spine.logging.Logging;
 import io.spine.server.DefaultRepository;
 import io.spine.server.log.given.Books;
 import io.spine.server.log.given.CardAggregate;
-import io.spine.server.log.given.TestLogHandler;
 import io.spine.testing.core.given.GivenUserId;
 import io.spine.testing.logging.LogRecordSubject;
 import io.spine.testing.logging.MuteLogging;
@@ -40,6 +39,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
@@ -90,7 +90,7 @@ void includeSignalName() {
         UserId user = GivenUserId.generated();
         BorrowBooks command = borrowBooks(user);
         context().receivesCommand(command);
-        ImmutableList<LogRecord> records = handler.records();
+        List<LogRecord> records = handler.getStoredLogRecords();
 
         assertThat(records)
                 .hasSize(2);
@@ -122,7 +122,7 @@ void includeClassName() {
         UserId user = GivenUserId.generated();
         BorrowBooks command = borrowBooks(user);
         context().receivesCommand(command);
-        ImmutableList<LogRecord> records = handler.records();
+        List<LogRecord> records = handler.getStoredLogRecords();
 
         assertThat(records)
                 .hasSize(2);
@@ -142,7 +142,7 @@ void withCause() {
                 .setBook(THE_HOBBIT)
                 .vBuild();
         context().receivesCommand(command);
-        ImmutableList<LogRecord> records = handler.records();
+        List<LogRecord> records = handler.getStoredLogRecords();
         assertThat(records)
                 .hasSize(1);
         LogRecord record = records.get(0);
diff --git a/server/src/test/java/io/spine/server/log/given/TestLogHandler.java b/server/src/test/java/io/spine/server/log/given/TestLogHandler.java
deleted file mode 100644
index 6bb09bbe1a3..00000000000
--- a/server/src/test/java/io/spine/server/log/given/TestLogHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2020, TeamDev. All rights reserved.
- *
- * 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.log.given;
-
-import com.google.common.collect.ImmutableList;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Handler;
-import java.util.logging.LogRecord;
-
-public class TestLogHandler extends Handler {
-
-    private final List<LogRecord> records = new ArrayList<>();
-
-    public ImmutableList<LogRecord> records() {
-        return ImmutableList.copyOf(records);
-    }
-
-    @Override
-    public void publish(LogRecord record) {
-        records.add(record);
-    }
-
-    @Override
-    public void flush() {
-    }
-
-    @Override
-    public void close() throws SecurityException {
-    }
-}

From 1857a23901cd095778f76ea6c7adeaf6452d4ab8 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 17:46:53 +0200
Subject: [PATCH 24/32] Separate parameters from `ActorContext` and add tests

---
 license-report.md                             |  16 +--
 .../java/io/spine/server/log/given/Books.java |   3 +
 .../spine/testing/server/blackbox/Actor.java  |  83 ++++++++++----
 .../blackbox/BlackBoxBoundedContext.java      |  29 ++++-
 .../blackbox/MultitenantBlackBoxContext.java  |   7 +-
 .../blackbox/SingleTenantBlackBoxContext.java |   7 +-
 .../blackbox/BlackBoxBoundedContextTest.java  | 102 ++++++++++++++++--
 .../blackbox/given/BbProjectAggregate.java    |  12 +++
 .../testing/server/blackbox/given/Given.java  |   8 ++
 .../testing/server/blackbox/commands.proto    |   4 +
 10 files changed, 218 insertions(+), 53 deletions(-)

diff --git a/license-report.md b/license-report.md
index 6d7bf2b3aa3..2f03e3fbdfa 100644
--- a/license-report.md
+++ b/license-report.md
@@ -415,7 +415,7 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:18:04 EET 2020** 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 Mar 02 17:39:14 EET 2020** 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).
 
 
 
@@ -791,7 +791,7 @@ This report was generated on **Mon Mar 02 16:18:04 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:18:05 EET 2020** 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 Mar 02 17:39:14 EET 2020** 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).
 
 
 
@@ -1206,7 +1206,7 @@ This report was generated on **Mon Mar 02 16:18:05 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:18:05 EET 2020** 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 Mar 02 17:39:15 EET 2020** 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).
 
 
 
@@ -1681,7 +1681,7 @@ This report was generated on **Mon Mar 02 16:18:05 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:18:06 EET 2020** 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 Mar 02 17:39:15 EET 2020** 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).
 
 
 
@@ -2113,7 +2113,7 @@ This report was generated on **Mon Mar 02 16:18:06 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:18:07 EET 2020** 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 Mar 02 17:39:16 EET 2020** 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).
 
 
 
@@ -2586,7 +2586,7 @@ This report was generated on **Mon Mar 02 16:18:07 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:18:10 EET 2020** 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 Mar 02 17:39:18 EET 2020** 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).
 
 
 
@@ -3067,7 +3067,7 @@ This report was generated on **Mon Mar 02 16:18:10 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:18:11 EET 2020** 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 Mar 02 17:39:20 EET 2020** 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).
 
 
 
@@ -3584,4 +3584,4 @@ This report was generated on **Mon Mar 02 16:18:11 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 16:18:15 EET 2020** 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).
\ No newline at end of file
+This report was generated on **Mon Mar 02 17:39:23 EET 2020** 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).
\ No newline at end of file
diff --git a/server/src/test/java/io/spine/server/log/given/Books.java b/server/src/test/java/io/spine/server/log/given/Books.java
index f02d28d084d..58a2a9294f1 100644
--- a/server/src/test/java/io/spine/server/log/given/Books.java
+++ b/server/src/test/java/io/spine/server/log/given/Books.java
@@ -24,6 +24,9 @@
 import io.spine.server.log.Book;
 import io.spine.server.log.Isbn;
 
+/**
+ * A test factory for instances of {@code Book} and {@code Isbn}.
+ */
 public final class Books {
 
     public static final Isbn BIG_BLUE_BOOK = isbn("978-0321125217");
diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/Actor.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/Actor.java
index 0b0b3134fe3..532e1a419e0 100644
--- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/Actor.java
+++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/Actor.java
@@ -20,27 +20,43 @@
 
 package io.spine.testing.server.blackbox;
 
-import io.spine.core.ActorContext;
+import com.google.common.annotations.VisibleForTesting;
+import io.spine.core.TenantId;
 import io.spine.core.UserId;
-
-import java.util.function.Supplier;
+import io.spine.testing.client.TestActorRequestFactory;
+import io.spine.time.ZoneId;
+import io.spine.time.ZoneOffset;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static io.spine.base.Time.currentTime;
 import static io.spine.util.Preconditions2.checkNotEmptyOrBlank;
 import static io.spine.validate.Validate.checkValid;
 
+/**
+ * A factory of test actor request factories.
+ */
+@VisibleForTesting
 final class Actor {
 
     private static final Actor defaultActor = from(BlackBoxBoundedContext.class.getName());
 
-    private final Supplier<ActorContext> context;
+    private final UserId id;
+    private final ZoneId zoneId;
+    private final ZoneOffset zoneOffset;
 
-    private Actor(Supplier<ActorContext> context) {
-        this.context = context;
+    private Actor(UserId id, ZoneId zoneId, ZoneOffset zoneOffset) {
+        this.id = id;
+        this.zoneId = zoneId;
+        this.zoneOffset = zoneOffset;
+    }
+
+    /**
+     * Obtains the default actor.
+     */
+    static Actor defaultActor() {
+        return defaultActor;
     }
 
-    public static Actor from(String userId) {
+    private static Actor from(String userId) {
         checkNotEmptyOrBlank(userId);
         UserId id = UserId
                 .newBuilder()
@@ -49,26 +65,49 @@ public static Actor from(String userId) {
         return from(id);
     }
 
-    public static Actor from(UserId userId) {
+    /**
+     * Creates a new actor with the given actor ID and the default time zone.
+     */
+    static Actor from(UserId userId) {
         checkNotNull(userId);
-        return new Actor(() -> ActorContext
-                .newBuilder()
-                .setActor(userId)
-                .setTimestamp(currentTime())
-                .vBuild());
+        checkValid(userId);
+        return new Actor(userId,
+                         ZoneId.getDefaultInstance(),
+                         ZoneOffset.getDefaultInstance());
     }
 
-    public static Actor with(ActorContext context) {
-        checkNotNull(context);
-        checkValid(context);
-        return new Actor(() -> context);
+    /**
+     * Creates a new actor with the given time zone and the default actor ID.
+     */
+    static Actor from(ZoneId zoneId, ZoneOffset zoneOffset) {
+        checkNotNull(zoneId);
+        checkNotNull(zoneOffset);
+        return new Actor(defaultActor.id, zoneId, zoneOffset);
     }
 
-    public static Actor defaultActor() {
-        return defaultActor;
+    /**
+     * Creates a new actor with the given actor ID and time zone.
+     */
+    static Actor from(UserId userId, ZoneId zoneId, ZoneOffset zoneOffset) {
+        checkNotNull(userId);
+        checkNotNull(zoneId);
+        checkNotNull(zoneOffset);
+        return new Actor(userId, zoneId, zoneOffset);
+    }
+
+    /**
+     * Creates a new factory for requests of the single tenant.
+     */
+    TestActorRequestFactory requests() {
+        return new TestActorRequestFactory(null, id, zoneOffset, zoneId);
     }
 
-    public ActorContext context() {
-        return context.get();
+    /**
+     * Creates a new factory for requests of the given tenant.
+     */
+    TestActorRequestFactory requestsFor(TenantId tenant) {
+        checkNotNull(tenant);
+        checkValid(tenant);
+        return new TestActorRequestFactory(tenant, id, zoneOffset, zoneId);
     }
 }
diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxBoundedContext.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxBoundedContext.java
index 18f98018883..31638a10aa8 100644
--- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxBoundedContext.java
+++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/BlackBoxBoundedContext.java
@@ -37,7 +37,6 @@
 import io.spine.client.Subscription;
 import io.spine.client.Topic;
 import io.spine.core.Ack;
-import io.spine.core.ActorContext;
 import io.spine.core.BoundedContextName;
 import io.spine.core.Command;
 import io.spine.core.Event;
@@ -73,6 +72,8 @@
 import io.spine.testing.server.blackbox.verify.state.VerifyState;
 import io.spine.testing.server.blackbox.verify.subscription.ToProtoSubjects;
 import io.spine.testing.server.entity.EntitySubject;
+import io.spine.time.ZoneId;
+import io.spine.time.ZoneOffset;
 import io.spine.type.TypeName;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -329,18 +330,36 @@ public BoundedContextName name() {
         return context.name();
     }
 
+    /**
+     * Sets the given {@link UserId} as the actor ID for the requests produced by this context.
+     */
     public final T withActor(UserId user) {
         this.actor = Actor.from(user);
         return thisRef();
     }
 
-    public final T withActor(ActorContext context) {
-        this.actor = Actor.with(context);
+    /**
+     * Sets the given time zone parameters for the actor requests produced by this context.
+     */
+    public final T in(ZoneId zoneId, ZoneOffset zoneOffset) {
+        this.actor = Actor.from(zoneId, zoneOffset);
         return thisRef();
     }
 
-    protected final ActorContext context() {
-        return actor.context();
+    /**
+     * Sets the given actor ID and time zone parameters for the actor requests produced by this
+     * context.
+     */
+    public final T withActorIn(UserId userId, ZoneId zoneId, ZoneOffset zoneOffset) {
+        this.actor = Actor.from(userId, zoneId, zoneOffset);
+        return thisRef();
+    }
+
+    /**
+     * Obtains the current {@link Actor}.
+     */
+    protected final Actor actor() {
+        return this.actor;
     }
 
     /**
diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/MultitenantBlackBoxContext.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/MultitenantBlackBoxContext.java
index 6568eb39395..85f76c10ab9 100644
--- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/MultitenantBlackBoxContext.java
+++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/MultitenantBlackBoxContext.java
@@ -22,7 +22,6 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
-import io.spine.core.ActorContext;
 import io.spine.core.Command;
 import io.spine.core.Event;
 import io.spine.core.TenantId;
@@ -67,11 +66,7 @@ public MultitenantBlackBoxContext withTenant(TenantId tenant) {
 
     @Override
     protected TestActorRequestFactory requestFactory() {
-        ActorContext context = context();
-        return new TestActorRequestFactory(tenantId(),
-                                           context.getActor(),
-                                           context.getZoneOffset(),
-                                           context.getZoneId());
+        return actor().requestsFor(tenantId());
     }
 
     @Override
diff --git a/testutil-server/src/main/java/io/spine/testing/server/blackbox/SingleTenantBlackBoxContext.java b/testutil-server/src/main/java/io/spine/testing/server/blackbox/SingleTenantBlackBoxContext.java
index 297a98e5395..fcd0ebf84c4 100644
--- a/testutil-server/src/main/java/io/spine/testing/server/blackbox/SingleTenantBlackBoxContext.java
+++ b/testutil-server/src/main/java/io/spine/testing/server/blackbox/SingleTenantBlackBoxContext.java
@@ -22,7 +22,6 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
-import io.spine.core.ActorContext;
 import io.spine.core.Command;
 import io.spine.core.Event;
 import io.spine.server.event.EventEnricher;
@@ -51,10 +50,6 @@ protected ImmutableList<Event> select(EventCollector collector) {
 
     @Override
     protected TestActorRequestFactory requestFactory() {
-        ActorContext context = context();
-        return new TestActorRequestFactory(null,
-                                           context.getActor(),
-                                           context.getZoneOffset(),
-                                           context.getZoneId());
+        return actor().requests();
     }
 }
diff --git a/testutil-server/src/test/java/io/spine/testing/server/blackbox/BlackBoxBoundedContextTest.java b/testutil-server/src/test/java/io/spine/testing/server/blackbox/BlackBoxBoundedContextTest.java
index 12fc4bf79c2..c9f4eaba0c8 100644
--- a/testutil-server/src/test/java/io/spine/testing/server/blackbox/BlackBoxBoundedContextTest.java
+++ b/testutil-server/src/test/java/io/spine/testing/server/blackbox/BlackBoxBoundedContextTest.java
@@ -24,11 +24,13 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.truth.IterableSubject;
 import com.google.common.truth.Subject;
+import com.google.common.truth.Truth;
 import com.google.protobuf.Message;
 import io.spine.client.Query;
 import io.spine.client.QueryFactory;
 import io.spine.client.Topic;
 import io.spine.client.TopicFactory;
+import io.spine.core.ActorContext;
 import io.spine.core.Event;
 import io.spine.core.UserId;
 import io.spine.server.BoundedContextBuilder;
@@ -41,10 +43,12 @@
 import io.spine.server.event.EventEnricher;
 import io.spine.server.projection.ProjectionRepository;
 import io.spine.server.type.CommandClass;
+import io.spine.testing.core.given.GivenUserId;
 import io.spine.testing.logging.MuteLogging;
 import io.spine.testing.server.BlackBoxId;
 import io.spine.testing.server.EventSubject;
 import io.spine.testing.server.VerifyingCounter;
+import io.spine.testing.server.blackbox.command.BbAssignSelf;
 import io.spine.testing.server.blackbox.command.BbCreateProject;
 import io.spine.testing.server.blackbox.command.BbFinalizeProject;
 import io.spine.testing.server.blackbox.command.BbRegisterCommandDispatcher;
@@ -67,6 +71,10 @@
 import io.spine.testing.server.blackbox.given.RepositoryThrowingExceptionOnClose;
 import io.spine.testing.server.blackbox.rejection.Rejections;
 import io.spine.testing.server.entity.EntitySubject;
+import io.spine.time.ZoneId;
+import io.spine.time.ZoneIds;
+import io.spine.time.ZoneOffset;
+import io.spine.time.ZoneOffsets;
 import io.spine.type.TypeName;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -79,10 +87,12 @@
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth8.assertThat;
+import static com.google.common.truth.extensions.proto.ProtoTruth.assertThat;
 import static io.spine.protobuf.AnyPacker.unpack;
 import static io.spine.testing.core.given.GivenUserId.newUuid;
 import static io.spine.testing.server.blackbox.given.Given.addProjectAssignee;
 import static io.spine.testing.server.blackbox.given.Given.addTask;
+import static io.spine.testing.server.blackbox.given.Given.assignSelf;
 import static io.spine.testing.server.blackbox.given.Given.createProject;
 import static io.spine.testing.server.blackbox.given.Given.createReport;
 import static io.spine.testing.server.blackbox.given.Given.createdProjectState;
@@ -366,10 +376,10 @@ void defaultProducer() {
         BbProjectId projectId = newProjectId();
         context.receivesEvent(taskAdded(projectId));
         ImmutableList<Event> events = context.allEvents();
-        assertThat(events).hasSize(1);
+        Truth.assertThat(events).hasSize(1);
         Message producer = unpack(getOnlyElement(events).getContext()
                                                         .getProducerId());
-        Subject assertProducer = assertThat(producer);
+        Subject assertProducer = Truth.assertThat(producer);
         assertProducer.isInstanceOf(BlackBoxId.class);
         BlackBoxId expectedId = BlackBoxId
                 .newBuilder()
@@ -384,10 +394,10 @@ void customProducer() {
         BbProjectId projectId = newProjectId();
         context.receivesEventsProducedBy(projectId, taskAdded(projectId));
         ImmutableList<Event> events = context.allEvents();
-        assertThat(events).hasSize(1);
+        Truth.assertThat(events).hasSize(1);
         Message producer = unpack(getOnlyElement(events).getContext()
                                                         .getProducerId());
-        Subject assertProducer = assertThat(producer);
+        Subject assertProducer = Truth.assertThat(producer);
         assertProducer.isInstanceOf(BbProjectId.class);
         assertProducer.isEqualTo(projectId);
     }
@@ -688,7 +698,7 @@ void postCommands() {
         @Test
         @DisplayName("event messages")
         void eventMessages() {
-            IterableSubject assertEventMessages = assertThat(context.eventMessages());
+            IterableSubject assertEventMessages = Truth.assertThat(context.eventMessages());
             assertEventMessages.isNotEmpty();
             assertEventMessages.hasSize(context.events()
                                                .size());
@@ -697,10 +707,90 @@ void eventMessages() {
         @Test
         @DisplayName("command messages")
         void commandMessages() {
-            IterableSubject assertCommandMessages = assertThat(context.commandMessages());
+            IterableSubject assertCommandMessages = Truth.assertThat(context.commandMessages());
             assertCommandMessages.isNotEmpty();
             assertCommandMessages.hasSize(context.commands()
                                                  .size());
         }
     }
+
+    @Nested
+    @DisplayName("produce requests with the given actor")
+    class WithGivenActor {
+
+        @Test
+        @DisplayName("ID")
+        void id() {
+            UserId actor = GivenUserId.of("my-actor");
+            BbCreateProject createProject = createProject();
+            BbProjectId id = createProject.getProjectId();
+            BbAssignSelf assignSelf = assignSelf(id);
+            context.withActor(actor)
+                   .receivesCommands(createProject, assignSelf)
+                   .assertEntityWithState(BbProject.class, id)
+                   .hasStateThat()
+                   .comparingExpectedFieldsOnly()
+                   .isEqualTo(BbProject
+                                      .newBuilder()
+                                      .setId(id)
+                                      .addAssignee(actor)
+                                      .buildPartial());
+        }
+
+        @Test
+        @DisplayName("time zone")
+        void timeZone() {
+            UserId actor = GivenUserId.of("my-other-actor");
+            BbCreateProject createProject = createProject();
+            BbProjectId id = createProject.getProjectId();
+            ZoneId zoneId = ZoneIds.of("UTC+1");
+            ZoneOffset zoneOffset = ZoneOffsets.ofHours(1);
+            context.withActorIn(actor, zoneId, zoneOffset)
+                   .receivesCommand(createProject)
+                   .assertEntityWithState(BbProject.class, id)
+                   .exists();
+            EventSubject events = context.assertEvents()
+                                         .withType(BbProjectCreated.class);
+            events.hasSize(1);
+            ActorContext context = events.actual()
+                                         .get(0)
+                                         .context()
+                                         .actorContext();
+            assertThat(context)
+                    .comparingExpectedFieldsOnly()
+                    .isEqualTo(ActorContext
+                                       .newBuilder()
+                                       .setActor(actor)
+                                       .setZoneId(zoneId)
+                                       .setZoneOffset(zoneOffset)
+                                       .buildPartial());
+        }
+
+        @Test
+        @DisplayName("ID and time zone")
+        void idAndTimeZone() {
+            BbCreateProject createProject = createProject();
+            BbProjectId id = createProject.getProjectId();
+            ZoneId zoneId = ZoneIds.of("UTC-1");
+            ZoneOffset zoneOffset = ZoneOffsets.ofHours(-1);
+            context.in(zoneId, zoneOffset)
+                   .receivesCommand(createProject)
+                   .assertEntityWithState(BbProject.class, id)
+                   .exists();
+            EventSubject events = context.assertEvents()
+                                         .withType(BbProjectCreated.class);
+            events.hasSize(1);
+            ActorContext context = events.actual()
+                                         .get(0)
+                                         .context()
+                                         .actorContext();
+            assertThat(context)
+                    .comparingExpectedFieldsOnly()
+                    .isEqualTo(ActorContext
+                                       .newBuilder()
+                                       .setZoneId(zoneId)
+                                       .setZoneOffset(zoneOffset)
+                                       .buildPartial());
+        }
+    }
 }
diff --git a/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/BbProjectAggregate.java b/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/BbProjectAggregate.java
index fc8b868e80d..8e2b0cf8a45 100644
--- a/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/BbProjectAggregate.java
+++ b/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/BbProjectAggregate.java
@@ -20,6 +20,7 @@
 
 package io.spine.testing.server.blackbox.given;
 
+import io.spine.core.CommandContext;
 import io.spine.core.UserId;
 import io.spine.server.aggregate.Aggregate;
 import io.spine.server.aggregate.Apply;
@@ -30,6 +31,7 @@
 import io.spine.testing.server.blackbox.BbTask;
 import io.spine.testing.server.blackbox.command.BbAddTask;
 import io.spine.testing.server.blackbox.command.BbAssignProject;
+import io.spine.testing.server.blackbox.command.BbAssignSelf;
 import io.spine.testing.server.blackbox.command.BbCreateProject;
 import io.spine.testing.server.blackbox.command.BbStartProject;
 import io.spine.testing.server.blackbox.event.BbAssigneeAdded;
@@ -101,6 +103,16 @@ BbAssigneeAdded handle(BbAssignProject command) {
                 .build();
     }
 
+    @Assign
+    BbAssigneeAdded handle(BbAssignSelf command, CommandContext context) {
+        UserId assignee = context.getActorContext().getActor();
+        return BbAssigneeAdded
+                .newBuilder()
+                .setId(id())
+                .setUserId(assignee)
+                .build();
+    }
+
     @React(external = true)
     Optional<BbAssigneeRemoved> on(BbUserDeleted event) {
         List<UserId> assignees = state().getAssigneeList();
diff --git a/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/Given.java b/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/Given.java
index a7e57148e7e..a10b80bd624 100644
--- a/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/Given.java
+++ b/testutil-server/src/test/java/io/spine/testing/server/blackbox/given/Given.java
@@ -30,6 +30,7 @@
 import io.spine.testing.server.blackbox.BbTask;
 import io.spine.testing.server.blackbox.command.BbAddTask;
 import io.spine.testing.server.blackbox.command.BbAssignProject;
+import io.spine.testing.server.blackbox.command.BbAssignSelf;
 import io.spine.testing.server.blackbox.command.BbCreateProject;
 import io.spine.testing.server.blackbox.command.BbCreateReport;
 import io.spine.testing.server.blackbox.command.BbFinalizeProject;
@@ -129,6 +130,13 @@ public static BbCreateProject createProject(BbProjectId id) {
                 .build();
     }
 
+    public static BbAssignSelf assignSelf(BbProjectId id) {
+        return BbAssignSelf
+                .newBuilder()
+                .setProjectId(id)
+                .build();
+    }
+
     public static BbInitProject initProject(BbProjectId id, boolean scrum) {
         BbInitProject.Builder builder = BbInitProject
                 .newBuilder()
diff --git a/testutil-server/src/test/proto/spine/testing/server/blackbox/commands.proto b/testutil-server/src/test/proto/spine/testing/server/blackbox/commands.proto
index 714b3a827b6..6a2df5dc589 100644
--- a/testutil-server/src/test/proto/spine/testing/server/blackbox/commands.proto
+++ b/testutil-server/src/test/proto/spine/testing/server/blackbox/commands.proto
@@ -51,6 +51,10 @@ message BbAssignTeam {
     repeated spine.core.UserId member = 2 [(required) = true];
 }
 
+message BbAssignSelf {
+    BbProjectId project_id = 1;
+}
+
 message BbAssignScrumMaster {
     BbProjectId project_id = 1;
     spine.core.UserId scrum_master = 2 [(required) = true];

From d37465a03da5ed3f1b11d69b4bd0e958e4f6b5f5 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 17:51:06 +0200
Subject: [PATCH 25/32] Clean up static API usage

---
 .../server/blackbox/BlackBoxBoundedContextTest.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/testutil-server/src/test/java/io/spine/testing/server/blackbox/BlackBoxBoundedContextTest.java b/testutil-server/src/test/java/io/spine/testing/server/blackbox/BlackBoxBoundedContextTest.java
index c9f4eaba0c8..cd53a697356 100644
--- a/testutil-server/src/test/java/io/spine/testing/server/blackbox/BlackBoxBoundedContextTest.java
+++ b/testutil-server/src/test/java/io/spine/testing/server/blackbox/BlackBoxBoundedContextTest.java
@@ -24,7 +24,6 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.truth.IterableSubject;
 import com.google.common.truth.Subject;
-import com.google.common.truth.Truth;
 import com.google.protobuf.Message;
 import io.spine.client.Query;
 import io.spine.client.QueryFactory;
@@ -376,10 +375,10 @@ void defaultProducer() {
         BbProjectId projectId = newProjectId();
         context.receivesEvent(taskAdded(projectId));
         ImmutableList<Event> events = context.allEvents();
-        Truth.assertThat(events).hasSize(1);
+        assertThat(events).hasSize(1);
         Message producer = unpack(getOnlyElement(events).getContext()
                                                         .getProducerId());
-        Subject assertProducer = Truth.assertThat(producer);
+        Subject assertProducer = assertThat(producer);
         assertProducer.isInstanceOf(BlackBoxId.class);
         BlackBoxId expectedId = BlackBoxId
                 .newBuilder()
@@ -394,10 +393,10 @@ void customProducer() {
         BbProjectId projectId = newProjectId();
         context.receivesEventsProducedBy(projectId, taskAdded(projectId));
         ImmutableList<Event> events = context.allEvents();
-        Truth.assertThat(events).hasSize(1);
+        assertThat(events).hasSize(1);
         Message producer = unpack(getOnlyElement(events).getContext()
                                                         .getProducerId());
-        Subject assertProducer = Truth.assertThat(producer);
+        Subject assertProducer = assertThat(producer);
         assertProducer.isInstanceOf(BbProjectId.class);
         assertProducer.isEqualTo(projectId);
     }
@@ -698,7 +697,7 @@ void postCommands() {
         @Test
         @DisplayName("event messages")
         void eventMessages() {
-            IterableSubject assertEventMessages = Truth.assertThat(context.eventMessages());
+            IterableSubject assertEventMessages = assertThat(context.eventMessages());
             assertEventMessages.isNotEmpty();
             assertEventMessages.hasSize(context.events()
                                                .size());
@@ -707,7 +706,7 @@ void eventMessages() {
         @Test
         @DisplayName("command messages")
         void commandMessages() {
-            IterableSubject assertCommandMessages = Truth.assertThat(context.commandMessages());
+            IterableSubject assertCommandMessages = assertThat(context.commandMessages());
             assertCommandMessages.isNotEmpty();
             assertCommandMessages.hasSize(context.commands()
                                                  .size());

From 0413d0ebface25753b4a89930db936987bc0a7d1 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 19:09:10 +0200
Subject: [PATCH 26/32] Update version to 1.4.10

---
 license-report.md | 32 ++++++++++++++++----------------
 pom.xml           |  6 +++---
 version.gradle    |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/license-report.md b/license-report.md
index 2f03e3fbdfa..5cd75871a05 100644
--- a/license-report.md
+++ b/license-report.md
@@ -1,6 +1,6 @@
 
     
-# Dependencies of `io.spine:spine-client:1.4.8`
+# Dependencies of `io.spine:spine-client:1.4.10`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -415,12 +415,12 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 17:39:14 EET 2020** 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 Mar 02 18:43:48 EET 2020** 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:1.4.8`
+# Dependencies of `io.spine:spine-core:1.4.10`
 
 ## Runtime
 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
@@ -791,12 +791,12 @@ This report was generated on **Mon Mar 02 17:39:14 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 17:39:14 EET 2020** 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 Mar 02 18:43:48 EET 2020** 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:1.4.8`
+# Dependencies of `io.spine.tools:spine-model-assembler:1.4.10`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -1206,12 +1206,12 @@ This report was generated on **Mon Mar 02 17:39:14 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 17:39:15 EET 2020** 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 Mar 02 18:43:49 EET 2020** 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:1.4.8`
+# Dependencies of `io.spine.tools:spine-model-verifier:1.4.10`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -1681,12 +1681,12 @@ This report was generated on **Mon Mar 02 17:39:15 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 17:39:15 EET 2020** 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 Mar 02 18:43:49 EET 2020** 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:1.4.8`
+# Dependencies of `io.spine:spine-server:1.4.10`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -2113,12 +2113,12 @@ This report was generated on **Mon Mar 02 17:39:15 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 17:39:16 EET 2020** 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 Mar 02 18:43:50 EET 2020** 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-testutil-client:1.4.8`
+# Dependencies of `io.spine:spine-testutil-client:1.4.10`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -2586,12 +2586,12 @@ This report was generated on **Mon Mar 02 17:39:16 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 17:39:18 EET 2020** 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 Mar 02 18:43:52 EET 2020** 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-testutil-core:1.4.8`
+# Dependencies of `io.spine:spine-testutil-core:1.4.10`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -3067,12 +3067,12 @@ This report was generated on **Mon Mar 02 17:39:18 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 17:39:20 EET 2020** 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 Mar 02 18:43:54 EET 2020** 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-testutil-server:1.4.8`
+# Dependencies of `io.spine:spine-testutil-server:1.4.10`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -3584,4 +3584,4 @@ This report was generated on **Mon Mar 02 17:39:20 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 17:39:23 EET 2020** 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).
\ No newline at end of file
+This report was generated on **Mon Mar 02 18:43:58 EET 2020** 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).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 46cb51b5902..0e9f7dccadb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@ all modules and does not describe the project structure per-subproject.
 
 <groupId>io.spine</groupId>
 <artifactId>spine-core-java</artifactId>
-<version>1.4.8</version>
+<version>1.4.10</version>
 
 <inceptionYear>2015</inceptionYear>
 
@@ -76,7 +76,7 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine</groupId>
     <artifactId>spine-time</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.7</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
@@ -136,7 +136,7 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine</groupId>
     <artifactId>spine-testutil-time</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.7</version>
     <scope>test</scope>
   </dependency>
   <dependency>
diff --git a/version.gradle b/version.gradle
index e88da1ee018..545519294b3 100644
--- a/version.gradle
+++ b/version.gradle
@@ -25,7 +25,7 @@
  * as we want to manage the versions in a single source.
  */
 
-final def spineVersion = '1.4.8'
+final def spineVersion = '1.4.10'
 
 ext {
     // The version of the modules in this project.

From b57f243d0a40b3d685432a3a9ab1f225c09257ed Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Mon, 2 Mar 2020 20:55:45 +0200
Subject: [PATCH 27/32] Rename `LogAwareMessageHandler` to `HandlerLifecycle`

---
 license-report.md                             | 16 ++--
 .../spine/server/entity/AbstractEntity.java   | 13 ++--
 .../io/spine/server/log/HandlerLifecycle.java | 74 +++++++++++++++++++
 .../java/io/spine/server/log/HandlerLog.java  |  2 -
 .../server/log/LogAwareMessageHandler.java    | 49 ------------
 .../server/model/AbstractHandlerMethod.java   | 14 ++--
 6 files changed, 96 insertions(+), 72 deletions(-)
 create mode 100644 server/src/main/java/io/spine/server/log/HandlerLifecycle.java
 delete mode 100644 server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java

diff --git a/license-report.md b/license-report.md
index 5cd75871a05..a668e0c271f 100644
--- a/license-report.md
+++ b/license-report.md
@@ -415,7 +415,7 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 18:43:48 EET 2020** 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 Mar 02 20:54:12 EET 2020** 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).
 
 
 
@@ -791,7 +791,7 @@ This report was generated on **Mon Mar 02 18:43:48 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 18:43:48 EET 2020** 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 Mar 02 20:54:13 EET 2020** 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).
 
 
 
@@ -1206,7 +1206,7 @@ This report was generated on **Mon Mar 02 18:43:48 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 18:43:49 EET 2020** 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 Mar 02 20:54:13 EET 2020** 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).
 
 
 
@@ -1681,7 +1681,7 @@ This report was generated on **Mon Mar 02 18:43:49 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 18:43:49 EET 2020** 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 Mar 02 20:54:13 EET 2020** 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).
 
 
 
@@ -2113,7 +2113,7 @@ This report was generated on **Mon Mar 02 18:43:49 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 18:43:50 EET 2020** 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 Mar 02 20:54:14 EET 2020** 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).
 
 
 
@@ -2586,7 +2586,7 @@ This report was generated on **Mon Mar 02 18:43:50 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 18:43:52 EET 2020** 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 Mar 02 20:54:16 EET 2020** 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).
 
 
 
@@ -3067,7 +3067,7 @@ This report was generated on **Mon Mar 02 18:43:52 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 18:43:54 EET 2020** 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 Mar 02 20:54:18 EET 2020** 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).
 
 
 
@@ -3584,4 +3584,4 @@ This report was generated on **Mon Mar 02 18:43:54 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 18:43:58 EET 2020** 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).
\ No newline at end of file
+This report was generated on **Mon Mar 02 20:54:21 EET 2020** 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).
\ No newline at end of file
diff --git a/server/src/main/java/io/spine/server/entity/AbstractEntity.java b/server/src/main/java/io/spine/server/entity/AbstractEntity.java
index 43f6e6ca4f4..c3f6e029f5f 100644
--- a/server/src/main/java/io/spine/server/entity/AbstractEntity.java
+++ b/server/src/main/java/io/spine/server/entity/AbstractEntity.java
@@ -23,6 +23,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
 import com.google.common.flogger.FluentLogger;
+import com.google.errorprone.annotations.OverridingMethodsMustInvokeSuper;
 import com.google.errorprone.annotations.concurrent.LazyInit;
 import com.google.protobuf.Any;
 import com.google.protobuf.Message;
@@ -36,8 +37,8 @@
 import io.spine.server.entity.model.EntityClass;
 import io.spine.server.entity.rejection.CannotModifyArchivedEntity;
 import io.spine.server.entity.rejection.CannotModifyDeletedEntity;
+import io.spine.server.log.HandlerLifecycle;
 import io.spine.server.log.HandlerLog;
-import io.spine.server.log.LogAwareMessageHandler;
 import io.spine.server.model.HandlerMethod;
 import io.spine.string.Stringifiers;
 import io.spine.validate.ConstraintViolation;
@@ -68,7 +69,7 @@
             fields. See Effective Java 2nd Ed. Item #71. */,
         "ClassWithTooManyMethods"})
 public abstract class AbstractEntity<I, S extends EntityState>
-        implements Entity<I, S>, LogAwareMessageHandler {
+        implements Entity<I, S>, HandlerLifecycle {
 
     /**
      * Lazily initialized reference to the model class of this entity.
@@ -517,17 +518,17 @@ public Timestamp whenModified() {
         return version.getTimestamp();
     }
 
-    @Internal
+    @OverridingMethodsMustInvokeSuper
     @Override
-    public final void enter(HandlerMethod<?, ?, ?, ?> method) {
+    public void beforeInvoke(HandlerMethod<?, ?, ?, ?> method) {
         checkNotNull(method);
         FluentLogger logger = loggerFor(getClass());
         this.handlerLog = new HandlerLog(logger, method);
     }
 
-    @Internal
+    @OverridingMethodsMustInvokeSuper
     @Override
-    public void resetLog() {
+    public void afterInvoke(HandlerMethod<?, ?, ?, ?> method) {
         this.handlerLog = null;
     }
 
diff --git a/server/src/main/java/io/spine/server/log/HandlerLifecycle.java b/server/src/main/java/io/spine/server/log/HandlerLifecycle.java
new file mode 100644
index 00000000000..bfeec8efeb2
--- /dev/null
+++ b/server/src/main/java/io/spine/server/log/HandlerLifecycle.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2020, TeamDev. All rights reserved.
+ *
+ * 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.log;
+
+import io.spine.server.model.HandlerMethod;
+
+/**
+ * Callbacks for a {@link HandlerMethod} invocation.
+ *
+ * <p>If the target of the method implements {@code HandlerLifecycle}, it is invoked alongside
+ * handler method. For example:
+ * <pre>
+ * class SignUpSubscriber extends AbstractEventSubscriber implements HandlerLifecycle {
+ *
+ *    {@literal @Subscribe}
+ *     void on(UserSignedUp event) {
+ *         // ...
+ *     }
+ *
+ *    {@literal @Override}
+ *     public void beforeInvoke(HandlerMethod<?, ?, ?, ?> method) {
+ *         // ...
+ *     }
+ *
+ *    {@literal @Override}
+ *     public void afterInvoke(HandlerMethod<?, ?, ?, ?> method) {
+ *         // ...
+ *     }
+ * }
+ * </pre>
+ *
+ * <p>When a {@code UserSignedUp} event is dispatched to the {@code SignUpSubscriber},
+ * the invocation order goes as follows:
+ * <ol>
+ *     <li>{@code beforeInvoke([instance representing on(UserSignedUp) method])}.
+ *     <li>{@code on(UserSignedUp)}.
+ *     <li>{@code afterInvoke([instance representing on(UserSignedUp) method])}.
+ * </ol>
+ */
+public interface HandlerLifecycle {
+
+    /**
+     * A callback for a handler method invocation start.
+     *
+     * <p>The handler method is invoked immediately after this method.
+     */
+    void beforeInvoke(HandlerMethod<?, ?, ?, ?> method);
+
+    /**
+     * A callback for a handler method invocation end.
+     *
+     * <p>This method is invoked immediately after the handler method, even if it has thrown
+     * an exception.
+     */
+    void afterInvoke(HandlerMethod<?, ?, ?, ?> method);
+}
diff --git a/server/src/main/java/io/spine/server/log/HandlerLog.java b/server/src/main/java/io/spine/server/log/HandlerLog.java
index 9e544f362e2..e48caea7017 100644
--- a/server/src/main/java/io/spine/server/log/HandlerLog.java
+++ b/server/src/main/java/io/spine/server/log/HandlerLog.java
@@ -22,7 +22,6 @@
 
 import com.google.common.flogger.FluentLogger;
 import com.google.common.flogger.LogSite;
-import io.spine.annotation.Internal;
 import io.spine.server.model.HandlerMethod;
 
 import java.util.logging.Level;
@@ -40,7 +39,6 @@ public final class HandlerLog {
     private final FluentLogger logger;
     private final LogSite logSite;
 
-    @Internal
     public HandlerLog(FluentLogger logger, HandlerMethod<?, ?, ?, ?> method) {
         this.logger = checkNotNull(logger);
         checkNotNull(method);
diff --git a/server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java b/server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java
deleted file mode 100644
index 7c6c193b67c..00000000000
--- a/server/src/main/java/io/spine/server/log/LogAwareMessageHandler.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2020, TeamDev. All rights reserved.
- *
- * 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.log;
-
-import io.spine.annotation.Internal;
-import io.spine.server.model.HandlerMethod;
-
-/**
- * A message handler which, depending on the message, alters its own log output.
- */
-@Internal
-public interface LogAwareMessageHandler {
-
-    /**
-     * Enters the handler method invocation.
-     *
-     * <p>After this method is called, the message handler should start including the handler method
-     * info into the log.
-     */
-    @Internal
-    void enter(HandlerMethod<?, ?, ?, ?> method);
-
-    /**
-     * Exists the current handler method invocation.
-     *
-     * <p>After this method is called, the message handler should not include any handler method
-     * info into the log.
-     */
-    @Internal
-    void resetLog();
-}
diff --git a/server/src/main/java/io/spine/server/model/AbstractHandlerMethod.java b/server/src/main/java/io/spine/server/model/AbstractHandlerMethod.java
index e3cf686c482..f5cd37b4189 100644
--- a/server/src/main/java/io/spine/server/model/AbstractHandlerMethod.java
+++ b/server/src/main/java/io/spine/server/model/AbstractHandlerMethod.java
@@ -29,7 +29,7 @@
 import io.spine.core.Signal;
 import io.spine.server.dispatch.DispatchOutcome;
 import io.spine.server.dispatch.Success;
-import io.spine.server.log.LogAwareMessageHandler;
+import io.spine.server.log.HandlerLifecycle;
 import io.spine.server.type.MessageEnvelope;
 import io.spine.type.MessageClass;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -254,11 +254,11 @@ public DispatchOutcome invoke(T target, E envelope) {
         DispatchOutcome.Builder outcome = DispatchOutcome
                 .newBuilder()
                 .setPropagatedSignal(signal);
-        LogAwareMessageHandler asLogAware = target instanceof LogAwareMessageHandler
-                                            ? (LogAwareMessageHandler) target
+        HandlerLifecycle lifecycle = target instanceof HandlerLifecycle
+                                            ? (HandlerLifecycle) target
                                             : null;
-        if (asLogAware != null) {
-            asLogAware.enter(this);
+        if (lifecycle != null) {
+            lifecycle.beforeInvoke(this);
         }
         try {
             Success success = doInvoke(target, envelope);
@@ -279,8 +279,8 @@ public DispatchOutcome invoke(T target, E envelope) {
         } catch (IllegalArgumentException | IllegalAccessException e) {
             throw illegalStateWithCauseOf(e);
         } finally {
-            if (asLogAware != null) {
-                asLogAware.resetLog();
+            if (lifecycle != null) {
+                lifecycle.afterInvoke(this);
             }
         }
         return outcome.build();

From 12ea5672516460372e36d670cbbf762c9716085a Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Tue, 3 Mar 2020 16:21:22 +0200
Subject: [PATCH 28/32] Improve validation in a test domain

---
 license-report.md                                | 16 ++++++++--------
 .../src/test/proto/spine/test/library/card.proto |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/license-report.md b/license-report.md
index a668e0c271f..6a3b50ee814 100644
--- a/license-report.md
+++ b/license-report.md
@@ -415,7 +415,7 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 20:54:12 EET 2020** 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 **Tue Mar 03 16:17:23 EET 2020** 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).
 
 
 
@@ -791,7 +791,7 @@ This report was generated on **Mon Mar 02 20:54:12 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 20:54:13 EET 2020** 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 **Tue Mar 03 16:17:24 EET 2020** 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).
 
 
 
@@ -1206,7 +1206,7 @@ This report was generated on **Mon Mar 02 20:54:13 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 20:54:13 EET 2020** 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 **Tue Mar 03 16:17:24 EET 2020** 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).
 
 
 
@@ -1681,7 +1681,7 @@ This report was generated on **Mon Mar 02 20:54:13 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 20:54:13 EET 2020** 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 **Tue Mar 03 16:17:25 EET 2020** 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).
 
 
 
@@ -2113,7 +2113,7 @@ This report was generated on **Mon Mar 02 20:54:13 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 20:54:14 EET 2020** 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 **Tue Mar 03 16:17:25 EET 2020** 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).
 
 
 
@@ -2586,7 +2586,7 @@ This report was generated on **Mon Mar 02 20:54:14 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 20:54:16 EET 2020** 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 **Tue Mar 03 16:17:28 EET 2020** 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).
 
 
 
@@ -3067,7 +3067,7 @@ This report was generated on **Mon Mar 02 20:54:16 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 20:54:18 EET 2020** 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 **Tue Mar 03 16:17:29 EET 2020** 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).
 
 
 
@@ -3584,4 +3584,4 @@ This report was generated on **Mon Mar 02 20:54:18 EET 2020** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Mon Mar 02 20:54:21 EET 2020** 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).
\ No newline at end of file
+This report was generated on **Tue Mar 03 16:17:32 EET 2020** 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).
\ No newline at end of file
diff --git a/server/src/test/proto/spine/test/library/card.proto b/server/src/test/proto/spine/test/library/card.proto
index d839db4e064..d8b40285f05 100644
--- a/server/src/test/proto/spine/test/library/card.proto
+++ b/server/src/test/proto/spine/test/library/card.proto
@@ -14,7 +14,7 @@ import "spine/time/time.proto";
 import "spine/core/user_id.proto";
 
 message Isbn {
-    string value = 1;
+    string value = 1 [(required) = true];
 }
 
 message Book {
@@ -28,7 +28,7 @@ message Book {
 
 message LibraryCardId {
 
-    core.UserId reader = 1;
+    core.UserId reader = 1 [(required) = true];
 }
 
 message LibraryCard {

From de0281ca0deb6d26e8cae512f26d67b34f560a51 Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Tue, 3 Mar 2020 16:51:58 +0200
Subject: [PATCH 29/32] Add `LoggingEntity`

---
 .../spine/server/entity/AbstractEntity.java   | 30 +++++--
 .../io/spine/server/log/LoggingEntity.java    | 82 +++++++++++++++++++
 .../spine/server/log/given/CardAggregate.java | 22 +++--
 3 files changed, 113 insertions(+), 21 deletions(-)
 create mode 100644 server/src/main/java/io/spine/server/log/LoggingEntity.java

diff --git a/server/src/main/java/io/spine/server/entity/AbstractEntity.java b/server/src/main/java/io/spine/server/entity/AbstractEntity.java
index c3f6e029f5f..42c87d48e75 100644
--- a/server/src/main/java/io/spine/server/entity/AbstractEntity.java
+++ b/server/src/main/java/io/spine/server/entity/AbstractEntity.java
@@ -33,7 +33,6 @@
 import io.spine.base.Identifier;
 import io.spine.core.Version;
 import io.spine.core.Versions;
-import io.spine.logging.Logging;
 import io.spine.server.entity.model.EntityClass;
 import io.spine.server.entity.rejection.CannotModifyArchivedEntity;
 import io.spine.server.entity.rejection.CannotModifyDeletedEntity;
@@ -49,6 +48,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
+import java.util.logging.Level;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
@@ -532,14 +532,26 @@ public void afterInvoke(HandlerMethod<?, ?, ?, ?> method) {
         this.handlerLog = null;
     }
 
-    protected final HandlerLog log() {
-        checkState(handlerLog != null,
-                   "Unable to get a handler log for `%s`." +
-                           "A handler log is available only in message handler methods. " +
-                           "Use `%s` instead.",
-                   getClass().getSimpleName(),
-                   Logging.class.getName());
-        return handlerLog;
+    /**
+     * Obtains a new fluent logging API at the given level.
+     *
+     * <p>If called from within a handler method, the resulting log will reference the handler
+     * method as the log site. Otherwise, equivalent to
+     * {@code Logging.loggerFor(getClass()).at(logLevel)}.
+     *
+     * @param logLevel
+     *         the log level
+     * @return new fluent logging API
+     * @apiNote This method mirrors the declaration of
+     *         {@link io.spine.server.log.LoggingEntity#at(Level)}. It is recommended to implement
+     *         the {@link io.spine.server.log.LoggingEntity} interface and use the underscore
+     *         logging methods instead of calling {@code at(..)} directly.
+     * @see io.spine.server.log.LoggingEntity
+     */
+    public final FluentLogger.Api at(Level logLevel) {
+        return handlerLog != null
+               ? handlerLog.at(logLevel)
+               : loggerFor(getClass()).at(logLevel);
     }
 
     @Override
diff --git a/server/src/main/java/io/spine/server/log/LoggingEntity.java b/server/src/main/java/io/spine/server/log/LoggingEntity.java
new file mode 100644
index 00000000000..1b330fbd66d
--- /dev/null
+++ b/server/src/main/java/io/spine/server/log/LoggingEntity.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2020, TeamDev. All rights reserved.
+ *
+ * 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.log;
+
+import com.google.common.flogger.FluentLogger;
+import io.spine.logging.Logging;
+
+import java.util.logging.Level;
+
+/**
+ * A {@link Logging} trait for entities.
+ *
+ * <p>When adding logs in an entity, use this interface over {@link Logging}.
+ */
+public interface LoggingEntity extends Logging {
+
+    /**
+     * Creates a {@code FluentLogger.Api} with the given level.
+     *
+     * @param level
+     *         the log level
+     * @return new fluent logging API
+     * @apiNote This method mirrors the declaration of
+     *         {@link io.spine.server.entity.AbstractEntity#at(Level)}. When a concrete entity
+     *         implements this interface, the underscore logging methods will have the same
+     *         behaviour regarding the log site as does the {@code AbstractEntity.at(Level)} method.
+     */
+    FluentLogger.Api at(Level level);
+
+    @Override
+    default FluentLogger.Api _severe() {
+        return at(Level.SEVERE);
+    }
+
+    @Override
+    default FluentLogger.Api _warn() {
+        return at(Level.WARNING);
+    }
+
+    @Override
+    default FluentLogger.Api _info() {
+        return at(Level.INFO);
+    }
+
+    @Override
+    default FluentLogger.Api _config() {
+        return at(Level.CONFIG);
+    }
+
+    @Override
+    default FluentLogger.Api _fine() {
+        return at(Level.FINE);
+    }
+
+    @Override
+    default FluentLogger.Api _finer() {
+        return at(Level.FINER);
+    }
+
+    @Override
+    default FluentLogger.Api _finest() {
+        return at(Level.FINEST);
+    }
+}
diff --git a/server/src/test/java/io/spine/server/log/given/CardAggregate.java b/server/src/test/java/io/spine/server/log/given/CardAggregate.java
index 50241764a1e..22594b74545 100644
--- a/server/src/test/java/io/spine/server/log/given/CardAggregate.java
+++ b/server/src/test/java/io/spine/server/log/given/CardAggregate.java
@@ -33,6 +33,7 @@
 import io.spine.server.log.Isbn;
 import io.spine.server.log.LibraryCard;
 import io.spine.server.log.LibraryCardId;
+import io.spine.server.log.LoggingEntity;
 import io.spine.server.log.ReturnBook;
 import io.spine.server.log.UnknownBook;
 
@@ -45,12 +46,10 @@
 import static io.spine.server.log.given.Books.dddDistilled;
 import static io.spine.server.log.given.Books.domainDrivenDesign;
 import static io.spine.server.log.given.Books.implementingDdd;
-import static java.util.logging.Level.FINE;
-import static java.util.logging.Level.SEVERE;
-import static java.util.logging.Level.WARNING;
 
 public final class CardAggregate
-        extends Aggregate<LibraryCardId, LibraryCard, LibraryCard.Builder> {
+        extends Aggregate<LibraryCardId, LibraryCard, LibraryCard.Builder>
+        implements LoggingEntity {
 
     private static final ImmutableMap<Isbn, Book> knownBooks = ImmutableMap.of(
             BIG_BLUE_BOOK, domainDrivenDesign(),
@@ -70,12 +69,12 @@ BooksBorrowed handle(BorrowBooks command) throws UnknownBook {
                 event.addBook(book);
                 List<PersonName> authors = book.getAuthorList();
                 PersonName firstAuthor = authors.get(0);
-                log().at(FINE)
-                     .log("Adding to order: %s by %s %s",
-                          book.getTitle(), firstAuthor.getGivenName(), firstAuthor.getFamilyName());
+                _fine().log("Adding to order: %s by %s %s",
+                            book.getTitle(),
+                            firstAuthor.getGivenName(),
+                            firstAuthor.getFamilyName());
             } else {
-                log().at(WARNING)
-                     .log("Cannot lend an unknown book. ISBN: `%s`", bookId.getValue());
+                _warn().log("Cannot lend an unknown book. ISBN: `%s`", bookId.getValue());
                 unknownBooks.add(bookId);
             }
         }
@@ -98,9 +97,8 @@ BookReturned handle(ReturnBook command) throws UnknownBook {
                     .newBuilder()
                     .addAllBook(ImmutableList.of(isbn))
                     .build();
-            log().at(SEVERE)
-                 .withCause(rejection)
-                 .log("Cannot return an unknown book. ISBN: `%s`", isbn.getValue());
+            _error().withCause(rejection)
+                    .log("Cannot return an unknown book. ISBN: `%s`", isbn.getValue());
             throw rejection;
         } else {
             return BookReturned

From 700739a9aa94e8ffaf25f1e084b2d862edfb916b Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Tue, 3 Mar 2020 17:02:18 +0200
Subject: [PATCH 30/32] Add more tests

---
 ...lerLogTest.java => LoggingEntityTest.java} | 99 ++++++++++++++++++-
 1 file changed, 97 insertions(+), 2 deletions(-)
 rename server/src/test/java/io/spine/server/log/{HandlerLogTest.java => LoggingEntityTest.java} (71%)

diff --git a/server/src/test/java/io/spine/server/log/HandlerLogTest.java b/server/src/test/java/io/spine/server/log/LoggingEntityTest.java
similarity index 71%
rename from server/src/test/java/io/spine/server/log/HandlerLogTest.java
rename to server/src/test/java/io/spine/server/log/LoggingEntityTest.java
index 484d6801830..95e8e81cc22 100644
--- a/server/src/test/java/io/spine/server/log/HandlerLogTest.java
+++ b/server/src/test/java/io/spine/server/log/LoggingEntityTest.java
@@ -37,22 +37,31 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
+import java.util.function.Function;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 
 import static com.google.common.truth.Truth.assertThat;
+import static io.spine.base.Identifier.newUuid;
 import static io.spine.server.log.given.Books.THE_HOBBIT;
 import static io.spine.testing.logging.LogTruth.assertThat;
 import static java.util.logging.Level.ALL;
+import static java.util.logging.Level.CONFIG;
 import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.FINER;
+import static java.util.logging.Level.FINEST;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.SEVERE;
+import static java.util.logging.Level.WARNING;
 
 @MuteLogging
-@DisplayName("`HandlerLog` should")
-class HandlerLogTest {
+@DisplayName("`LoggingEntity` should")
+class LoggingEntityTest {
 
     private FluentLogger logger;
     private TestLogHandler handler;
@@ -175,4 +184,90 @@ private static LibraryCardId cardId(UserId reader) {
                     .setReader(reader)
                     .build();
     }
+
+    @Nested
+    @DisplayName("support method")
+    class Support {
+
+        private String message;
+
+        @BeforeEach
+        void randomizeMessage() {
+            message = newUuid();
+        }
+
+        @Test
+        @DisplayName("_severe")
+        void severe() {
+            testLevel(Logging::_severe, SEVERE);
+        }
+
+        @Test
+        @DisplayName("_warn")
+        void warn() {
+            testLevel(Logging::_warn, WARNING);
+        }
+
+        @Test
+        @DisplayName("_info")
+        void info() {
+            testLevel(Logging::_info, INFO);
+        }
+
+        @Test
+        @DisplayName("_config")
+        void config() {
+            testLevel(Logging::_config, CONFIG);
+        }
+
+        @Test
+        @DisplayName("_fine")
+        void fine() {
+            testLevel(Logging::_fine, FINE);
+        }
+
+        @Test
+        @DisplayName("_finer")
+        void finer() {
+            testLevel(Logging::_finer, FINER);
+        }
+
+        @Test
+        @DisplayName("_finest")
+        void finest() {
+            testLevel(Logging::_finest, FINEST);
+        }
+
+        @Test
+        @DisplayName("_error")
+        void error() {
+            testLevel(Logging::_error, Logging.errorLevel());
+        }
+
+        @Test
+        @DisplayName("_debug")
+        void debug() {
+            testLevel(Logging::_debug, Logging.debugLevel());
+        }
+
+        @Test
+        @DisplayName("_trace")
+        void trace() {
+            testLevel(Logging::_trace, FINEST);
+        }
+
+        private void testLevel(Function<Logging, FluentLogger.Api> underscoreFunc,
+                               Level expectedLevel) {
+            CardAggregate aggregate = new CardAggregate();
+            underscoreFunc.apply(aggregate).log(message);
+            List<LogRecord> records = handler.getStoredLogRecords();
+            assertThat(records)
+                    .hasSize(1);
+            LogRecordSubject assertLog = assertThat(records.get(0));
+            assertLog.hasLevelThat()
+                     .isEqualTo(expectedLevel);
+            assertLog.hasMessageThat()
+                     .isEqualTo(message);
+        }
+    }
 }

From c2b85b1b2b7350cd5b98280872a9eca2594de82d Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Tue, 3 Mar 2020 17:03:33 +0200
Subject: [PATCH 31/32] Document a package

---
 .../test/java/io/spine/server/log/given/package-info.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/src/test/java/io/spine/server/log/given/package-info.java b/server/src/test/java/io/spine/server/log/given/package-info.java
index a82ffd855f6..896d16703e2 100644
--- a/server/src/test/java/io/spine/server/log/given/package-info.java
+++ b/server/src/test/java/io/spine/server/log/given/package-info.java
@@ -18,6 +18,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/**
+ * Contains a small test domain and utilities for testing entity logs.
+ */
+
+
 @CheckReturnValue
 @ParametersAreNonnullByDefault
 package io.spine.server.log.given;

From 0037fc0e21b12612837c034c7bb910c345efe43a Mon Sep 17 00:00:00 2001
From: Dmytro Dashenkov <dmytro.dashenkov@teamdev.com>
Date: Tue, 3 Mar 2020 17:06:08 +0200
Subject: [PATCH 32/32] Remove an empty line

---
 server/src/test/java/io/spine/server/log/given/package-info.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/src/test/java/io/spine/server/log/given/package-info.java b/server/src/test/java/io/spine/server/log/given/package-info.java
index 896d16703e2..dd802753176 100644
--- a/server/src/test/java/io/spine/server/log/given/package-info.java
+++ b/server/src/test/java/io/spine/server/log/given/package-info.java
@@ -22,7 +22,6 @@
  * Contains a small test domain and utilities for testing entity logs.
  */
 
-
 @CheckReturnValue
 @ParametersAreNonnullByDefault
 package io.spine.server.log.given;