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

Merge branch '2.2.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-01-21 10:22:23 +01:00
parent ad00a39d17 59759df5a3
commit 7058543fe6
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/src/main/asciidoc/using.adoc
View File

@@ -631,8 +631,7 @@ In this flow, we assume that:
* Spring Cloud Contract Docker (SCC Docker) and Spring Cloud Contract Stub Runner Docker
(SCC Stub Runner Docker) images are used.
You can read more about how to use Spring Cloud Contract with Docker
<<docker-project.adoc,in this page>>.
You can read more about how to use Spring Cloud Contract with Docker link:docker-project.html[in this page].
https://spring.io/blog/2018/02/13/spring-cloud-contract-in-a-polyglot-world[Here], you can
read a blog post about how to use Spring Cloud Contract in a polyglot world.

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

@@ -29,7 +29,6 @@ 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;
@@ -172,7 +171,7 @@ public class SpringAmqpStubMessages implements MessageVerifier<Message> {
// backward compatibility
return true;
}
return this.rabbitProperties.getPublisherConfirmType() != CachingConnectionFactory.ConfirmType.NONE;
return !this.rabbitProperties.isPublisherConfirms();
}
@Override