GH-1448 - Polish deprecations in PublishedEvents.

Unfortunately, using the same overload for matching(Function, S) and matching(Function, Predicate<S>) doesn't work. Thus, the deprecation of matchingMapped(…) is broken as the suggested new method causes compiler errors on the command line (interestingly, they work in Eclipse). We now introduce a method matchingValue(Function, S) as a specialized version of matching(Function, Predicate<S>) as it's performing a static equality check.

Author: odrotbohm

spring-modulith-test/src/main/java/org/springframework/modulith/test/DefaultPublishedEvents.java

@@ -150,6 +150,15 @@ public <S> TypedPublishedEvents<T> matching(Function<T, S> mapper, @Nullable S v
 			return matching(mapper, (Predicate<S>) it -> Objects.equals(it, value));
 		}
 
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.modulith.test.PublishedEvents.TypedPublishedEvents#matchingValue(java.util.function.Function, java.lang.Object)
+		 */
+		@Override
+		public <S> TypedPublishedEvents<T> matchingValue(Function<T, S> mapper, @Nullable S value) {
+			return matching(mapper, (Predicate<S>) it -> Objects.equals(it, value));
+		}
+
 		/**
 		 * Returns a {@link Stream} of events filtered by the given {@link Predicate}.
 		 *

spring-modulith-test/src/main/java/org/springframework/modulith/test/PublishedEvents.java

@@ -112,9 +112,23 @@ default <S extends T> TypedPublishedEvents<S> ofSubType(Class<S> subType) {
 		 *          must not be {@literal null}.
 		 * @param value the value expected as outcome of the mapping step, can be {@literal null}.
 		 * @return will never be {@literal null}.
+		 * @deprecated use {@link #matchingValue(Function, Object)} instead.
 		 */
+		@Deprecated(since = "2.0", forRemoval = true)
 		<S> TypedPublishedEvents<T> matching(Function<T, S> mapper, @Nullable S value);
 
+		/**
+		 * Returns all {@link TypedPublishedEvents} that match the given value after applying the given mapping step.
+		 *
+		 * @param <S> the intermediate type to apply the {@link Predicate} on
+		 * @param mapper the mapping step to extract a part of the original event subject to verify against the given value,
+		 *          must not be {@literal null}.
+		 * @param value the value expected as outcome of the mapping step, can be {@literal null}.
+		 * @return will never be {@literal null}.
+		 * @since 2.0
+		 */
+		<S> TypedPublishedEvents<T> matchingValue(Function<T, S> mapper, @Nullable S value);
+
 		/**
 		 * Returns all {@link TypedPublishedEvents} that match the given predicate after applying the given mapping step.
 		 *