diff --git a/buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransportTests.java b/buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransportTests.java index 74f3894cbdc..c14c5941b24 100644 --- a/buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransportTests.java +++ b/buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/transport/HttpClientTransportTests.java @@ -332,7 +332,7 @@ class HttpClientTransportTests { } @Test - void shouldReturnErrorsAndConentIfProxyAuthError() throws IOException { + void shouldReturnContentIfProxyAuthError() throws IOException { givenClientWillReturnResponse(); given(this.entity.getContent()).willReturn(getClass().getResourceAsStream("proxy-error.txt")); given(this.response.getCode()).willReturn(HttpStatus.SC_PROXY_AUTHENTICATION_REQUIRED); @@ -340,7 +340,7 @@ class HttpClientTransportTests { .satisfies((ex) -> { assertThat(ex.getErrors()).isNull(); assertThat(ex.getResponseMessage()).isNull(); - assertThat(ex.getMessage()).contains("Some kind of procy auth problem!"); + assertThat(ex.getMessage()).contains("Some kind of proxy auth problem!"); }); } diff --git a/buildpack/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/transport/proxy-error.txt b/buildpack/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/transport/proxy-error.txt index fdad6464b3c..6c72a2ca06f 100644 --- a/buildpack/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/transport/proxy-error.txt +++ b/buildpack/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/transport/proxy-error.txt @@ -1,2 +1,2 @@ -Some kind of procy auth problem! +Some kind of proxy auth problem! diff --git a/core/spring-boot/src/main/java/org/springframework/boot/json/JsonWriter.java b/core/spring-boot/src/main/java/org/springframework/boot/json/JsonWriter.java index d98ebe47877..1cf44364ead 100644 --- a/core/spring-boot/src/main/java/org/springframework/boot/json/JsonWriter.java +++ b/core/spring-boot/src/main/java/org/springframework/boot/json/JsonWriter.java @@ -307,7 +307,7 @@ public interface JsonWriter { } /** - * Add the a {@link NameProcessor} to be applied when the JSON is written. + * Add a {@link NameProcessor} to be applied when the JSON is written. * @param nameProcessor the name processor to add */ public void applyingNameProcessor(NameProcessor nameProcessor) { @@ -316,7 +316,7 @@ public interface JsonWriter { } /** - * Add the a {@link ValueProcessor} to be applied when the JSON is written. + * Add a {@link ValueProcessor} to be applied when the JSON is written. * @param valueProcessor the value processor to add */ public void applyingValueProcessor(ValueProcessor valueProcessor) { diff --git a/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CacheCondition.java b/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CacheCondition.java index 4959a36d6fa..02f8dadba63 100644 --- a/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CacheCondition.java +++ b/module/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CacheCondition.java @@ -41,10 +41,10 @@ class CacheCondition extends SpringBootCondition { @Override public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { Assert.isInstanceOf(AnnotationMetadata.class, metadata); - return extracted(context, (AnnotationMetadata) metadata); + return getOutcome(context, (AnnotationMetadata) metadata); } - private ConditionOutcome extracted(ConditionContext context, AnnotationMetadata metadata) { + private ConditionOutcome getOutcome(ConditionContext context, AnnotationMetadata metadata) { String sourceClass = metadata.getClassName(); ConditionMessage.Builder message = ConditionMessage.forCondition("Cache", sourceClass); Environment environment = context.getEnvironment(); @@ -53,7 +53,7 @@ class CacheCondition extends SpringBootCondition { if (!specified.isBound()) { return ConditionOutcome.match(message.because("automatic cache type")); } - CacheType required = CacheConfigurations.getType(metadata.getClassName()); + CacheType required = CacheConfigurations.getType(sourceClass); if (specified.get() == required) { return ConditionOutcome.match(message.because(specified.get() + " cache type")); } diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/PropertiesDataRedisConnectionDetails.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/PropertiesDataRedisConnectionDetails.java index 372244ca24f..0da15a59e66 100644 --- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/PropertiesDataRedisConnectionDetails.java +++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/PropertiesDataRedisConnectionDetails.java @@ -102,14 +102,14 @@ class PropertiesDataRedisConnectionDetails implements DataRedisConnectionDetails return DataRedisUrl.of(this.properties.getUrl()); } - private List asNodes(@Nullable List nodes) { + private static List asNodes(@Nullable List nodes) { if (nodes == null) { return Collections.emptyList(); } - return nodes.stream().map(this::asNode).toList(); + return nodes.stream().map(PropertiesDataRedisConnectionDetails::asNode).toList(); } - private Node asNode(String node) { + private static Node asNode(String node) { int portSeparatorIndex = node.lastIndexOf(':'); String host = node.substring(0, portSeparatorIndex); int port = Integer.parseInt(node.substring(portSeparatorIndex + 1)); @@ -119,7 +119,7 @@ class PropertiesDataRedisConnectionDetails implements DataRedisConnectionDetails /** * {@link Cluster} implementation backed by properties. */ - private class PropertiesCluster implements Cluster { + private static class PropertiesCluster implements Cluster { private final List nodes; @@ -137,7 +137,7 @@ class PropertiesDataRedisConnectionDetails implements DataRedisConnectionDetails /** * {@link MasterReplica} implementation backed by properties. */ - private class PropertiesMasterReplica implements MasterReplica { + private static class PropertiesMasterReplica implements MasterReplica { private final List nodes; @@ -155,7 +155,7 @@ class PropertiesDataRedisConnectionDetails implements DataRedisConnectionDetails /** * {@link Sentinel} implementation backed by properties. */ - private class PropertiesSentinel implements Sentinel { + private static class PropertiesSentinel implements Sentinel { private final int database; diff --git a/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchConnectionDetails.java b/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchConnectionDetails.java index e3ccd83381e..59777491cb5 100644 --- a/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchConnectionDetails.java +++ b/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchConnectionDetails.java @@ -58,7 +58,7 @@ public interface ElasticsearchConnectionDetails extends ConnectionDetails { } /** - * APIKey for authentication with Elasticsearch. + * API key for authentication with Elasticsearch. * @return the API key for authentication with Elasticsearch or {@code null} */ default @Nullable String getApiKey() { diff --git a/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientConfigurations.java b/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientConfigurations.java index 34ff940fd88..22ee528bc60 100644 --- a/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientConfigurations.java +++ b/module/spring-boot-elasticsearch/src/main/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientConfigurations.java @@ -105,7 +105,7 @@ class ElasticsearchRestClientConfigurations { .toArray(HttpHost[]::new)); if (connectionDetails.getApiKey() != null) { builder.setDefaultHeaders( - new Header[] { new BasicHeader("Authorization", "ApiKey " + connectionDetails.getApiKey()), }); + new Header[] { new BasicHeader("Authorization", "ApiKey " + connectionDetails.getApiKey()) }); } builder.setHttpClientConfigCallback((httpClientBuilder) -> builderCustomizers.orderedStream() .forEach((customizer) -> customizer.customize(httpClientBuilder))); diff --git a/module/spring-boot-health/src/test/java/org/springframework/boot/health/autoconfigure/actuate/endpoint/AvailabilityProbesAutoConfigurationTests.java b/module/spring-boot-health/src/test/java/org/springframework/boot/health/autoconfigure/actuate/endpoint/AvailabilityProbesAutoConfigurationTests.java index 86fc35beafd..d130f55d90c 100644 --- a/module/spring-boot-health/src/test/java/org/springframework/boot/health/autoconfigure/actuate/endpoint/AvailabilityProbesAutoConfigurationTests.java +++ b/module/spring-boot-health/src/test/java/org/springframework/boot/health/autoconfigure/actuate/endpoint/AvailabilityProbesAutoConfigurationTests.java @@ -60,7 +60,7 @@ class AvailabilityProbesAutoConfigurationTests { } @Test - void probesWhenPropertyDisabledAddsNotBeans() { + void probesWhenPropertyDisabledDoesNotAddBeans() { this.contextRunner.withPropertyValues("management.endpoint.health.probes.enabled=false") .run(this::doesNotHaveProbeBeans); } diff --git a/module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/MongoAutoConfigurationTests.java b/module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/MongoAutoConfigurationTests.java index 60902c2b8a1..75712074fc0 100644 --- a/module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/MongoAutoConfigurationTests.java +++ b/module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/MongoAutoConfigurationTests.java @@ -233,7 +233,7 @@ class MongoAutoConfigurationTests { } @Test - void configureUUidRepresentation() { + void configureUuidRepresentation() { this.contextRunner.withPropertyValues("spring.mongodb.representation.uuid=standard") .run((context) -> assertThat(getSettings(context).getUuidRepresentation()) .isEqualTo(UuidRepresentation.STANDARD)); diff --git a/module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/MongoPropertiesTests.java b/module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/MongoPropertiesTests.java index a3be0990113..ab2de427382 100644 --- a/module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/MongoPropertiesTests.java +++ b/module/spring-boot-mongodb/src/test/java/org/springframework/boot/mongodb/autoconfigure/MongoPropertiesTests.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; class MongoPropertiesTests { @Test - void defaultUUidRepresentationIsAlignedWithSpringData() { + void defaultUuidRepresentationIsAlignedWithSpringData() { UuidRepresentation springDataDefault = springDataDefaultUuidRepresentation(); UuidRepresentation springBootDefault = new MongoProperties().getRepresentation().getUuid(); assertThat(springBootDefault).isEqualTo(springDataDefault); diff --git a/module/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/TomcatEmbeddedContext.java b/module/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/TomcatEmbeddedContext.java index de6ce645195..f42dbca3703 100644 --- a/module/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/TomcatEmbeddedContext.java +++ b/module/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/TomcatEmbeddedContext.java @@ -118,7 +118,7 @@ public class TomcatEmbeddedContext extends StandardContext { } /** - * Set the a strategy used to capture and rethrow deferred startup exceptions. + * Set a strategy used to capture and rethrow deferred startup exceptions. * @param deferredStartupExceptions the strategy to use */ public void setDeferredStartupExceptions(DeferredStartupExceptions deferredStartupExceptions) {