From aa9a3ffc258c42869ccce1a0bc31036eb1194460 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Fri, 29 Apr 2016 22:49:56 -0400
Subject: [PATCH] INT-4020: Fix Unnamed Global Wire-Taps

JIRA: https://jira.spring.io/browse/INT-4020

The fix for `named` global `wire-tap`s (INT-2230) didn't covered testing for `unnamed`.
Therefore the fix unconditionally didn't picked up the issue that we used a wrong `BeanDefinition` to determine the current `id`

* Fix `WireTapParser` to use `wireTapBeanName` from the `resolveId()` when the `GlobalChannelInterceptorParser` invokes it.
* Add tests to demonstrate the issue and confirm the fix

**Cherry-pick to 4.2.x**
---
 .../integration/config/xml/GlobalWireTapParser.java   | 11 ++++++++++-
 .../interceptor/GlobalWireTapTests-context.xml        |  6 ++++++
 .../channel/interceptor/GlobalWireTapTests.java       | 11 +++++++----
 .../local-test-dir/rollback/sftpSource2.txt.writing   |  0
 4 files changed, 23 insertions(+), 5 deletions(-)
 delete mode 100644 spring-integration-sftp/local-test-dir/rollback/sftpSource2.txt.writing

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GlobalWireTapParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GlobalWireTapParser.java
index 8a6d42f6b7..aedccccdad 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GlobalWireTapParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GlobalWireTapParser.java
@@ -25,8 +25,10 @@ import org.springframework.beans.factory.xml.ParserContext;
 
 /**
  * Parser for the top level 'wire-tap' element
+ *
  * @author David Turanski
  * @author Artem Bilan
+ *
  * @since 2.1
  *
  */
@@ -41,7 +43,14 @@ public class GlobalWireTapParser extends GlobalChannelInterceptorParser {
 	@Override
 	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
 			throws BeanDefinitionStoreException {
-		return super.resolveId(element, definition, parserContext) + ".globalChannelInterceptor";
+		RuntimeBeanReference wireTapBean =
+				(RuntimeBeanReference) definition.getConstructorArgumentValues()
+						.getIndexedArgumentValues()
+						.values()
+						.iterator()
+						.next()
+						.getValue();
+		return wireTapBean.getBeanName() + ".globalChannelInterceptor";
 	}
 
 }
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests-context.xml
index 9af837a4fc..6632501d07 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests-context.xml
@@ -27,6 +27,7 @@
 	<channel id="random-channel"/>
 
 	<bridge input-channel="channel" output-channel="output"/>
+
 	<bridge input-channel="random-channel" output-channel="output"/>
 
 	<!-- This wiretap targets a single channel -->
@@ -42,5 +43,10 @@
 	<!-- This wiretap targets all channels -->
 	<wire-tap id="wiretap-all-channels" channel="wiretap-all"/>
 
+	<publish-subscribe-channel id="unnamedGlobalWireTaps"/>
+
+	<wire-tap channel="unnamedGlobalWireTaps" pattern="channel"/>
+
+	<wire-tap channel="unnamedGlobalWireTaps" pattern="channel"/>
 
 </beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests.java
index 2fd93c8d6c..6efc5fc3d0 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests.java
@@ -25,6 +25,7 @@ import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.integration.channel.DirectChannel;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.PollableChannel;
@@ -47,7 +48,7 @@ public class GlobalWireTapTests {
 
 	@Autowired
 	@Qualifier("channel")
-	MessageChannel channel;
+	DirectChannel channel;
 
 	@Autowired
 	@Qualifier("random-channel")
@@ -74,8 +75,8 @@ public class GlobalWireTapTests {
 		Message<?> wireTapMessage = this.wiretapSingle.receive(100);
 		assertNotNull(wireTapMessage);
 
-		// There should be three messages on this channel.
-		// One for 'channel', one for 'output', and one for 'wiretapSingle'.
+		// There should be 5 messages on this channel:
+		// 'channel', 'output', 'wiretapSingle', and too for 'unnamedGlobalWireTaps'.
 		wireTapMessage = this.wiretapAll.receive(100);
 		int msgCount = 0;
 		while (wireTapMessage != null) {
@@ -84,9 +85,11 @@ public class GlobalWireTapTests {
 			wireTapMessage = this.wiretapAll.receive(100);
 		}
 
-		assertEquals(3, msgCount);
+		assertEquals(5, msgCount);
 
 		assertNull(this.wiretapAll2.receive(1));
+
+		assertEquals(4, this.channel.getChannelInterceptors().size());
 	}
 
 	@Test
diff --git a/spring-integration-sftp/local-test-dir/rollback/sftpSource2.txt.writing b/spring-integration-sftp/local-test-dir/rollback/sftpSource2.txt.writing
deleted file mode 100644
index e69de29bb2..0000000000