[2.x] Enable IntegrationBroker dispatch events regardless of registration order of subscribing and publishing BCs

build.gradle.kts

@@ -57,9 +57,10 @@ buildscript {
     val kotlinVersion = io.spine.internal.dependency.Kotlin.version
     val spineBaseVersion: String by extra
     val spineTimeVersion: String by extra
+    val mcJavaVersion: String by extra
 
     dependencies {
-        classpath("io.spine.tools:spine-mc-java:$spineBaseVersion")
+        classpath("io.spine.tools:spine-mc-java:$mcJavaVersion")
     }
 
     io.spine.internal.gradle.doForceVersions(configurations)

buildSrc/src/main/kotlin/io/spine/internal/dependency/Kotlin.kt

@@ -30,7 +30,7 @@ package io.spine.internal.dependency
 // https://github.com/Kotlin
 object Kotlin {
     @Suppress("MemberVisibilityCanBePrivate") // used directly from outside
-    const val version      = "1.5.30"
+    const val version      = "1.5.31"
     const val reflect      = "org.jetbrains.kotlin:kotlin-reflect:${version}"
     const val stdLib       = "org.jetbrains.kotlin:kotlin-stdlib:${version}"
     const val stdLibCommon = "org.jetbrains.kotlin:kotlin-stdlib-common:${version}"

client/build.gradle.kts

@@ -26,6 +26,7 @@
 
 import io.spine.internal.dependency.Grpc
 import io.spine.internal.gradle.Scripts
+import io.spine.internal.gradle.testing.exposeTestArtifacts
 
 val spineBaseVersion: String by extra
 
@@ -43,9 +44,6 @@ dependencies {
     testImplementation(project(":testutil-client"))
     testImplementation(project(path = ":core", configuration = "testArtifacts"))
 }
-
-apply {
-    with(Scripts) {
-        from(testArtifacts(project))
-    }
+java {
+    exposeTestArtifacts()
 }

core/build.gradle.kts

@@ -25,6 +25,7 @@
  */
 
 import io.spine.internal.gradle.Scripts
+import io.spine.internal.gradle.testing.exposeTestArtifacts
 
 val spineBaseTypesVersion: String by extra
 val spineTimeVersion: String by extra
@@ -51,9 +52,6 @@ modelCompiler {
         }
     }
 }
-
-apply {
-    with(Scripts) {
-        from(testArtifacts(project))
-    }
+java {
+    exposeTestArtifacts()
 }

model/model-verifier/src/main/java/io/spine/model/verify/ModelVerifierPlugin.java

@@ -32,7 +32,7 @@
 import io.spine.model.CommandHandlers;
 import io.spine.model.assemble.AssignLookup;
 import io.spine.tools.gradle.SpinePlugin;
-import io.spine.tools.mc.java.gradle.McJavaExtension;
+import io.spine.tools.mc.java.gradle.McJavaOptions;
 import io.spine.tools.type.MoreKnownTypes;
 import org.gradle.api.Action;
 import org.gradle.api.Project;
@@ -46,7 +46,6 @@
 
 import static io.spine.tools.gradle.JavaTaskName.classes;
 import static io.spine.tools.gradle.JavaTaskName.compileJava;
-import static io.spine.tools.mc.java.gradle.McJavaExtension.getMainDescriptorSetFile;
 import static io.spine.tools.mc.java.gradle.plugins.ModelVerifierTaskName.verifyModel;
 import static java.nio.file.Files.exists;
 import static java.nio.file.Files.newInputStream;
@@ -118,9 +117,9 @@ public void execute(Task task) {
         }
 
         private void extendKnownTypes(Project project) {
-            String pluginExtensionName = McJavaExtension.name();
+            String pluginExtensionName = McJavaOptions.name();
             if (project.getExtensions().findByName(pluginExtensionName) != null) {
-                File descriptorFile = getMainDescriptorSetFile(project);
+                File descriptorFile = McJavaOptions.descriptorSetFileOf(project, true);
                 tryExtend(descriptorFile);
             } else {
                 _warn().log(

pom.xml

@@ -10,7 +10,7 @@ all modules and does not describe the project structure per-subproject.
  -->
 <groupId>io.spine</groupId>
 <artifactId>spine-core-java</artifactId>
-<version>2.0.0-SNAPSHOT.75</version>
+<version>2.0.0-SNAPSHOT.76</version>
 
 <inceptionYear>2015</inceptionYear>
 
@@ -80,13 +80,13 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-mc-java</artifactId>
-    <version>2.0.0-SNAPSHOT.74</version>
+    <version>2.0.0-SNAPSHOT.76</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-mc-java-base</artifactId>
-    <version>2.0.0-SNAPSHOT.74</version>
+    <version>2.0.0-SNAPSHOT.76</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
@@ -104,13 +104,13 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>org.jetbrains.kotlin</groupId>
     <artifactId>kotlin-reflect</artifactId>
-    <version>1.5.30</version>
+    <version>1.5.31</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
     <groupId>org.jetbrains.kotlin</groupId>
     <artifactId>kotlin-stdlib-jdk8</artifactId>
-    <version>1.5.30</version>
+    <version>1.5.31</version>
     <scope>compile</scope>
   </dependency>
   <dependency>
@@ -201,13 +201,13 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-mc-java-checks</artifactId>
-    <version>2.0.0-SNAPSHOT.75</version>
+    <version>2.0.0-SNAPSHOT.76</version>
     <scope>provided</scope>
   </dependency>
   <dependency>
     <groupId>io.spine.tools</groupId>
     <artifactId>spine-mc-java-protoc</artifactId>
-    <version>2.0.0-SNAPSHOT.75</version>
+    <version>2.0.0-SNAPSHOT.76</version>
   </dependency>
   <dependency>
     <groupId>net.sourceforge.pmd</groupId>
@@ -227,17 +227,17 @@ all modules and does not describe the project structure per-subproject.
   <dependency>
     <groupId>org.jetbrains.kotlin</groupId>
     <artifactId>kotlin-compiler-embeddable</artifactId>
-    <version>1.5.30</version>
+    <version>1.5.31</version>
   </dependency>
   <dependency>
     <groupId>org.jetbrains.kotlin</groupId>
     <artifactId>kotlin-klib-commonizer-embeddable</artifactId>
-    <version>1.5.30</version>
+    <version>1.5.31</version>
   </dependency>
   <dependency>
     <groupId>org.jetbrains.kotlin</groupId>
     <artifactId>kotlin-scripting-compiler-embeddable</artifactId>
-    <version>1.5.30</version>
+    <version>1.5.31</version>
   </dependency>
 </dependencies>
 

server/src/main/java/io/spine/server/BoundedContext.java

@@ -25,6 +25,7 @@
  */
 package io.spine.server;
 
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.spine.annotation.Internal;
 import io.spine.base.EntityState;
 import io.spine.core.BoundedContextName;
@@ -135,7 +136,6 @@ protected BoundedContext(BoundedContextBuilder builder) {
         this.eventBus = builder.buildEventBus(this);
         this.stand = builder.stand();
         this.tenantIndex = builder.buildTenantIndex();
-
         this.broker = new IntegrationBroker();
         this.commandBus = builder.buildCommandBus();
         this.importBus = buildImportBus(tenantIndex);
@@ -480,7 +480,7 @@ public final InternalAccess internalAccess() {
      * Provides access to features of {@link BoundedContext} used internally by the framework.
      */
     @Internal
-    public class InternalAccess {
+    public final class InternalAccess {
 
         /** Prevents instantiation from outside. */
         private InternalAccess() {
@@ -489,28 +489,37 @@ private InternalAccess() {
         /**
          * Registers the passed repository.
          *
+         * @return this instance of {@code InternalAccess} for call chaining
          * @see BoundedContext#register(Repository)
          */
-        public void register(Repository<?, ?> repository) {
+        @CanIgnoreReturnValue
+        public InternalAccess register(Repository<?, ?> repository) {
             self().register(checkNotNull(repository));
+            return this;
         }
 
         /**
          * Registers the passed command dispatcher.
          *
+         * @return this instance of {@code InternalAccess} for call chaining
          * @see BoundedContext#registerCommandDispatcher(CommandDispatcher)
          */
-        public void registerCommandDispatcher(CommandDispatcher dispatcher) {
+        @CanIgnoreReturnValue
+        public InternalAccess registerCommandDispatcher(CommandDispatcher dispatcher) {
             self().registerCommandDispatcher(checkNotNull(dispatcher));
+            return this;
         }
 
         /**
          * Registers the passed event dispatcher.
          *
+         * @return this instance of {@code InternalAccess} for call chaining
          * @see BoundedContext#registerEventDispatcher(EventDispatcher)
          */
-        public void registerEventDispatcher(EventDispatcher dispatcher) {
+        @CanIgnoreReturnValue
+        public InternalAccess registerEventDispatcher(EventDispatcher dispatcher) {
             self().registerEventDispatcher(dispatcher);
+            return this;
         }
 
         /**

server/src/main/java/io/spine/server/BoundedContextBuilder.java

@@ -45,7 +45,6 @@
 import io.spine.server.event.EventBus;
 import io.spine.server.event.EventDispatcher;
 import io.spine.server.event.EventEnricher;
-import io.spine.server.integration.IntegrationBroker;
 import io.spine.server.stand.Stand;
 import io.spine.server.tenant.TenantIndex;
 import io.spine.server.type.CommandEnvelope;
@@ -90,7 +89,7 @@ public final class BoundedContextBuilder implements Logging {
 
     /**
      * Event dispatchers to be registered with the context {@link EventBus} and/or
-     * {@link IntegrationBroker} after the Bounded Context creation.
+     * {@link io.spine.server.integration.IntegrationBroker} after the Bounded Context creation.
      */
     private final Collection<EventDispatcher> eventDispatchers = new ArrayList<>();
 

server/src/main/java/io/spine/server/ContextAware.java

@@ -31,7 +31,7 @@
 import static com.google.common.base.Preconditions.checkState;
 
 /**
- * An structural part of a Bounded Context which is aware of the other parts.
+ * A structural part of a Bounded Context which is aware of the other parts.
  */
 @Internal
 public interface ContextAware {

server/src/main/java/io/spine/server/integration/AbstractChannelObserver.java

@@ -40,8 +40,7 @@
 import static io.spine.util.Exceptions.newIllegalStateException;
 
 /**
- * Base routines for the {@linkplain Subscriber#addObserver(StreamObserver)}
- * subscriber observers}.
+ * Base routines for the {@linkplain Subscriber#addObserver(StreamObserver) subscriber observers}.
  */
 @SPI
 public abstract class AbstractChannelObserver implements StreamObserver<ExternalMessage>, Logging {
@@ -50,9 +49,18 @@ public abstract class AbstractChannelObserver implements StreamObserver<External
     private final Class<? extends Message> messageClass;
     private final AtomicBoolean completed = new AtomicBoolean(false);
 
-    protected AbstractChannelObserver(BoundedContextName boundedContextName,
+    /**
+     * Creates a new instance of the observer.
+     *
+     * @param context
+     *         the name of the Bounded Context in which the created observer exists
+     * @param messageClass
+     *         the type of the observed messages, which are transferred wrapped
+     *         into {@code ExternalMessage}
+     */
+    protected AbstractChannelObserver(BoundedContextName context,
                                       Class<? extends Message> messageClass) {
-        this.boundedContextName = boundedContextName;
+        this.boundedContextName = context;
         this.messageClass = messageClass;
     }
 
@@ -88,17 +96,26 @@ public final void onNext(ExternalMessage message) {
         checkNotNull(message);
         checkState(!completed.get(),
                    "Channel %s received message (%s[%s]) despite being closed.",
-                   message.getClass().getName(),
-                   message.getOriginalMessage().getTypeUrl());
+                   message.getClass()
+                          .getName(),
+                   message.getOriginalMessage()
+                          .getTypeUrl());
         BoundedContextName source = message.getBoundedContextName();
         boolean sameContext = boundedContextName.equals(source)
-                           || boundedContextName.isSystemOf(source)
-                           || source.isSystemOf(boundedContextName);
+                || boundedContextName.isSystemOf(source)
+                || source.isSystemOf(boundedContextName);
         if (!sameContext) {
             handle(message);
         }
     }
 
+    /**
+     * Returns the name of the Bounded Context in scope of which this observer exists.
+     */
+    protected final BoundedContextName contextName() {
+        return boundedContextName;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {