Allow subscribing on same rejection with different causes

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

license-report.md

@@ -1,6 +1,6 @@
 
 
-# Dependencies of `io.spine:spine-client:1.2.7`
+# Dependencies of `io.spine:spine-client:1.2.8`
 
 ## Runtime
 1. **Group:** com.google.api.grpc **Name:** proto-google-common-protos **Version:** 1.12.0
@@ -381,12 +381,12 @@
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Dec 03 17:19:27 EET 2019** 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 **Wed Dec 04 11:20:30 EET 2019** 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.2.7`
+# Dependencies of `io.spine:spine-core:1.2.8`
 
 ## Runtime
 1. **Group:** com.google.code.findbugs **Name:** jsr305 **Version:** 3.0.2
@@ -743,12 +743,12 @@ This report was generated on **Tue Dec 03 17:19:27 EET 2019** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Dec 03 17:19:27 EET 2019** 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 **Wed Dec 04 11:20:30 EET 2019** 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.2.7`
+# Dependencies of `io.spine.tools:spine-model-assembler:1.2.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -1144,12 +1144,12 @@ This report was generated on **Tue Dec 03 17:19:27 EET 2019** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Dec 03 17:19:28 EET 2019** 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 **Wed Dec 04 11:20:31 EET 2019** 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.2.7`
+# Dependencies of `io.spine.tools:spine-model-verifier:1.2.8`
 
 ## Runtime
 1. **Group:** aopalliance **Name:** aopalliance **Version:** 1.0
@@ -1699,12 +1699,12 @@ This report was generated on **Tue Dec 03 17:19:28 EET 2019** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Dec 03 17:19:29 EET 2019** 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 **Wed Dec 04 11:20:31 EET 2019** 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.2.7`
+# Dependencies of `io.spine:spine-server:1.2.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -2117,12 +2117,12 @@ This report was generated on **Tue Dec 03 17:19:29 EET 2019** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Dec 03 17:19:29 EET 2019** 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 **Wed Dec 04 11:20:32 EET 2019** 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.2.7`
+# Dependencies of `io.spine:spine-testutil-client:1.2.8`
 
 ## Runtime
 1. **Group:** com.google.api.grpc **Name:** proto-google-common-protos **Version:** 1.12.0
@@ -2536,12 +2536,12 @@ This report was generated on **Tue Dec 03 17:19:29 EET 2019** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Dec 03 17:19:30 EET 2019** 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 **Wed Dec 04 11:20:32 EET 2019** 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.2.7`
+# Dependencies of `io.spine:spine-testutil-core:1.2.8`
 
 ## Runtime
 1. **Group:** com.google.api.grpc **Name:** proto-google-common-protos **Version:** 1.12.0
@@ -2963,12 +2963,12 @@ This report was generated on **Tue Dec 03 17:19:30 EET 2019** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Dec 03 17:19:30 EET 2019** 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 **Wed Dec 04 11:20:32 EET 2019** 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.2.7`
+# Dependencies of `io.spine:spine-testutil-server:1.2.8`
 
 ## Runtime
 1. **Group:** com.google.android **Name:** annotations **Version:** 4.1.1.4
@@ -3466,4 +3466,4 @@ This report was generated on **Tue Dec 03 17:19:30 EET 2019** using [Gradle-Lice
  The dependencies distributed under several licenses, are used according their commercial-use-friendly license.
 
 
-This report was generated on **Tue Dec 03 17:19:31 EET 2019** 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 **Wed Dec 04 11:20:33 EET 2019** 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.2.7</version>
+<version>1.2.8</version>
 
 <inceptionYear>2015</inceptionYear>
 

server/src/main/java/io/spine/server/event/model/EventHandlerMethod.java

@@ -20,22 +20,17 @@
 
 package io.spine.server.event.model;
 
-import com.google.protobuf.Message;
-import io.spine.base.CommandMessage;
 import io.spine.base.EventMessage;
 import io.spine.server.model.AbstractHandlerMethod;
 import io.spine.server.model.DispatchKey;
 import io.spine.server.model.MethodParams;
 import io.spine.server.model.ParameterSpec;
-import io.spine.server.type.CommandClass;
 import io.spine.server.type.EventClass;
 import io.spine.server.type.EventEnvelope;
 import io.spine.type.MessageClass;
 
 import java.lang.reflect.Method;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 /**
  * An abstract base for methods handling events.
  *
@@ -45,52 +40,38 @@
  *         the type of the produced message classes
  */
 public abstract class EventHandlerMethod<T, R extends MessageClass<?>>
-        extends AbstractHandlerMethod<T, EventMessage, EventClass, EventEnvelope, R> {
+        extends AbstractHandlerMethod<T, EventMessage, EventClass, EventEnvelope, R>
+        implements RejectionHandler<T, R> {
 
     /**
      * Creates a new instance to wrap {@code method} on {@code target}.
      *
-     * @param method subscriber method
+     * @param method
+     *         subscriber method
      */
     EventHandlerMethod(Method method, ParameterSpec<EventEnvelope> parameterSpec) {
         super(method, parameterSpec);
     }
 
     @Override
-    protected EventAcceptingMethodParams parameterSpec() {
+    public EventAcceptingMethodParams parameterSpec() {
         return (EventAcceptingMethodParams) super.parameterSpec();
     }
 
     @Override
     public DispatchKey key() {
-        EventClass eventClass = messageClass();
-        if (parameterSpec().acceptsCommand()) {
-            Class<?>[] parameters = rawMethod().getParameterTypes();
-            Class<? extends CommandMessage> commandMessageClass =
-                    castClass(parameters[1], CommandMessage.class);
-            CommandClass commandClass = CommandClass.from(commandMessageClass);
-            return new DispatchKey(eventClass.value(), null, commandClass.value());
-        } else {
-            return super.key();
-        }
+        return RejectionHandler.super.key();
     }
 
     @Override
     public MethodParams params() {
-        if (parameterSpec().acceptsCommand()) {
+        if (RejectionHandler.super.handlesRejection()) {
             MethodParams result = MethodParams.of(rawMethod());
             return result;
         }
         return super.params();
     }
 
-    private static <T extends Message> Class<T> castClass(Class<?> raw, Class<T> targetBound) {
-        checkArgument(targetBound.isAssignableFrom(raw));
-        @SuppressWarnings("unchecked") // Checked above.
-        Class<T> result = (Class<T>) raw;
-        return result;
-    }
-
     /**
      * Ensures that the passed event matches the {@code external} attribute
      * of the method annotation.
@@ -111,5 +92,4 @@ protected void checkAttributesMatch(EventEnvelope event) {
                                 .getExternal();
         ensureExternalMatch(external);
     }
-
 }

server/src/main/java/io/spine/server/event/model/EventSubscriberMethod.java

@@ -21,8 +21,11 @@
 package io.spine.server.event.model;
 
 import com.google.errorprone.annotations.Immutable;
+import io.spine.server.event.EventSubscriber;
 import io.spine.server.model.ArgumentFilter;
+import io.spine.server.model.DispatchKey;
 import io.spine.server.model.ParameterSpec;
+import io.spine.server.type.EmptyClass;
 import io.spine.server.type.EventEnvelope;
 
 import java.lang.reflect.Method;
@@ -31,13 +34,25 @@
  * A wrapper for an event subscriber method.
  */
 @Immutable
-public final class EventSubscriberMethod extends SubscriberMethod {
+public final class EventSubscriberMethod extends SubscriberMethod
+        implements RejectionHandler<EventSubscriber, EmptyClass> {
 
     /** Creates a new instance. */
     EventSubscriberMethod(Method method, ParameterSpec<EventEnvelope> parameterSpec) {
         super(method, parameterSpec);
     }
 
+    @Override
+    public EventAcceptingMethodParams parameterSpec() {
+        return (EventAcceptingMethodParams) super.parameterSpec();
+    }
+
+    @Override
+    public DispatchKey key() {
+        DispatchKey dispatchKey = RejectionHandler.super.key();
+        return applyFilter(dispatchKey);
+    }
+
     @Override
     public ArgumentFilter createFilter() {
         ArgumentFilter result = ArgumentFilter.createFilter(rawMethod());
@@ -47,6 +62,6 @@ public ArgumentFilter createFilter() {
     @Override
     protected void checkAttributesMatch(EventEnvelope event) throws IllegalArgumentException {
         super.checkAttributesMatch(event);
-        ensureExternalMatch(event.context().getExternal());
+        ensureExternalMatch(event.isExternal());
     }
 }

server/src/main/java/io/spine/server/event/model/RejectionDispatchKeys.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2019, 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.event.model;
+
+import io.spine.base.CommandMessage;
+import io.spine.server.model.DispatchKey;
+import io.spine.server.type.CommandClass;
+import io.spine.server.type.EventClass;
+
+import java.lang.reflect.Method;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * A helper utility class that allows creating {@link DispatchKey}s for rejection handling methods.
+ */
+final class RejectionDispatchKeys {
+
+    /** Prevents instantiation of this utility class. **/
+    private RejectionDispatchKeys() {
+    }
+
+    /**
+     * Creates a new {@code DispatchKey} for a rejection handling method that accepts commands as
+     * a second parameter.
+     *
+     * @implSpec the developer is responsible for verifying that the method actually has a
+     *         {@code CommandClass} type as a second parameter.
+     */
+    static DispatchKey of(EventClass eventClass, Method rawMethod) {
+        checkNotNull(eventClass);
+        checkNotNull(rawMethod);
+        Class<?>[] parameters = rawMethod.getParameterTypes();
+        String methodName = rawMethod.getName();
+        checkArgument(parameters.length >= 2,
+                      "The method `%s` should have at least 2 parameters, but has `%s`.",
+                      methodName,
+                      parameters.length);
+        Class<?> secondParameter = parameters[1];
+        checkArgument(CommandMessage.class.isAssignableFrom(secondParameter),
+                      "The method `%s` should have the second parameter assignable from `CommandMessage`, but has `%s`.",
+                      methodName,
+                      secondParameter);
+        @SuppressWarnings("unchecked") // checked above
+        Class<? extends CommandMessage> commandMessageClass =
+                (Class<? extends CommandMessage>) secondParameter;
+        CommandClass commandClass = CommandClass.from(commandMessageClass);
+        return new DispatchKey(eventClass.value(), null, commandClass.value());
+    }
+}