SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to Spring Cloud Build 2.3.0.BUILD-SNAPSHOT.

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2020-05-13 18:36:04 +02:00
parent 9fcf5a3612
commit c6901dae81
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -28,7 +28,7 @@
<checkstyle.version>2.17</checkstyle.version>
<pact.version>3.6.14</pact.version>
<jsch-agent.version>0.0.9</jsch-agent.version>
<spring-cloud-build.version>2.2.3.RELEASE</spring-cloud-build.version>
<spring-cloud-build.version>2.3.0.BUILD-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-zookeeper.version>2.2.2.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>
<spring-cloud-stream.version>Horsham.SR3</spring-cloud-stream.version>
<!-- Needs to come from a sc-stream-bom -->

5
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessages.java
View File

@@ -29,6 +29,7 @@ import org.mockito.ArgumentMatchers;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageListener;
import org.springframework.amqp.core.MessagePropertiesBuilder;
import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener;
@@ -171,7 +172,9 @@ public class SpringAmqpStubMessages implements MessageVerifier<Message> {
// backward compatibility
return true;
}
return !this.rabbitProperties.isPublisherConfirms();
return this.rabbitProperties.getPublisherConfirmType() == null
|| this.rabbitProperties
.getPublisherConfirmType() == CachingConnectionFactory.ConfirmType.NONE;
}
@Override

5
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/messaging/amqp/SpringAmqpStubMessagesSpec.groovy
View File

@@ -27,6 +27,7 @@ import org.springframework.amqp.core.DirectExchange
import org.springframework.amqp.core.Message
import org.springframework.amqp.core.MessageProperties
import org.springframework.amqp.core.Queue
import org.springframework.amqp.rabbit.connection.CachingConnectionFactory
import org.springframework.amqp.rabbit.core.RabbitTemplate
import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer
import org.springframework.amqp.rabbit.listener.adapter.MessageListenerAdapter
@@ -78,7 +79,7 @@ class SpringAmqpStubMessagesSpec extends Specification {
def "should send amqp message for non transactional channel"() {
given:
rabbitProperties.setPublisherConfirms(true)
rabbitProperties.setPublisherConfirmType(CachingConnectionFactory.ConfirmType.SIMPLE)
listenerContainer.setMessageListener(messageListenerAdapter)
listenerContainer.setQueueNames(queueName)
Binding binding = BindingBuilder.bind(new Queue(queueName)).to(new DirectExchange(exchange)).with(routingKey)
@@ -114,7 +115,7 @@ class SpringAmqpStubMessagesSpec extends Specification {
def "should send amqp message for transactional channel"() {
given:
rabbitProperties.setPublisherConfirms(false)
rabbitProperties.setPublisherConfirmType(CachingConnectionFactory.ConfirmType.NONE)
listenerContainer.setMessageListener(messageListenerAdapter)
listenerContainer.setQueueNames(queueName)
Binding binding = BindingBuilder.bind(new Queue(queueName)).to(new DirectExchange(exchange)).with(routingKey)

4
tests/samples-messaging-amqp/pom.xml
View File

@@ -18,6 +18,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-json</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>