More Kotlin DSL improvements

Author: artembilan

spring-integration-core/src/main/java/org/springframework/integration/dsl/BaseIntegrationFlowDefinition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -496,7 +496,7 @@ public B wireTap(MessageChannel wireTapChannel, Consumer<WireTapSpec> wireTapCon
 	 * <pre class="code">
 	 * {@code
 	 *  .transform("payload")
-	 *  .wireTap(new WireTap(tapChannel().selector(m -> m.getPayload().equals("foo")))
+	 *  .wireTap(new WireTap(tapChannel()).selector(m -> m.getPayload().equals("foo")))
 	 *  .channel("foo")
 	 * }
 	 * </pre>
@@ -1721,7 +1721,7 @@ public B resequence() {
 	 * Populate the
 	 * {@link org.springframework.integration.aggregator.ResequencingMessageHandler} with
 	 * provided options from {@link ResequencerSpec}.
-	 * In addition accept options for the integration endpoint using {@link GenericEndpointSpec}.
+	 * In addition, accept options for the integration endpoint using {@link GenericEndpointSpec}.
 	 * Typically used with a Java 8 Lambda expression:
 	 * <pre class="code">
 	 * {@code
@@ -1744,7 +1744,7 @@ public B resequence(Consumer<ResequencerSpec> resequencer) {
 	 * @return the current {@link BaseIntegrationFlowDefinition}.
 	 */
 	public B aggregate() {
-		return aggregate(null);
+		return aggregate((Consumer<AggregatorSpec>) null);
 	}
 
 	/**
@@ -1760,7 +1760,7 @@ public B aggregate(Object aggregatorProcessor) {
 
 	/**
 	 * Populate the {@link AggregatingMessageHandler} with provided options from {@link AggregatorSpec}.
-	 * In addition accept options for the integration endpoint using {@link GenericEndpointSpec}.
+	 * In addition, accept options for the integration endpoint using {@link GenericEndpointSpec}.
 	 * Typically used with a Java 8 Lambda expression:
 	 * <pre class="code">
 	 * {@code

spring-integration-core/src/main/kotlin/org/springframework/integration/dsl/IntegrationFlowDsl.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2021 the original author or authors.
+ * Copyright 2020-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import org.springframework.integration.endpoint.MessageProducerSupport
 import org.springframework.integration.gateway.MessagingGatewaySupport
 import org.springframework.messaging.Message
 import org.springframework.messaging.MessageChannel
-import java.util.function.Consumer
 
 private fun buildIntegrationFlow(flowBuilder: IntegrationFlowBuilder,
 								 flow: (KotlinIntegrationFlowDefinition) -> Unit) =
@@ -160,6 +159,8 @@ fun integrationFlow(producerSpec: MessageProducerSpec<*, *>,
  * `IntegrationFlows.from(IntegrationFlow)` factory method.
  *
  * @author Artem Bilan
+ *
+ * @since 5.5.8
  */
 fun integrationFlow(sourceFlow: IntegrationFlow, flow: KotlinIntegrationFlowDefinition.() -> Unit) =
 	buildIntegrationFlow(IntegrationFlows.from(sourceFlow), flow)