Browse Source

Polish

See gh-45592

Signed-off-by: Johnny Lim <izeye@naver.com>
pull/45601/head
Johnny Lim 7 months ago committed by Stéphane Nicoll
parent
commit
0a54804a0f
  1. 2
      spring-boot-project/spring-boot-actuator-autoconfigure/src/docs/antora/modules/api/pages/rest/actuator/metrics.adoc
  2. 3
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java
  3. 2
      spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCliInspectResponse.java
  4. 2
      spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/core/DockerComposeFileTests.java
  5. 6
      spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/external-config.adoc
  6. 2
      spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/packaging/native-image/introducing-graalvm-native-images.adoc
  7. 4
      spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerFactoryTests.java
  8. 2
      spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/FieldOriginTests.java
  9. 2
      spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/nio/file/NestedFileSystemTests.java
  10. 2
      spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/nio/file/NestedPathTests.java
  11. 2
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/StandardConfigDataResourceTests.java
  12. 2
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemContentTests.java
  13. 2
      spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/bind/KotlinDefaultBindConstructorProviderTests.kt
  14. 2
      spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/cassandra.yaml

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/docs/antora/modules/api/pages/rest/actuator/metrics.adoc

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
The `metrics` endpoint provides access to application metrics to diagnose the metrics the application has recorded.
This endpoint should not be "scraped" or used as a metrics backend in production.
Its purpose is to show the currently registered metrics so users can see what metrics are available, what their current values are, and if triggering certain operations cause any change in certain values.
Its purpose is to show the currently registered metrics so users can see what metrics are available, what their current values are, and if triggering certain operations causes any change in certain values.
If you want to diagnose your applications through the metrics they collect, you should use an xref:reference:actuator/metrics.adoc[external metrics backend].
In this case, the `metrics` endpoint can still be useful.

3
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java

@ -113,11 +113,10 @@ class JerseyAutoConfigurationTests { @@ -113,11 +113,10 @@ class JerseyAutoConfigurationTests {
.stream()
.filter(JakartaXmlBindAnnotationIntrospector.class::isInstance)).isEmpty();
});
}
@Test
void webApplicationIntializerDisablesJerseysWebApplicationInitializer() throws ServletException {
void webApplicationInitializerDisablesJerseyWebApplicationInitializer() throws ServletException {
ServletContext context = new MockServletContext();
new JerseyWebApplicationInitializer().onStartup(context);
assertThat(context.getInitParameter("contextConfigLocation")).isEqualTo("<NONE>");

2
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/DockerCliInspectResponse.java

@ -53,7 +53,7 @@ record DockerCliInspectResponse(String id, DockerCliInspectResponse.Config confi @@ -53,7 +53,7 @@ record DockerCliInspectResponse(String id, DockerCliInspectResponse.Config confi
}
/**
* A container's resources (cgroups config, ulimits, etc).
* A container's resources (cgroups config, ulimits, etc.).
*
* @param networkMode the network mode to use for this container
*/

2
spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/core/DockerComposeFileTests.java

@ -49,7 +49,7 @@ class DockerComposeFileTests { @@ -49,7 +49,7 @@ class DockerComposeFileTests {
DockerComposeFile c2 = DockerComposeFile.of(f1);
DockerComposeFile c3 = DockerComposeFile.find(f1.getParentFile());
DockerComposeFile c4 = DockerComposeFile.of(f2);
assertThat(c1.hashCode()).isEqualTo(c2.hashCode()).isEqualTo(c3.hashCode());
assertThat(c1).hasSameHashCodeAs(c2).hasSameHashCodeAs(c3);
assertThat(c1).isEqualTo(c1).isEqualTo(c2).isEqualTo(c3).isNotEqualTo(c4);
}

6
spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/external-config.adoc

@ -305,7 +305,7 @@ Imports may be specified as _fixed_ or _import relative_ locations. @@ -305,7 +305,7 @@ Imports may be specified as _fixed_ or _import relative_ locations.
A fixed location always resolves to the same underlying resource, regardless of where the configprop:spring.config.import[] property is declared.
An import relative location resolves relative to the file that declares the configprop:spring.config.import[] property.
A location starting with a forward slash (`/`) or a URL style prefix (`file:`, `classpath:`, etc) is considered fixed.
A location starting with a forward slash (`/`) or a URL style prefix (`file:`, `classpath:`, etc.) is considered fixed.
All other locations are considered import relative.
NOTE: `optional:` prefixes are not considered when determining if a location is fixed or import relative.
@ -313,7 +313,7 @@ NOTE: `optional:` prefixes are not considered when determining if a location is @@ -313,7 +313,7 @@ NOTE: `optional:` prefixes are not considered when determining if a location is
As an example, say we have a `/demo` directory containing our `application.jar` file.
We might add a `/demo/application.properties` file with the following content:
[,properties]
[source,properties]
----
spring.config.import=optional:core/core.properties
----
@ -322,7 +322,7 @@ This is an import relative location and so will attempt to load the file `/demo/ @@ -322,7 +322,7 @@ This is an import relative location and so will attempt to load the file `/demo/
If `/demo/core/core.properties` has the following content:
[,properties]
[source,properties]
----
spring.config.import=optional:extra/extra.properties
----

2
spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/packaging/native-image/introducing-graalvm-native-images.adoc

@ -55,7 +55,7 @@ When these restrictions are in place, it becomes possible for Spring to perform @@ -55,7 +55,7 @@ When these restrictions are in place, it becomes possible for Spring to perform
A Spring AOT processed application will typically generate:
* Java source code
* Bytecode (for dynamic proxies etc)
* Bytecode (for dynamic proxies, etc.)
* GraalVM JSON hint files in `+META-INF/native-image/{groupId}/{artifactId}/+`:
- Resource hints (`resource-config.json`)
- Reflection hints (`reflect-config.json`)

4
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/ImportsContextCustomizerFactoryTests.java

@ -83,10 +83,10 @@ class ImportsContextCustomizerFactoryTests { @@ -83,10 +83,10 @@ class ImportsContextCustomizerFactoryTests {
.createContextCustomizer(TestWithImportAndComponentScanOfSomePackage.class, null);
ContextCustomizer customizer3 = this.factory
.createContextCustomizer(TestWithImportAndComponentScanOfAnotherPackage.class, null);
assertThat(customizer1.hashCode()).isEqualTo(customizer2.hashCode());
assertThat(customizer1).isEqualTo(customizer2);
assertThat(customizer3.hashCode()).isNotEqualTo(customizer2.hashCode()).isNotEqualTo(customizer1.hashCode());
assertThat(customizer1).hasSameHashCodeAs(customizer2);
assertThat(customizer3).isNotEqualTo(customizer2).isNotEqualTo(customizer1);
assertThat(customizer3).doesNotHaveSameHashCodeAs(customizer2).doesNotHaveSameHashCodeAs(customizer1);
}
@Test

2
spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/service/connection/FieldOriginTests.java

@ -45,7 +45,7 @@ class FieldOriginTests { @@ -45,7 +45,7 @@ class FieldOriginTests {
Origin o2 = new FieldOrigin(ReflectionUtils.findField(Fields.class, "one"));
Origin o3 = new FieldOrigin(ReflectionUtils.findField(Fields.class, "two"));
assertThat(o1).isEqualTo(o1).isEqualTo(o2).isNotEqualTo(o3);
assertThat(o1.hashCode()).isEqualTo(o2.hashCode());
assertThat(o1).hasSameHashCodeAs(o2);
}
@Test

2
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/nio/file/NestedFileSystemTests.java

@ -184,8 +184,8 @@ class NestedFileSystemTests { @@ -184,8 +184,8 @@ class NestedFileSystemTests {
NestedFileSystem f2 = new NestedFileSystem(this.provider, jp1);
NestedFileSystem f3 = new NestedFileSystem(this.provider, jp2);
NestedFileSystem f4 = new NestedFileSystem(this.provider, jp3);
assertThat(f1.hashCode()).isEqualTo(f2.hashCode());
assertThat(f1).isEqualTo(f1).isEqualTo(f2).isEqualTo(f3).isNotEqualTo(f4);
assertThat(f1).hasSameHashCodeAs(f2);
}
}

2
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/nio/file/NestedPathTests.java

@ -208,7 +208,7 @@ class NestedPathTests { @@ -208,7 +208,7 @@ class NestedPathTests {
NestedPath p2 = new NestedPath(this.fileSystem, "a.jar");
NestedPath p3 = new NestedPath(this.fileSystem, "c.jar");
NestedPath p4 = new NestedPath(fs2, "c.jar");
assertThat(p1.hashCode()).isEqualTo(p2.hashCode());
assertThat(p1).hasSameHashCodeAs(p2);
assertThat(p1).isEqualTo(p1).isEqualTo(p2).isNotEqualTo(p3).isNotEqualTo(p4);
}

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/StandardConfigDataResourceTests.java

@ -87,8 +87,8 @@ class StandardConfigDataResourceTests { @@ -87,8 +87,8 @@ class StandardConfigDataResourceTests {
FileUrlResource fileResource = new FileUrlResource(classResource.getURL());
ConfigDataResource classDataResource = new StandardConfigDataResource(this.reference, classResource);
ConfigDataResource fileDataResource = new StandardConfigDataResource(this.reference, fileResource);
assertThat(classDataResource.hashCode()).isEqualTo(fileDataResource.hashCode());
assertThat(classDataResource).isEqualTo(fileDataResource);
assertThat(classDataResource).hasSameHashCodeAs(fileDataResource);
}
finally {
Thread.currentThread().setContextClassLoader(contextClassLoader);

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ssl/pem/PemContentTests.java

@ -86,8 +86,8 @@ class PemContentTests { @@ -86,8 +86,8 @@ class PemContentTests {
PemContent c1 = PemContent.of("aaa");
PemContent c2 = PemContent.of("aaa");
PemContent c3 = PemContent.of("bbb");
assertThat(c1.hashCode()).isEqualTo(c2.hashCode());
assertThat(c1).isEqualTo(c1).isEqualTo(c2).isNotEqualTo(c3);
assertThat(c1).hasSameHashCodeAs(c2);
}
@Test

2
spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/bind/KotlinDefaultBindConstructorProviderTests.kt

@ -62,7 +62,7 @@ class KotlinDefaultBindConstructorProviderTests { @@ -62,7 +62,7 @@ class KotlinDefaultBindConstructorProviderTests {
}
@Test
fun `type with no param primary constructor and secondary params constructor should not use constructor binding`() {
fun `type with no param primary constructor and params secondary constructor should not use constructor binding`() {
val bindConstructor = this.constructorProvider.getBindConstructor(NoParamPrimaryWithParamsSecondaryProperties::class.java, false)
assertThat(bindConstructor).isNull()
}

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/src/dockerTest/resources/ssl/cassandra.yaml

@ -604,7 +604,7 @@ ssl_storage_port: 7001 @@ -604,7 +604,7 @@ ssl_storage_port: 7001
#
# Leaving it blank leaves it up to InetAddress.getLocalHost(). This
# will always do the Right Thing _if_ the node is properly configured
# (hostname, name resolution, etc), and the Right Thing is to use the
# (hostname, name resolution, etc.), and the Right Thing is to use the
# address associated with the hostname (it might not be).
#
# Setting listen_address to 0.0.0.0 is always wrong.

Loading…
Cancel
Save