Merge pull request #1423 from SpineEventEngine/1.x-safe-requested-types

license-report.md

@@ -1,6 +1,6 @@
 
 
-# Dependencies of `io.spine:spine-client:1.7.7-SNAPSHOT.6`
+# Dependencies of `io.spine:spine-client:1.7.7-SNAPSHOT.7`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -399,12 +399,12 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Nov 18 13:57:38 EET 2021** 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 Nov 22 15:05:52 EET 2021** 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.7.7-SNAPSHOT.6`
+# Dependencies of `io.spine:spine-core:1.7.7-SNAPSHOT.7`
 
 ## Runtime
 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
@@ -763,12 +763,12 @@ This report was generated on **Thu Nov 18 13:57:38 EET 2021** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Nov 18 13:57:38 EET 2021** 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 Nov 22 15:05:52 EET 2021** 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.7.7-SNAPSHOT.6`
+# Dependencies of `io.spine.tools:spine-model-assembler:1.7.7-SNAPSHOT.7`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -1162,12 +1162,12 @@ This report was generated on **Thu Nov 18 13:57:38 EET 2021** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Nov 18 13:57:39 EET 2021** 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 Nov 22 15:05:52 EET 2021** 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.7.7-SNAPSHOT.6`
+# Dependencies of `io.spine.tools:spine-model-verifier:1.7.7-SNAPSHOT.7`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -1627,12 +1627,12 @@ This report was generated on **Thu Nov 18 13:57:39 EET 2021** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Nov 18 13:57:39 EET 2021** 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 Nov 22 15:05:53 EET 2021** 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.7.7-SNAPSHOT.6`
+# Dependencies of `io.spine:spine-server:1.7.7-SNAPSHOT.7`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -2039,12 +2039,12 @@ This report was generated on **Thu Nov 18 13:57:39 EET 2021** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Nov 18 13:57:39 EET 2021** 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 Nov 22 15:05:53 EET 2021** 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.7.7-SNAPSHOT.6`
+# Dependencies of `io.spine:spine-testutil-client:1.7.7-SNAPSHOT.7`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -2493,12 +2493,12 @@ This report was generated on **Thu Nov 18 13:57:39 EET 2021** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Nov 18 13:57:41 EET 2021** 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 Nov 22 15:05:55 EET 2021** 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.7.7-SNAPSHOT.6`
+# Dependencies of `io.spine:spine-testutil-core:1.7.7-SNAPSHOT.7`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -2947,12 +2947,12 @@ This report was generated on **Thu Nov 18 13:57:41 EET 2021** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Nov 18 13:57:42 EET 2021** 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 Nov 22 15:05:56 EET 2021** 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.7.7-SNAPSHOT.6`
+# Dependencies of `io.spine:spine-testutil-server:1.7.7-SNAPSHOT.7`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -3445,4 +3445,4 @@ This report was generated on **Thu Nov 18 13:57:42 EET 2021** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Thu Nov 18 13:57:44 EET 2021** 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 Nov 22 15:05:58 EET 2021** 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).

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.7.7-SNAPSHOT.6</version>
+<version>1.7.7-SNAPSHOT.7</version>
 
 <inceptionYear>2015</inceptionYear>
 

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

@@ -26,9 +26,11 @@
 
 package io.spine.server;
 
+import com.google.common.collect.ImmutableSet;
 import com.google.protobuf.Any;
 import io.spine.core.Version;
 import io.spine.server.model.Nothing;
+import io.spine.server.type.EventClass;
 
 /**
  * An object with identity which produces events.
@@ -60,4 +62,9 @@ public interface EventProducer {
     default Nothing nothing() {
         return Nothing.getDefaultInstance();
     }
+
+    /**
+     * Obtains classes of the events produced by this object.
+     */
+    ImmutableSet<EventClass> producedEvents();
 }

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

@@ -25,6 +25,7 @@
  */
 package io.spine.server;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -170,7 +171,16 @@ private Optional<BoundedContext> findContextOf(Subscription subscription) {
         return result;
     }
 
-    private Optional<BoundedContext> findContextOf(Target target) {
+    /**
+     * Searches for the Bounded Context which provides the messages of the target type.
+     *
+     * @param target
+     *         the type which may be available through this subscription service
+     * @return the context which exposes the target type,
+     *         or {@code Optional.empty} if no known context does so
+     */
+    @VisibleForTesting  /* Otherwise should have been `private`. */
+    Optional<BoundedContext> findContextOf(Target target) {
         TypeUrl type = target.type();
         BoundedContext selected = typeToContextMap.get(type);
         Optional<BoundedContext> result = Optional.ofNullable(selected);

server/src/main/java/io/spine/server/aggregate/Aggregate.java

@@ -27,6 +27,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import com.google.protobuf.Any;
 import com.google.protobuf.Empty;
 import io.spine.annotation.Internal;
@@ -47,6 +48,7 @@
 import io.spine.server.event.EventReactor;
 import io.spine.server.event.model.EventReactorMethod;
 import io.spine.server.type.CommandEnvelope;
+import io.spine.server.type.EventClass;
 import io.spine.server.type.EventEnvelope;
 
 import java.util.Iterator;
@@ -297,6 +299,12 @@ public final BatchDispatchOutcome play(Iterable<Event> events) {
                 .play(events);
     }
 
+    @Override
+    @Internal
+    public ImmutableSet<EventClass> producedEvents() {
+        return modelClass().outgoingEvents();
+    }
+
     /**
      * Applies passed events.
      *

server/src/main/java/io/spine/server/command/AbstractCommandHandler.java

@@ -28,13 +28,15 @@
 
 import com.google.common.collect.ImmutableSet;
 import io.spine.core.Version;
+import io.spine.server.BoundedContext;
 import io.spine.server.command.model.CommandHandlerClass;
 import io.spine.server.command.model.CommandHandlerMethod;
 import io.spine.server.commandbus.CommandDispatcher;
 import io.spine.server.dispatch.DispatchOutcomeHandler;
 import io.spine.server.event.EventBus;
 import io.spine.server.type.CommandClass;
 import io.spine.server.type.CommandEnvelope;
+import io.spine.server.type.EventClass;
 
 import static io.spine.server.command.model.CommandHandlerClass.asCommandHandlerClass;
 
@@ -90,6 +92,17 @@ public void dispatch(CommandEnvelope envelope) {
                 .handle();
     }
 
+    @Override
+    public void registerWith(BoundedContext context) {
+        super.registerWith(context);
+        context.stand().registerTypeSupplier(this);
+    }
+
+    @Override
+    public ImmutableSet<EventClass> producedEvents() {
+        return thisClass.commandOutput();
+    }
+
     @Override
     public ImmutableSet<CommandClass> messageClasses() {
         return thisClass.commands();

server/src/main/java/io/spine/server/command/AbstractCommander.java

@@ -124,6 +124,16 @@ public Version version() {
         return Versions.zero();
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * <p>Always returns an empty set.
+     */
+    @Override
+    public ImmutableSet<EventClass> producedEvents() {
+        return ImmutableSet.of();
+    }
+
     private void postCommands(List<Command> commands) {
         commandBus().post(commands, noOpObserver());
     }

server/src/main/java/io/spine/server/event/AbstractEventReactor.java

@@ -85,6 +85,7 @@ public void registerWith(BoundedContext context) {
         checkNotRegistered();
         eventBus = context.eventBus();
         system = context.systemClient().writeSide();
+        context.stand().registerTypeSupplier(this);
     }
 
     @Override
@@ -147,4 +148,9 @@ public ImmutableSet<EventClass> externalEventClasses() {
     public ImmutableSet<EventClass> domesticEventClasses() {
         return thisClass.domesticEvents();
     }
+
+    @Override
+    public ImmutableSet<EventClass> producedEvents() {
+        return thisClass.reactionOutput();
+    }
 }

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

@@ -36,6 +36,7 @@
 import java.util.List;
 import java.util.Set;
 
+import static com.google.common.collect.Multimaps.synchronizedSetMultimap;
 import static io.spine.protobuf.AnyPacker.unpack;
 
 /**
@@ -55,9 +56,12 @@ final class ExternalNeedsObserver
      * Current set of message type URLs, requested by other parties via sending the
      * {@linkplain RequestForExternalMessages configuration messages}, mapped to IDs of their origin
      * bounded contexts.
+     *
+     * <p>This instance is potentially accessed from different threads,
+     * therefore it's made concurrency-friendly.
      */
     private final Multimap<ExternalMessageType, BoundedContextName> requestedTypes =
-            HashMultimap.create();
+            synchronizedSetMultimap(HashMultimap.create());
 
     ExternalNeedsObserver(BoundedContextName context, BusAdapter bus) {
         super(context, RequestForExternalMessages.class);

server/src/main/java/io/spine/server/procman/ProcessManager.java

@@ -27,6 +27,7 @@
 package io.spine.server.procman;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableSet;
 import io.spine.annotation.Internal;
 import io.spine.base.EntityState;
 import io.spine.protobuf.ValidatingBuilder;
@@ -112,6 +113,11 @@ protected ProcessManagerClass<?> thisClass() {
         return (ProcessManagerClass<?>) super.thisClass();
     }
 
+    @Override
+    public ImmutableSet<EventClass> producedEvents() {
+        return thisClass().outgoingEvents();
+    }
+
     /**
      * {@inheritDoc}
      *

server/src/main/java/io/spine/server/stand/EventRegistry.java

@@ -27,6 +27,7 @@
 package io.spine.server.stand;
 
 import com.google.common.collect.ImmutableSet;
+import io.spine.server.EventProducer;
 import io.spine.server.entity.Repository;
 import io.spine.server.type.EventClass;
 import io.spine.type.TypeUrl;
@@ -41,6 +42,11 @@ interface EventRegistry extends AutoCloseable {
      */
     void register(Repository<?, ?> repository);
 
+    /**
+     * Registers the event producer in this registry.
+     */
+    void register(EventProducer producer);
+
     /**
      * Retrieves all event {@linkplain TypeUrl types} stored in the registry.
      */

server/src/main/java/io/spine/server/stand/InMemoryEventRegistry.java

@@ -27,6 +27,7 @@
 package io.spine.server.stand;
 
 import com.google.common.collect.ImmutableSet;
+import io.spine.server.EventProducer;
 import io.spine.server.entity.EventProducingRepository;
 import io.spine.server.entity.Repository;
 import io.spine.server.type.EventClass;
@@ -59,6 +60,12 @@ public void register(Repository<?, ?> repository) {
         }
     }
 
+    @Override
+    public void register(EventProducer producer) {
+        producer.producedEvents()
+                .forEach(this::putIntoMap);
+    }
+
     @Override
     public ImmutableSet<TypeUrl> typeSet() {
         return ImmutableSet.copyOf(eventClasses.keySet());

server/src/main/java/io/spine/server/stand/Stand.java

@@ -43,6 +43,7 @@
 import io.spine.core.Responses;
 import io.spine.core.TenantId;
 import io.spine.protobuf.AnyPacker;
+import io.spine.server.EventProducer;
 import io.spine.server.Identity;
 import io.spine.server.bus.Listener;
 import io.spine.server.entity.Entity;
@@ -376,6 +377,13 @@ public void registerTypeSupplier(Repository<?, ?> repository) {
         eventRegistry.register(repository);
     }
 
+    /**
+     * Registers the passed {@code EventProducer} as the event type supplier.
+     */
+    public void registerTypeSupplier(EventProducer producer) {
+        eventRegistry.register(producer);
+    }
+
     /**
      * Closes the {@code Stand} performing necessary cleanups.
      */
@@ -504,9 +512,7 @@ private SystemReadSide systemReadSide() {
         @Internal
         public Stand build() {
             checkState(systemReadSide != null, "SystemWriteSide is not set.");
-            boolean multitenant = this.multitenant == null
-                                  ? false
-                                  : this.multitenant;
+            boolean multitenant = this.multitenant != null && this.multitenant;
             if (subscriptionRegistry == null) {
                 subscriptionRegistry = MultitenantSubscriptionRegistry.newInstance(multitenant);
             }