From 393ec8ae517929f9d10f9c0d9620214433469881 Mon Sep 17 00:00:00 2001 From: Christoph Dreis Date: Sun, 18 Aug 2024 17:58:30 +0200 Subject: [PATCH] Fix duplicate words See gh-41916 --- .../spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc | 2 +- .../springframework/boot/testsupport/container/TestImage.java | 2 +- .../src/main/java/org/springframework/boot/origin/JarUri.java | 4 ++-- .../org/springframework/boot/ssl/pem/PemSslStoreDetails.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc index 184f8c80eb92..c89bab7a653a 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/actuator/metrics.adoc @@ -1026,7 +1026,7 @@ Auto-configuration registers a `MongoMetricsConnectionPoolListener` with the aut The following gauge metrics are created for the connection pool: -* `mongodb.driver.pool.size` reports the current size of the connection pool, including idle and and in-use members. +* `mongodb.driver.pool.size` reports the current size of the connection pool, including idle and in-use members. * `mongodb.driver.pool.checkedout` reports the count of connections that are currently in use. * `mongodb.driver.pool.waitqueuesize` reports the current size of the wait queue for a connection from the pool. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java index 57fbce8a97ea..a1dd5e20ffec 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java @@ -40,7 +40,7 @@ import org.springframework.util.Assert; /** - * References to container images used for integration tests. This class also acts a a + * References to container images used for integration tests. This class also acts a * central location for tests to {@link #container(Class) create} a correctly configured * {@link Container testcontainer}. * diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/JarUri.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/JarUri.java index 735a5ce01998..5aa0d5a9eb40 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/JarUri.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/JarUri.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import java.net.URI; /** - * Simple class that understands Jar URLs can can provide short descriptions. + * Simple class that understands Jar URLs and can provide short descriptions. * * @author Phillip Webb */ diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemSslStoreDetails.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemSslStoreDetails.java index 2f7dfff29c13..db009c1fbac1 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemSslStoreDetails.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemSslStoreDetails.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ * @param password the password used * {@link KeyStore#setKeyEntry(String, java.security.Key, char[], java.security.cert.Certificate[]) * setting key entries} in the {@link KeyStore} - * @param certificates the certificates content (either the PEM content itself or or a + * @param certificates the certificates content (either the PEM content itself or a * reference to the resource to load). When a {@link #privateKey() private key} is present * this value is treated as a certificate chain, otherwise it is treated a list of * certificates that should all be registered.