Updated documents and added corrected code formatting

spring-projects#3157

Author: sirimamilla

spring-integration-core/src/test/java/org/springframework/integration/dsl/routers/RouterTests.java

@@ -615,8 +615,8 @@ public void testNestedScatterGatherSuccess() {
 	}
 
 	@Autowired
-			@Qualifier("scatterGatherWiretapChannel")
-	PollableChannel scatterGatherWiretapChannel;
+	@Qualifier("scatterGatherWireTapChannel")
+	PollableChannel scatterGatherWireTapChannel;
 
 	@Timeout(11000)
 	@Test
@@ -627,19 +627,19 @@ public void testNestedScatterGatherSequenceTest() {
 						.setReplyChannel(replyChannel)
 						.build());
 
-		Message<?> wiretapMessage1 = scatterGatherWiretapChannel.receive(10000);
+		Message<?> wiretapMessage1 = scatterGatherWireTapChannel.receive(10000);
 		assertThat(wiretapMessage1).isNotNull();
 		MessageHeaders headers1 = wiretapMessage1.getHeaders();
-		Message<?> wiretapMessage2 = scatterGatherWiretapChannel.receive(10000);
+		Message<?> wiretapMessage2 = scatterGatherWireTapChannel.receive(10000);
 		assertThat(wiretapMessage2).isNotNull()
 				.extracting(Message::getHeaders)
-				.isEqualToComparingOnlyGivenFields(headers1, "correlationId", "gatherResultChannel", "sequenceSize", "sequenceNo");
+				.isEqualToComparingOnlyGivenFields(headers1, "correlationId",
+						"gatherResultChannel", "sequenceSize", "sequenceNo");
 		Message<?> receive = replyChannel.receive(10000);
 
 		assertThat(receive).isNotNull();
 		assertThat(receive.getPayload()).isEqualTo("sequencetest");
 
-
 	}
 
 	@Configuration
@@ -953,18 +953,19 @@ public IntegrationFlow propagateErrorFromGatherer(TaskExecutor taskExecutor) {
 		}
 
 		@Bean
-		public PollableChannel scatterGatherWiretapChannel() {
+		public PollableChannel scatterGatherWireTapChannel() {
 			return new QueueChannel();
 		}
+
 		@Bean
 		public IntegrationFlow scatterGatherInSubFlow() {
 			return flow -> flow.scatterGather(s -> s.applySequence(true)
-							.recipientFlow(inflow -> inflow.wireTap(scatterGatherWiretapChannel())
+							.recipientFlow(inflow -> inflow.wireTap(scatterGatherWireTapChannel())
 									.scatterGather(s1 -> s1.applySequence(true)
 													.recipientFlow(IntegrationFlowDefinition::bridge)
 													.recipientFlow("sequencetest"::equals, IntegrationFlowDefinition::bridge),
 											g -> g.outputProcessor(MessageGroup::getOne)
-									).wireTap(scatterGatherWiretapChannel()).bridge()),
+									).wireTap(scatterGatherWireTapChannel()).bridge()),
 					g -> g.outputProcessor(MessageGroup::getOne));
 		}
 

src/reference/asciidoc/aggregator.adoc

@@ -117,11 +117,15 @@ NOTE: In the interest of code simplicity and promoting best practices such as lo
 Starting with version 5.1, after processing message group, an `AbstractCorrelatingMessageHandler` performs a `MessageBuilder.popSequenceDetails()` message headers modification for the proper splitter-aggregator scenario with several nested levels.
 It is done only if the message group release result is not a message or collection of messages.
 In that case a target `MessageGroupProcessor` is responsible for the `MessageBuilder.popSequenceDetails()` call while building those messages.
-Strting with version 5.3 if sequenceDetails of the outputMessage matches with first message of group, `MessageBuilder.popSequenceDetails()` will be performed.
+
+Additionally, Starting with version 5.3, if `MessageGroupProcessor` returns a Message, `MessageBuilder.popSequenceDetails()` will be performed on the `outputMessage`  if the sequenceDetails matches with first message of group.
+
 This functionality can be controlled by a new `popSequence` `boolean` property, so the `MessageBuilder.popSequenceDetails()` can be disabled in some scenarios when correlation details have not been populated by the standard splitter.
 This property, essentially, undoes what has been done by the nearest upstream `applySequence = true` in the `AbstractMessageSplitter`.
 See <<./splitter.adoc#splitter,Splitter>> for more information.
 
+
+
 [[agg-message-collection]]
 IMPORTANT: The `SimpleMessageGroup.getMessages()` method returns an `unmodifiableCollection`.
 Therefore, if your aggregating POJO method has a `Collection<Message>` parameter, the argument passed in is exactly that `Collection` instance and, when you use a `SimpleMessageStore` for the aggregator, that original `Collection<Message>` is cleared after releasing the group.

src/reference/asciidoc/whats-new.adoc

@@ -33,6 +33,10 @@ See <<./reactive-streams.adoc/reactive-message-handler,ReactiveMessageHandler>>
 `spring-integration-mongodb` module now provides channel adapter implementations for Reactive MongoDB driver support in Spring Data.
 See <<./mongodb.adoc#mongodb-reactive-channel-adapters,MongoDB Reactive Channel Adapters>> for more information.
 
+[[x5.3-AbstractCorrelatingMessageHandler]]
+==== AbstractCorrelatingMessageHandler(Splitter/ScatterGather)
+Starting with version 5.3, if `MessageGroupProcessor` returns a Message, `MessageBuilder.popSequenceDetails()` will be performed on the `outputMessage`  if the sequenceDetails matches with first message of group.
+
 [[x5.3-general]]
 === General Changes