From 43aee1bddd58a8c5b721b34d996bd01cbf46b488 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Wed, 24 Jun 2020 21:32:49 +0900 Subject: [PATCH] Polish See gh-22090 --- .../releasescripts/artifactory/ArtifactoryService.java | 2 +- .../spring-boot-docs/src/docs/asciidoc/howto.adoc | 2 +- .../reactive/context/ReactiveWebServerApplicationContext.java | 2 +- .../web/servlet/context/ServletWebServerApplicationContext.java | 2 +- .../boot/availability/AvailabilityChangeEventTests.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/artifactory/ArtifactoryService.java b/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/artifactory/ArtifactoryService.java index 3a927d6b2a..32141710ad 100644 --- a/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/artifactory/ArtifactoryService.java +++ b/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/artifactory/ArtifactoryService.java @@ -107,7 +107,7 @@ public class ArtifactoryService { ResponseEntity entity = this.restTemplate .getForEntity(BUILD_INFO_URL + buildName + "/" + buildNumber, BuildInfoResponse.class); BuildInfoResponse.Status status = entity.getBody().getBuildInfo().getStatuses()[0]; - logger.debug("Reutned repository " + status.getRepository() + " expecting " + targetRepo); + logger.debug("Returned repository " + status.getRepository() + " expecting " + targetRepo); return status.getRepository().equals(targetRepo); } catch (HttpClientErrorException ex) { diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc index 65960f4f54..d10b56fc6d 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc @@ -2972,7 +2972,7 @@ class ExampleIntegrationTests { This will start up a docker container running Neo4j (if Docker is running locally) before any of the tests are run. In most cases, you will need to configure the application using details from the running container, such as container IP or port. -This can be done with a static `@DynamicPropertySource` method that allows adding adding dynamic property values to the Spring Environment. +This can be done with a static `@DynamicPropertySource` method that allows adding dynamic property values to the Spring Environment. [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java index 07f7f41c1d..993c825656 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/context/ReactiveWebServerApplicationContext.java @@ -136,7 +136,7 @@ public class ReactiveWebServerApplicationContext extends GenericReactiveWebAppli @Override protected void doClose() { - if (this.isActive()) { + if (isActive()) { AvailabilityChangeEvent.publish(this, ReadinessState.REFUSING_TRAFFIC); } super.doClose(); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java index ed24c59993..8bbe5b0c91 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java @@ -164,7 +164,7 @@ public class ServletWebServerApplicationContext extends GenericWebApplicationCon @Override protected void doClose() { - if (this.isActive()) { + if (isActive()) { AvailabilityChangeEvent.publish(this, ReadinessState.REFUSING_TRAFFIC); } super.doClose(); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/availability/AvailabilityChangeEventTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/availability/AvailabilityChangeEventTests.java index 3c1bb6a5c3..feaa35d17a 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/availability/AvailabilityChangeEventTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/availability/AvailabilityChangeEventTests.java @@ -105,7 +105,7 @@ class AvailabilityChangeEventTests { @Override String getDescription() { - return "I have aslo been overridden"; + return "I have also been overridden"; } };