Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x' into 2.1.x

Browse Source 
Closes gh-17078
This commit is contained in:
Andy Wilkinson
2019-06-07 10:50:34 +01:00
parent 857b96b77d c6c139d980
commit 24925c3dae
2691 changed files with 27746 additions and 46049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-samples/spring-boot-sample-kafka/src/main/java/sample/kafka/SampleMessage.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2018 the original author or authors.
* Copyright 2012-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,8 +25,7 @@ public class SampleMessage {
private final String message;
@JsonCreator
public SampleMessage(@JsonProperty("id") Integer id,
@JsonProperty("message") String message) {
public SampleMessage(@JsonProperty("id") Integer id, @JsonProperty("message") String message) {
this.id = id;
this.message = message;
}

6
spring-boot-samples/spring-boot-sample-kafka/src/test/java/sample/kafka/SampleKafkaApplicationTests.java
View File

@@ -34,8 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Stephane Nicoll
*/
@RunWith(SpringRunner.class)
@SpringBootTest(
properties = "spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}")
@SpringBootTest(properties = "spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}")
@EmbeddedKafka
public class SampleKafkaApplicationTests {
@@ -45,8 +44,7 @@ public class SampleKafkaApplicationTests {
@Test
public void testVanillaExchange() throws Exception {
long end = System.currentTimeMillis() + 10000;
while (!this.outputCapture.toString().contains("A simple test message")
&& System.currentTimeMillis() < end) {
while (!this.outputCapture.toString().contains("A simple test message") && System.currentTimeMillis() < end) {
Thread.sleep(250);
}
assertThat(this.outputCapture.toString()).contains("A simple test message");