From 7ec1b3cc4cbc5b48cbe018c89b499e1ce5797f57 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 16 May 2014 11:08:11 -0400 Subject: [PATCH] INT-3409 Update to Spring AMQP 1.3.3 JIRA: https://jira.spring.io/browse/INT-3409 Stub connection factory API changes. --- build.gradle | 2 +- .../amqp/StubRabbitConnectionFactory.java | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index da964c918d..8cedc46c6b 100644 --- a/build.gradle +++ b/build.gradle @@ -107,7 +107,7 @@ subprojects { subproject -> servletApiVersion = '3.1.0' slf4jVersion = "1.7.6" smackVersion = '3.2.1' - springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.3.2.RELEASE' + springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '1.3.3.RELEASE' springDataMongoVersion = '1.5.0.BUILD-SNAPSHOT' springDataRedisVersion = '1.3.0.BUILD-SNAPSHOT' springGemfireVersion = '1.4.0.BUILD-SNAPSHOT' diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/StubRabbitConnectionFactory.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/StubRabbitConnectionFactory.java index 0dd062d57b..d53a062077 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/StubRabbitConnectionFactory.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/StubRabbitConnectionFactory.java @@ -27,7 +27,6 @@ import org.springframework.amqp.rabbit.connection.ConnectionListener; import com.rabbitmq.client.AMQP.Basic.RecoverOk; import com.rabbitmq.client.AMQP.BasicProperties; -import com.rabbitmq.client.AMQP.Channel.FlowOk; import com.rabbitmq.client.AMQP.Confirm.SelectOk; import com.rabbitmq.client.AMQP.Exchange.BindOk; import com.rabbitmq.client.AMQP.Exchange.DeclareOk; @@ -148,13 +147,8 @@ public class StubRabbitConnectionFactory implements ConnectionFactory { } @Override - public FlowOk flow(boolean active) throws IOException { - return null; - } - - @Override - public FlowOk getFlow() { - return null; + public boolean flowBlocked() { + return false; } @Override @@ -205,6 +199,10 @@ public class StubRabbitConnectionFactory implements ConnectionFactory { public void basicQos(int prefetchSize, int prefetchCount, boolean global) throws IOException { } + @Override + public void basicQos(int prefetchCount, boolean global) throws IOException { + } + @Override public void basicQos(int prefetchCount) throws IOException { } @@ -412,6 +410,12 @@ public class StubRabbitConnectionFactory implements ConnectionFactory { return null; } + @Override + public String basicConsume(String queue, boolean autoAck, Map arguments, Consumer callback) + throws IOException { + return null; + } + @Override public String basicConsume(String queue, boolean autoAck, String consumerTag, boolean noLocal, boolean exclusive,