Skip to content

Commit 0615783

Browse files
izeyejonatan-ivanov
authored andcommitted
Polish
See gh-35872
1 parent ca0e894 commit 0615783

File tree

9 files changed

+17
-16
lines changed

9 files changed

+17
-16
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,12 +649,12 @@ public static class Admin {
649649
private final Map<String, String> properties = new HashMap<>();
650650

651651
/**
652-
* The close timeout.
652+
* Close timeout.
653653
*/
654654
private Duration closeTimeout;
655655

656656
/**
657-
* The operation timeout.
657+
* Operation timeout.
658658
*/
659659
private Duration operationTimeout;
660660

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationEarlyInitializationIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
*
4040
* @author Phillip Webb
4141
*/
42-
public class SessionAutoConfigurationEarlyInitializationIntegrationTests {
42+
class SessionAutoConfigurationEarlyInitializationIntegrationTests {
4343

4444
@Test
4545
void configurationIsFrozenWhenSessionRepositoryAccessed() {

spring-boot-project/spring-boot-docs/src/docs/asciidoc/getting-started/first-application.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,10 @@ Open your favorite text editor and add the following:
141141
plugins {
142142
id 'java'
143143
id 'org.springframework.boot' version '{spring-boot-version}'
144-
id 'io.spring.dependency-management' version '1.1.0'
145144
}
146145
146+
apply plugin: 'io.spring.dependency-management'
147+
147148
group = 'com.example'
148149
version = '0.0.1-SNAPSHOT'
149150
sourceCompatibility = '17'
@@ -247,7 +248,7 @@ If you run `gradle dependencies` again, you see that there are now a number of a
247248
[[getting-started.first-application.code]]
248249
=== Writing the Code
249250
To finish our application, we need to create a single Java file.
250-
By default, Maven and Gradle compiles sources from `src/main/java`, so you need to create that directory structure and then add a file named `src/main/java/MyApplication.java` to contain the following code:
251+
By default, Maven and Gradle compile sources from `src/main/java`, so you need to create that directory structure and then add a file named `src/main/java/MyApplication.java` to contain the following code:
251252

252253
include::code:MyApplication[]
253254

spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/spring-security.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ For JWT configuration, a JWK Set URI or OIDC Issuer URI needs to be specified, a
211211
NOTE: If the authorization server does not support a JWK Set URI, you can configure the resource server with the Public Key used for verifying the signature of the JWT.
212212
This can be done using the configprop:spring.security.oauth2.resourceserver.jwt.public-key-location[] property, where the value needs to point to a file containing the public key in the PEM-encoded x509 format.
213213

214-
The configprop:spring.security.oauth2.resourceserver.jwt.audiences[] property can be used to specifify the expected values of the aud claim in JWTs.
214+
The configprop:spring.security.oauth2.resourceserver.jwt.audiences[] property can be used to specify the expected values of the aud claim in JWTs.
215215
For example, to require JWTs to contain an aud claim with the value `my-audience`:
216216

217217
[source,yaml,indent=0,subs="verbatim",configprops,configblocks]

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleBeanFactoryPostProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
/**
3131
* {@link BeanFactoryPostProcessor} to prevent {@link AutoCloseable} destruction calls so
32-
* that {@link TestcontainersLifecycleBeanFactoryPostProcessor} can be smarter about which
32+
* that {@link TestcontainersLifecycleBeanPostProcessor} can be smarter about which
3333
* containers to close.
3434
*
3535
* @author Phillip Webb

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleBeanPostProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class TestcontainersLifecycleBeanPostProcessor implements DestructionAwareBeanPo
5656

5757
private static final Log logger = LogFactory.getLog(TestcontainersLifecycleBeanPostProcessor.class);
5858

59-
private ConfigurableListableBeanFactory beanFactory;
59+
private final ConfigurableListableBeanFactory beanFactory;
6060

6161
private volatile boolean containersInitialized = false;
6262

spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleApplicationContextInitializerTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import static org.mockito.Mockito.times;
3333

3434
/**
35-
* Tests for {@link TestcontainersLifecycleApplicationContextInitializer} and
36-
* {@link TestcontainersLifecycleBeanPostProcessor} and
35+
* Tests for {@link TestcontainersLifecycleApplicationContextInitializer},
36+
* {@link TestcontainersLifecycleBeanPostProcessor}, and
3737
* {@link TestcontainersLifecycleBeanFactoryPostProcessor}.
3838
*
3939
* @author Stephane Nicoll

spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleOrderIntegrationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@
3939
import static org.assertj.core.api.Assertions.assertThat;
4040

4141
/**
42-
* Integration tests for {@link TestcontainersLifecycleApplicationContextInitializer} to
43-
* ensure create and destroy events happen in the correct order.
42+
* Integration tests for {@link TestcontainersLifecycleBeanPostProcessor} to ensure create
43+
* and destroy events happen in the correct order.
4444
*
4545
* @author Phillip Webb
4646
*/
4747
@ExtendWith(AssertingSpringExtension.class)
4848
@ContextConfiguration(classes = { TestConfig.class, ContainerConfig.class })
4949
@DirtiesContext
5050
@DisabledIfDockerUnavailable
51-
public class TestcontainersLifecycleOrderIntegrationTests {
51+
class TestcontainersLifecycleOrderIntegrationTests {
5252

5353
static List<String> events = Collections.synchronizedList(new ArrayList<>());
5454

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ void equalsAndHashCode() {
110110
ServiceConnectionContextCustomizer n3 = new ServiceConnectionContextCustomizer(
111111
List.of(new ContainerConnectionSource<>("test", this.origin, PostgreSQLContainer.class, "namex",
112112
annotation1, () -> container1)));
113-
assertThat(n1.hashCode()).isEqualTo(n2.hashCode());
113+
assertThat(n1.hashCode()).isEqualTo(n2.hashCode()).isNotEqualTo(n3.hashCode());
114114
assertThat(n1).isEqualTo(n2).isNotEqualTo(n3);
115115
// Connection Details Types
116116
ServiceConnectionContextCustomizer t1 = new ServiceConnectionContextCustomizer(
@@ -122,7 +122,7 @@ void equalsAndHashCode() {
122122
ServiceConnectionContextCustomizer t3 = new ServiceConnectionContextCustomizer(
123123
List.of(new ContainerConnectionSource<>("test", this.origin, PostgreSQLContainer.class, "name",
124124
annotation3, () -> container1)));
125-
assertThat(t1.hashCode()).isEqualTo(t2.hashCode());
125+
assertThat(t1.hashCode()).isEqualTo(t2.hashCode()).isNotEqualTo(t3.hashCode());
126126
assertThat(t1).isEqualTo(t2).isNotEqualTo(t3);
127127
// Container
128128
ServiceConnectionContextCustomizer c1 = new ServiceConnectionContextCustomizer(
@@ -134,7 +134,7 @@ void equalsAndHashCode() {
134134
ServiceConnectionContextCustomizer c3 = new ServiceConnectionContextCustomizer(
135135
List.of(new ContainerConnectionSource<>("test", this.origin, PostgreSQLContainer.class, "name",
136136
annotation1, () -> container2)));
137-
assertThat(c1.hashCode()).isEqualTo(c2.hashCode());
137+
assertThat(c1.hashCode()).isEqualTo(c2.hashCode()).isNotEqualTo(c3.hashCode());
138138
assertThat(c1).isEqualTo(c2).isNotEqualTo(c3);
139139
}
140140

0 commit comments

Comments
 (0)