Skip to content

Commit 43dc14f

Browse files
izeyearefbehboudi
authored andcommitted
Polish
See spring-projectsgh-43879 Signed-off-by: Johnny Lim <[email protected]> Signed-off-by: arefbehboudi <[email protected]>
1 parent 7eb6a66 commit 43dc14f

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresJdbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ private void checkDatabaseAccess(JdbcConnectionDetails connectionDetails) throws
8484
}
8585

8686
@SuppressWarnings("unchecked")
87-
private <T> T executeQuery(JdbcConnectionDetails connectionDetails, String sql, Class<T> result)
87+
private <T> T executeQuery(JdbcConnectionDetails connectionDetails, String sql, Class<T> resultClass)
8888
throws ClassNotFoundException {
8989
SimpleDriverDataSource dataSource = new SimpleDriverDataSource();
9090
dataSource.setUrl(connectionDetails.getJdbcUrl());
9191
dataSource.setUsername(connectionDetails.getUsername());
9292
dataSource.setPassword(connectionDetails.getPassword());
9393
dataSource.setDriverClass((Class<? extends Driver>) ClassUtils.forName(connectionDetails.getDriverClassName(),
9494
getClass().getClassLoader()));
95-
return new JdbcTemplate(dataSource).queryForObject(sql, result);
95+
return new JdbcTemplate(dataSource).queryForObject(sql, resultClass);
9696
}
9797

9898
}

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresR2dbcDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ private void checkDatabaseAccess(R2dbcConnectionDetails connectionDetails) {
8888
.isEqualTo(1);
8989
}
9090

91-
private <T> T executeQuery(R2dbcConnectionDetails connectionDetails, String sql, Class<T> result) {
91+
private <T> T executeQuery(R2dbcConnectionDetails connectionDetails, String sql, Class<T> resultClass) {
9292
ConnectionFactoryOptions connectionFactoryOptions = connectionDetails.getConnectionFactoryOptions();
9393
return DatabaseClient.create(ConnectionFactories.get(connectionFactoryOptions))
9494
.sql(sql)
95-
.mapValue(result)
95+
.mapValue(resultClass)
9696
.first()
9797
.block(Duration.ofSeconds(30));
9898
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ enum Type {
276276
*/
277277
record ComposeVersion(int major, int minor) {
278278

279-
public static final ComposeVersion UNKNOWN = new ComposeVersion(0, 0);
279+
static final ComposeVersion UNKNOWN = new ComposeVersion(0, 0);
280280

281281
boolean isLessThan(int major, int minor) {
282282
return major() < major || major() == major && minor() < minor;

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/dev-services.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ NOTE: Using a javadoc:org.springframework.boot.testcontainers.service.connection
377377

378378

379379
[[features.dev-services.testcontainers.at-development-time.importing-container-declarations]]
380-
==== Importing Testcontainer Declaration Classes
380+
==== Importing Testcontainers Declaration Classes
381381

382382
A common pattern when using Testcontainers is to declare javadoc:org.testcontainers.containers.Container[] instances as static fields.
383383
Often these fields are defined directly on the test class.
@@ -402,7 +402,7 @@ You can also add javadoc:org.springframework.test.context.DynamicPropertySource[
402402

403403
When using devtools, you can annotate beans and bean methods with javadoc:org.springframework.boot.devtools.restart.RestartScope[format=annotation].
404404
Such beans won't be recreated when the devtools restart the application.
405-
This is especially useful for Testcontainer javadoc:org.testcontainers.containers.Container[] beans, as they keep their state despite the application restart.
405+
This is especially useful for javadoc:org.testcontainers.containers.Container[] beans, as they keep their state despite the application restart.
406406

407407
include-code::MyContainersConfiguration[]
408408

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/context/ImportTestcontainers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.springframework.context.annotation.Import;
3131

3232
/**
33-
* Imports idiomatic Testcontainer declaration classes into the Spring
33+
* Imports idiomatic Testcontainers declaration classes into the Spring
3434
* {@link ApplicationContext}. The following elements will be considered from the imported
3535
* classes:
3636
* <ul>

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/DebugLogbackConfigurator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ <T extends Converter<?>> void conversionRule(String conversionWord, Class<T> con
4747
}
4848

4949
@Override
50-
public void appender(String name, Appender<?> appender) {
50+
void appender(String name, Appender<?> appender) {
5151
info("Adding appender '" + appender + "' named '" + name + "'");
5252
super.appender(name, appender);
5353
}
5454

5555
@Override
56-
public void logger(String name, Level level, boolean additive, Appender<ILoggingEvent> appender) {
56+
void logger(String name, Level level, boolean additive, Appender<ILoggingEvent> appender) {
5757
info("Configuring logger '" + name + "' with level '" + level + "'. Additive: " + additive);
5858
if (appender != null) {
5959
info("Adding appender '" + appender + "' to logger '" + name + "'");
@@ -62,7 +62,7 @@ public void logger(String name, Level level, boolean additive, Appender<ILogging
6262
}
6363

6464
@Override
65-
public void start(LifeCycle lifeCycle) {
65+
void start(LifeCycle lifeCycle) {
6666
info("Starting '" + lifeCycle + "'");
6767
super.start(lifeCycle);
6868
}

0 commit comments

Comments
 (0)