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

Merge branch '2.1.x'

Browse Source 
Closes gh-17079
This commit is contained in:
Andy Wilkinson
2019-06-07 11:00:44 +01:00
parent 5b2de5c81d 24925c3dae
commit aef92b9295
2799 changed files with 28402 additions and 47836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/consumer/SampleIntegrationApplicationTests.java
View File

@@ -62,10 +62,10 @@ class SampleIntegrationApplicationTests {
void testVanillaExchange(@TempDir Path temp) throws Exception {
File inputDir = new File(temp.toFile(), "input");
File outputDir = new File(temp.toFile(), "output");
this.context = SpringApplication.run(SampleIntegrationApplication.class,
"--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir);
SpringApplication.run(ProducerApplication.class, "World",
"--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir);
this.context = SpringApplication.run(SampleIntegrationApplication.class, "--service.input-dir=" + inputDir,
"--service.output-dir=" + outputDir);
SpringApplication.run(ProducerApplication.class, "World", "--service.input-dir=" + inputDir,
"--service.output-dir=" + outputDir);
String output = getOutput(outputDir);
assertThat(output).contains("Hello World");
}
@@ -74,44 +74,38 @@ class SampleIntegrationApplicationTests {
void testMessageGateway(@TempDir Path temp) throws Exception {
File inputDir = new File(temp.toFile(), "input");
File outputDir = new File(temp.toFile(), "output");
this.context = SpringApplication.run(SampleIntegrationApplication.class,
"testviamg", "--service.input-dir=" + inputDir,
"--service.output-dir=" + outputDir);
String output = getOutput(
this.context.getBean(ServiceProperties.class).getOutputDir());
this.context = SpringApplication.run(SampleIntegrationApplication.class, "testviamg",
"--service.input-dir=" + inputDir, "--service.output-dir=" + outputDir);
String output = getOutput(this.context.getBean(ServiceProperties.class).getOutputDir());
assertThat(output).contains("testviamg");
}
private String getOutput(File outputDir) throws Exception {
Future<String> future = Executors.newSingleThreadExecutor()
.submit(new Callable<String>() {
@Override
public String call() throws Exception {
Resource[] resources = getResourcesWithContent(outputDir);
while (resources.length == 0) {
Thread.sleep(200);
resources = getResourcesWithContent(outputDir);
}
StringBuilder builder = new StringBuilder();
for (Resource resource : resources) {
try (InputStream inputStream = resource.getInputStream()) {
builder.append(new String(
StreamUtils.copyToByteArray(inputStream)));
}
}
return builder.toString();
Future<String> future = Executors.newSingleThreadExecutor().submit(new Callable<String>() {
@Override
public String call() throws Exception {
Resource[] resources = getResourcesWithContent(outputDir);
while (resources.length == 0) {
Thread.sleep(200);
resources = getResourcesWithContent(outputDir);
}
StringBuilder builder = new StringBuilder();
for (Resource resource : resources) {
try (InputStream inputStream = resource.getInputStream()) {
builder.append(new String(StreamUtils.copyToByteArray(inputStream)));
}
});
}
return builder.toString();
}
});
return future.get(30, TimeUnit.SECONDS);
}
private Resource[] getResourcesWithContent(File outputDir) throws IOException {
Resource[] candidates = ResourcePatternUtils
.getResourcePatternResolver(new DefaultResourceLoader())
Resource[] candidates = ResourcePatternUtils.getResourcePatternResolver(new DefaultResourceLoader())
.getResources("file:" + outputDir.getAbsolutePath() + "/**");
for (Resource candidate : candidates) {
if ((candidate.getFilename() != null
&& candidate.getFilename().endsWith(".writing"))
if ((candidate.getFilename() != null && candidate.getFilename().endsWith(".writing"))
|| candidate.contentLength() == 0) {
return new Resource[0];
}

3
spring-boot-samples/spring-boot-sample-integration/src/test/java/sample/integration/producer/ProducerApplication.java
View File

@@ -42,8 +42,7 @@ public class ProducerApplication implements ApplicationRunner {
this.serviceProperties.getInputDir().mkdirs();
if (args.getNonOptionArgs().size() > 0) {
FileOutputStream stream = new FileOutputStream(
new File(this.serviceProperties.getInputDir(),
"data" + System.currentTimeMillis() + ".txt"));
new File(this.serviceProperties.getInputDir(), "data" + System.currentTimeMillis() + ".txt"));
for (String arg : args.getNonOptionArgs()) {
stream.write(arg.getBytes());
}