root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Andy Wilkinson 2018-09-18 11:18:28 +01:00
parent 9201e23f67
commit c1b864c826
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/rest/RestClientAutoConfigurationTests.java
View File

@ -22,6 +22,7 @@ import java.util.Map;
import org.elasticsearch.action.get.GetRequest;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestHighLevelClient;
import org.junit.Test;
@ -87,9 +88,10 @@ public class RestClientAutoConfigurationTests {
source.put("b", "bravo");
IndexRequest index = new IndexRequest("foo", "bar", "1")
.source(source);
client.index(index);
client.index(index, RequestOptions.DEFAULT);
GetRequest getRequest = new GetRequest("foo", "bar", "1");
assertThat(client.get(getRequest).isExists()).isTrue();
assertThat(client.get(getRequest, RequestOptions.DEFAULT).isExists())
.isTrue();
}));
}

4
spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/DetailedProgressReporterTests.java
View File

@ -39,8 +39,8 @@ public final class DetailedProgressReporterTests {
private static final String ARTIFACT = "org/alpha/bravo/charlie/1.2.3/charlie-1.2.3.jar";
private final TransferResource resource = new TransferResource(REPOSITORY, ARTIFACT,
null, null);
private final TransferResource resource = new TransferResource(null, REPOSITORY,
ARTIFACT, null, null);
private final ByteArrayOutputStream baos = new ByteArrayOutputStream();

1
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java
View File

@ -119,6 +119,7 @@ class BootZipCopyAction implements CopyAction {
return () -> true;
}
@SuppressWarnings("unchecked")
private Spec<FileTreeElement> createExclusionSpec(
Spec<FileTreeElement> loaderEntries) {
return Specs.union(loaderEntries, this.exclusions);

4
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Container.java
View File

@ -24,6 +24,7 @@ import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.testcontainers.DockerClientFactory;
import org.testcontainers.containers.FailureDetectingExternalResource;
import org.testcontainers.containers.GenericContainer;
/**
@ -68,7 +69,8 @@ class Container implements TestRule {
return new SkipStatement();
}
this.container = this.containerFactory.get();
return this.container.apply(base, description);
return ((FailureDetectingExternalResource) this.container).apply(base,
description);
}
public int getMappedPort() {