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

Polish 

See gh-20020
This commit is contained in:
Johnny Lim 2020-02-04 00:20:06 +09:00 committed by Stephane Nicoll
parent 05e7cd6f2b
commit b67ece48e4
7 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ci/images/releasescripts/src/test/java/io/spring/concourse/releasescripts/artifactory/ArtifactoryServiceTests.java
View File

@ -76,7 +76,7 @@ class ArtifactoryServiceTests {
void promoteWhenSuccessful() { void promoteWhenSuccessful() {
this.server this.server
.expect(requestTo( .expect(requestTo(
"https://repo.spring.io/api/build/promote/" + "example-build" + "/" + "example-build-1")) "https://repo.spring.io/api/build/promote/example-build/example-build-1"))
.andExpect(method(HttpMethod.POST)) .andExpect(method(HttpMethod.POST))
.andExpect(content().json( .andExpect(content().json(
"{\"status\": \"staged\", \"sourceRepo\": \"libs-staging-local\", \"targetRepo\": \"libs-milestone-local\"}")) "{\"status\": \"staged\", \"sourceRepo\": \"libs-staging-local\", \"targetRepo\": \"libs-milestone-local\"}"))
@ -91,9 +91,9 @@ class ArtifactoryServiceTests {
void promoteWhenArtifactsAlreadyPromoted() { void promoteWhenArtifactsAlreadyPromoted() {
this.server this.server
.expect(requestTo( .expect(requestTo(
"https://repo.spring.io/api/build/promote/" + "example-build" + "/" + "example-build-1")) "https://repo.spring.io/api/build/promote/example-build/example-build-1"))
.andRespond(withStatus(HttpStatus.CONFLICT)); .andRespond(withStatus(HttpStatus.CONFLICT));
this.server.expect(requestTo("https://repo.spring.io/api/build/" + "example-build" + "/" + "example-build-1")) this.server.expect(requestTo("https://repo.spring.io/api/build/example-build/example-build-1"))
.andRespond(withJsonFrom("build-info-response.json")); .andRespond(withJsonFrom("build-info-response.json"));
this.service.promote("libs-release-local", getReleaseInfo()); this.service.promote("libs-release-local", getReleaseInfo());
this.server.verify(); this.server.verify();
@ -103,9 +103,9 @@ class ArtifactoryServiceTests {
void promoteWhenCheckForArtifactsAlreadyPromotedFails() { void promoteWhenCheckForArtifactsAlreadyPromotedFails() {
this.server this.server
.expect(requestTo( .expect(requestTo(
"https://repo.spring.io/api/build/promote/" + "example-build" + "/" + "example-build-1")) "https://repo.spring.io/api/build/promote/example-build/example-build-1"))
.andRespond(withStatus(HttpStatus.CONFLICT)); .andRespond(withStatus(HttpStatus.CONFLICT));
this.server.expect(requestTo("https://repo.spring.io/api/build/" + "example-build" + "/" + "example-build-1")) this.server.expect(requestTo("https://repo.spring.io/api/build/example-build/example-build-1"))
.andRespond(withStatus(HttpStatus.FORBIDDEN)); .andRespond(withStatus(HttpStatus.FORBIDDEN));
assertThatExceptionOfType(HttpClientErrorException.class) assertThatExceptionOfType(HttpClientErrorException.class)
.isThrownBy(() -> this.service.promote("libs-release-local", getReleaseInfo())); .isThrownBy(() -> this.service.promote("libs-release-local", getReleaseInfo()));
@ -116,9 +116,9 @@ class ArtifactoryServiceTests {
void promoteWhenPromotionFails() { void promoteWhenPromotionFails() {
this.server this.server
.expect(requestTo( .expect(requestTo(
"https://repo.spring.io/api/build/promote/" + "example-build" + "/" + "example-build-1")) "https://repo.spring.io/api/build/promote/example-build/example-build-1"))
.andRespond(withStatus(HttpStatus.CONFLICT)); .andRespond(withStatus(HttpStatus.CONFLICT));
this.server.expect(requestTo("https://repo.spring.io/api/build/" + "example-build" + "/" + "example-build-1")) this.server.expect(requestTo("https://repo.spring.io/api/build/example-build/example-build-1"))
.andRespond(withJsonFrom("staged-build-info-response.json")); .andRespond(withJsonFrom("staged-build-info-response.json"));
assertThatExceptionOfType(HttpClientErrorException.class) assertThatExceptionOfType(HttpClientErrorException.class)
.isThrownBy(() -> this.service.promote("libs-release-local", getReleaseInfo())); .isThrownBy(() -> this.service.promote("libs-release-local", getReleaseInfo()));
@ -131,7 +131,7 @@ class ArtifactoryServiceTests {
given(this.bintrayService.isDistributionComplete(releaseInfo)).willReturn(true); given(this.bintrayService.isDistributionComplete(releaseInfo)).willReturn(true);
this.server this.server
.expect(requestTo( .expect(requestTo(
"https://repo.spring.io/api/build/distribute/" + "example-build" + "/" + "example-build-1")) "https://repo.spring.io/api/build/distribute/example-build/example-build-1"))
.andExpect(method(HttpMethod.POST)) .andExpect(method(HttpMethod.POST))
.andExpect(content().json( .andExpect(content().json(
"{\"sourceRepos\": [\"libs-release-local\"], \"targetRepo\" : \"spring-distributions\", \"async\":\"true\"}")) "{\"sourceRepos\": [\"libs-release-local\"], \"targetRepo\" : \"spring-distributions\", \"async\":\"true\"}"))
@ -148,7 +148,7 @@ class ArtifactoryServiceTests {
ReleaseInfo releaseInfo = getReleaseInfo(); ReleaseInfo releaseInfo = getReleaseInfo();
this.server this.server
.expect(requestTo( .expect(requestTo(
"https://repo.spring.io/api/build/distribute/" + "example-build" + "/" + "example-build-1")) "https://repo.spring.io/api/build/distribute/example-build/example-build-1"))
.andExpect(method(HttpMethod.POST)) .andExpect(method(HttpMethod.POST))
.andExpect(content().json( .andExpect(content().json(
"{\"sourceRepos\": [\"libs-release-local\"], \"targetRepo\" : \"spring-distributions\", \"async\":\"true\"}")) "{\"sourceRepos\": [\"libs-release-local\"], \"targetRepo\" : \"spring-distributions\", \"async\":\"true\"}"))
@ -168,7 +168,7 @@ class ArtifactoryServiceTests {
given(this.bintrayService.isDistributionComplete(releaseInfo)).willReturn(false); given(this.bintrayService.isDistributionComplete(releaseInfo)).willReturn(false);
this.server this.server
.expect(requestTo( .expect(requestTo(
"https://repo.spring.io/api/build/distribute/" + "example-build" + "/" + "example-build-1")) "https://repo.spring.io/api/build/distribute/example-build/example-build-1"))
.andExpect(method(HttpMethod.POST)) .andExpect(method(HttpMethod.POST))
.andExpect(content().json( .andExpect(content().json(
"{\"sourceRepos\": [\"libs-release-local\"], \"targetRepo\" : \"spring-distributions\", \"async\":\"true\"}")) "{\"sourceRepos\": [\"libs-release-local\"], \"targetRepo\" : \"spring-distributions\", \"async\":\"true\"}"))

4
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/CompositeHealthTests.java
View File

@ -64,7 +64,7 @@ class CompositeHealthTests {
CompositeHealth health = new CompositeHealth(ApiVersion.V3, Status.UP, components); CompositeHealth health = new CompositeHealth(ApiVersion.V3, Status.UP, components);
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
String json = mapper.writeValueAsString(health); String json = mapper.writeValueAsString(health);
assertThat(json).isEqualTo("{\"status\":\"UP\",\"components\":{" + "\"db1\":{\"status\":\"UP\"}," assertThat(json).isEqualTo("{\"status\":\"UP\",\"components\":{\"db1\":{\"status\":\"UP\"},"
+ "\"db2\":{\"status\":\"DOWN\",\"details\":{\"a\":\"b\"}}}}"); + "\"db2\":{\"status\":\"DOWN\",\"details\":{\"a\":\"b\"}}}}");
} }
@ -76,7 +76,7 @@ class CompositeHealthTests {
CompositeHealth health = new CompositeHealth(ApiVersion.V2, Status.UP, components); CompositeHealth health = new CompositeHealth(ApiVersion.V2, Status.UP, components);
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
String json = mapper.writeValueAsString(health); String json = mapper.writeValueAsString(health);
assertThat(json).isEqualTo("{\"status\":\"UP\",\"details\":{" + "\"db1\":{\"status\":\"UP\"}," assertThat(json).isEqualTo("{\"status\":\"UP\",\"details\":{\"db1\":{\"status\":\"UP\"},"
+ "\"db2\":{\"status\":\"DOWN\",\"details\":{\"a\":\"b\"}}}}"); + "\"db2\":{\"status\":\"DOWN\",\"details\":{\"a\":\"b\"}}}}");
} }

2
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SystemHealthTests.java
View File

@ -45,7 +45,7 @@ class SystemHealthTests {
CompositeHealth health = new SystemHealth(ApiVersion.V3, Status.UP, components, groups); CompositeHealth health = new SystemHealth(ApiVersion.V3, Status.UP, components, groups);
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
String json = mapper.writeValueAsString(health); String json = mapper.writeValueAsString(health);
assertThat(json).isEqualTo("{\"status\":\"UP\",\"components\":{" + "\"db1\":{\"status\":\"UP\"}," assertThat(json).isEqualTo("{\"status\":\"UP\",\"components\":{\"db1\":{\"status\":\"UP\"},"
+ "\"db2\":{\"status\":\"DOWN\",\"details\":{\"a\":\"b\"}}}," + "\"db2\":{\"status\":\"DOWN\",\"details\":{\"a\":\"b\"}}},"
+ "\"groups\":[\"liveness\",\"readiness\"]}"); + "\"groups\":[\"liveness\",\"readiness\"]}");
} }

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java vendored
View File

@ -107,7 +107,7 @@ public class CacheAutoConfiguration {
@Override @Override
public void afterPropertiesSet() { public void afterPropertiesSet() {
Assert.notNull(this.cacheManager.getIfAvailable(), Assert.notNull(this.cacheManager.getIfAvailable(),
() -> "No cache manager could be auto-configured, check your configuration (caching " + "type is '" () -> "No cache manager could be auto-configured, check your configuration (caching type is '"
+ this.cacheProperties.getType() + "')"); + this.cacheProperties.getType() + "')");
} }

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaConfiguration.java
View File

@ -183,8 +183,7 @@ class HibernateJpaConfiguration extends JpaBaseConfiguration {
// containers (e.g. JBoss EAP 6) wrap it in the superclass LinkageError // containers (e.g. JBoss EAP 6) wrap it in the superclass LinkageError
if (!isUsingJndi()) { if (!isUsingJndi()) {
throw new IllegalStateException( throw new IllegalStateException(
"Unable to set Hibernate JTA platform, are you using the correct " + "version of Hibernate?", "Unable to set Hibernate JTA platform, are you using the correct version of Hibernate?", ex);
ex);
} }
// Assume that Hibernate will use JNDI // Assume that Hibernate will use JNDI
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {

4
spring-boot-project/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/JarCommandIT.java
View File

@ -55,7 +55,7 @@ class JarCommandIT {
invocation.await(); invocation.await();
assertThat(invocation.getStandardOutput()).isEqualTo(""); assertThat(invocation.getStandardOutput()).isEqualTo("");
assertThat(invocation.getErrorOutput()) assertThat(invocation.getErrorOutput())
.contains("The name of the " + "resulting jar and at least one source file must be specified"); .contains("The name of the resulting jar and at least one source file must be specified");
} }
@Test @Test
@ -64,7 +64,7 @@ class JarCommandIT {
invocation.await(); invocation.await();
assertThat(invocation.getStandardOutput()).isEqualTo(""); assertThat(invocation.getStandardOutput()).isEqualTo("");
assertThat(invocation.getErrorOutput()) assertThat(invocation.getErrorOutput())
.contains("The name of the " + "resulting jar and at least one source file must be specified"); .contains("The name of the resulting jar and at least one source file must be specified");
} }
@Test @Test

2
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathExtensionExclusionsTests.java
View File

@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.isA;
@ClassPathExclusions("hibernate-validator-*.jar") @ClassPathExclusions("hibernate-validator-*.jar")
class ModifiedClassPathExtensionExclusionsTests { class ModifiedClassPathExtensionExclusionsTests {
private static final String EXCLUDED_RESOURCE = "META-INF/services/" + "javax.validation.spi.ValidationProvider"; private static final String EXCLUDED_RESOURCE = "META-INF/services/javax.validation.spi.ValidationProvider";
@Test @Test
void entriesAreFilteredFromTestClassClassLoader() { void entriesAreFilteredFromTestClassClassLoader() {