From ab9d80c483574418b80728489cb4fc9ac4460568 Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Fri, 11 Dec 2020 23:00:43 +0000
Subject: [PATCH] Workaround for
 https://github.com/spring-projects/spring-amqp/issues/1285

---
 .../restdocs/http-server/build.gradle         |  3 --
 .../build.gradle                              |  1 -
 .../main/java/com/example/RabbitManager.java  | 35 +++++++++----------
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/samples/standalone/restdocs/http-server/build.gradle b/samples/standalone/restdocs/http-server/build.gradle
index 0368266f77..b44ec67bcc 100644
--- a/samples/standalone/restdocs/http-server/build.gradle
+++ b/samples/standalone/restdocs/http-server/build.gradle
@@ -5,9 +5,6 @@ buildscript {
 		maven { url "https://repo.spring.io/snapshot" }
 		maven { url "https://repo.spring.io/milestone" }
 		maven { url "https://repo.spring.io/release" }
-		maven { url 'https://repo.spring.io/plugins-snapshot' }
-		maven { url "https://repo.spring.io/plugins-release-local" }
-		maven { url "https://repo.spring.io/plugins-staging-local/" }
 	}
 	dependencies {
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:${findProperty('bootVersion') ?: bootVersion}"
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle
index d4d589f5cc..197c69ae04 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle
@@ -2,7 +2,6 @@ buildscript {
 	repositories {
 		mavenCentral()
 		mavenLocal()
-		maven { url 'https://repo.spring.io/plugins-release' }
 		if (project.hasProperty('fatJar')) {
 			jcenter()
 		}
diff --git a/tests/samples-messaging-amqp/src/main/java/com/example/RabbitManager.java b/tests/samples-messaging-amqp/src/main/java/com/example/RabbitManager.java
index fadc312d30..7b1012b927 100644
--- a/tests/samples-messaging-amqp/src/main/java/com/example/RabbitManager.java
+++ b/tests/samples-messaging-amqp/src/main/java/com/example/RabbitManager.java
@@ -18,7 +18,6 @@ package com.example;
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,7 +28,7 @@ import org.springframework.amqp.rabbit.annotation.QueueBinding;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.messaging.handler.annotation.Headers;
+import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.stereotype.Component;
 
 interface BookService {
@@ -61,26 +60,26 @@ public class RabbitManager {
 		this.rabbitTemplate = rabbitTemplate;
 	}
 
-	@RabbitListener(
-			bindings = @QueueBinding(
-					value = @Queue, exchange = @Exchange(value = "input",
-							durable = "true", autoDelete = "false", type = "topic"),
-					key = "event"))
-	public void newBook(Book book, @Headers Map<String, String> headers) {
+	@RabbitListener(bindings = @QueueBinding(value = @Queue,
+			exchange = @Exchange(value = "input", durable = "true", autoDelete = "false", type = "topic"),
+			key = "event"))
+	// Workaround for https://github.com/spring-projects/spring-amqp/issues/1285
+	// public void newBook(Book book, @Headers Map<String, String> headers) {
+	public void newBook(Book book, @Header("amqp_replyTo") String replyTo) {
 		LOG.info("Received new book with bookname = " + book.getName());
-		LOG.info("Headers = " + headers);
-		this.service.sendBook(book, headers.get("amqp_replyTo"));
+//		LOG.info("Headers = " + headers);
+		this.service.sendBook(book, replyTo);
 	}
 
-	@RabbitListener(
-			bindings = @QueueBinding(
-					value = @Queue, exchange = @Exchange(value = "input",
-							durable = "true", autoDelete = "false", type = "topic"),
-					key = "event2"))
-	public void newBook2(Book book, @Headers Map<String, String> headers) {
+	@RabbitListener(bindings = @QueueBinding(value = @Queue,
+			exchange = @Exchange(value = "input", durable = "true", autoDelete = "false", type = "topic"),
+			key = "event2"))
+	// Workaround for https://github.com/spring-projects/spring-amqp/issues/1285
+	// public void newBook2(Book book, @Headers Map<String, String> headers) {
+	public void newBook2(Book book, @Header("amqp_replyTo") String replyTo) {
 		LOG.info("newBook2 Received new book with bookname = " + book.getName());
-		LOG.info("newBook2 Headers = " + headers);
-		this.service.sendBook(book, headers.get("amqp_replyTo"));
+//		LOG.info("newBook2 Headers = " + headers);
+		this.service.sendBook(book, replyTo);
 	}
 
 }