Skip to content

Commit 50c07d0

Browse files
izeyesnicoll
authored andcommitted
Polish
Closes gh-12156
1 parent 75505c7 commit 50c07d0

File tree

10 files changed

+9
-33
lines changed

10 files changed

+9
-33
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/AbstractEndpointDocumentationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
@TestPropertySource(properties = { "spring.jackson.serialization.indent_output=true",
5959
"management.endpoints.web.exposure.include=*",
6060
"spring.jackson.default-property-inclusion=non_null" })
61-
public class AbstractEndpointDocumentationTests {
61+
public abstract class AbstractEndpointDocumentationTests {
6262

6363
protected String describeEnumValues(Class<? extends Enum<?>> enumType) {
6464
return StringUtils

spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2653,7 +2653,7 @@ Spring WebFlux provides a `WebFilter` interface that can be implemented to filte
26532653
request-response exchanges. `WebFilter` beans found in the application context will
26542654
be automatically used to filter each exchange.
26552655

2656-
Where the order of the filters is important they can implemented `Ordered` or be annotated
2656+
Where the order of the filters is important they can implement `Ordered` or be annotated
26572657
with `@Order`. Spring Boot auto-configuration may configure web filters for you. When it
26582658
does so, the orders shown in the following table will be used:
26592659

@@ -5721,8 +5721,8 @@ The following example shows how to inject `ConnectionFactory` instances:
57215721

57225722
[[boot-features-jta-supporting-alternative-embedded]]
57235723
=== Supporting an Alternative Embedded Transaction Manager
5724-
The {sc-spring-boot}/jta/XAConnectionFactoryWrapper.{sc-ext}[`XAConnectionFactoryWrapper`]
5725-
and {sc-spring-boot}/jta/XADataSourceWrapper.{sc-ext}[`XADataSourceWrapper`] interfaces
5724+
The {sc-spring-boot}/jms/XAConnectionFactoryWrapper.{sc-ext}[`XAConnectionFactoryWrapper`]
5725+
and {sc-spring-boot}/jdbc/XADataSourceWrapper.{sc-ext}[`XADataSourceWrapper`] interfaces
57265726
can be used to support alternative embedded transaction managers. The interfaces are
57275727
responsible for wrapping `XAConnectionFactory` and `XADataSource` beans and exposing them
57285728
as regular `ConnectionFactory` and `DataSource` beans, which transparently enroll in the

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/DurationFormat.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.time.Duration;
2525

2626
/**
27-
* Annotation that can be used to indivate the format to use when converting a
27+
* Annotation that can be used to indicate the format to use when converting a
2828
* {@link Duration}.
2929
*
3030
* @author Phillip Webb

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/ProfileToLoadDocumentMatcher.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@ class ProfileToLoadDocumentMatcher extends SpringProfilesDocumentMatcher {
3636
@Override
3737
protected boolean matches(String[] profiles) {
3838
String[] positiveProfiles = (profiles == null ? null : Arrays.stream(profiles)
39-
.filter(this::isPositveProfile).toArray(String[]::new));
39+
.filter(this::isPositiveProfile).toArray(String[]::new));
4040
if (this.profile == null) {
4141
return ObjectUtils.isEmpty(positiveProfiles);
4242
}
4343
return ObjectUtils.containsElement(positiveProfiles, this.profile);
4444
}
4545

46-
private boolean isPositveProfile(String profile) {
46+
private boolean isPositiveProfile(String profile) {
4747
return !profile.startsWith("!");
4848
}
49+
4950
}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/XADataSourceWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import javax.transaction.TransactionManager;
2222

2323
/**
24-
* Strategy interface used to wrap a JMS {@link XADataSource} enrolling it with a JTA
24+
* Strategy interface used to wrap an {@link XADataSource} enrolling it with a JTA
2525
* {@link TransactionManager}.
2626
*
2727
* @author Phillip Webb

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/DelimitedStringToArrayConverterTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
import java.util.LinkedList;
2020
import java.util.List;
2121

22-
import org.junit.Rule;
2322
import org.junit.Test;
24-
import org.junit.rules.ExpectedException;
2523
import org.junit.runner.RunWith;
2624
import org.junit.runners.Parameterized;
2725
import org.junit.runners.Parameterized.Parameters;
@@ -48,9 +46,6 @@ public DelimitedStringToArrayConverterTests(String name,
4846
this.conversionService = conversionService;
4947
}
5048

51-
@Rule
52-
public ExpectedException thrown = ExpectedException.none();
53-
5449
@Test
5550
public void canConvertFromStringToArrayShouldReturnTrue() {
5651
assertThat(this.conversionService.canConvert(String.class, String[].class))

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/DelimitedStringToCollectionConverterTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
import java.util.LinkedList;
2121
import java.util.List;
2222

23-
import org.junit.Rule;
2423
import org.junit.Test;
25-
import org.junit.rules.ExpectedException;
2624
import org.junit.runner.RunWith;
2725
import org.junit.runners.Parameterized;
2826
import org.junit.runners.Parameterized.Parameters;
@@ -49,9 +47,6 @@ public DelimitedStringToCollectionConverterTests(String name,
4947
this.conversionService = conversionService;
5048
}
5149

52-
@Rule
53-
public ExpectedException thrown = ExpectedException.none();
54-
5550
@Test
5651
public void canConvertFromStringToCollectionShouldReturnTrue() {
5752
assertThat(this.conversionService.canConvert(String.class, Collection.class))

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/DurationToNumberConverterTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
import java.time.Duration;
2020
import java.time.temporal.ChronoUnit;
2121

22-
import org.junit.Rule;
2322
import org.junit.Test;
24-
import org.junit.rules.ExpectedException;
2523
import org.junit.runner.RunWith;
2624
import org.junit.runners.Parameterized;
2725
import org.junit.runners.Parameterized.Parameters;
@@ -39,9 +37,6 @@
3937
@RunWith(Parameterized.class)
4038
public class DurationToNumberConverterTests {
4139

42-
@Rule
43-
public ExpectedException thrown = ExpectedException.none();
44-
4540
private final ConversionService conversionService;
4641

4742
public DurationToNumberConverterTests(String name,

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/DurationToStringConverterTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
import java.time.Duration;
2020
import java.time.temporal.ChronoUnit;
2121

22-
import org.junit.Rule;
2322
import org.junit.Test;
24-
import org.junit.rules.ExpectedException;
2523
import org.junit.runner.RunWith;
2624
import org.junit.runners.Parameterized;
2725
import org.junit.runners.Parameterized.Parameters;
@@ -39,9 +37,6 @@
3937
@RunWith(Parameterized.class)
4038
public class DurationToStringConverterTests {
4139

42-
@Rule
43-
public ExpectedException thrown = ExpectedException.none();
44-
4540
private final ConversionService conversionService;
4641

4742
public DurationToStringConverterTests(String name,

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/convert/NumberToDurationConverterTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
import java.time.temporal.ChronoUnit;
2121
import java.util.Collections;
2222

23-
import org.junit.Rule;
2423
import org.junit.Test;
25-
import org.junit.rules.ExpectedException;
2624
import org.junit.runner.RunWith;
2725
import org.junit.runners.Parameterized;
2826
import org.junit.runners.Parameterized.Parameters;
@@ -43,9 +41,6 @@
4341
@RunWith(Parameterized.class)
4442
public class NumberToDurationConverterTests {
4543

46-
@Rule
47-
public ExpectedException thrown = ExpectedException.none();
48-
4944
private final ConversionService conversionService;
5045

5146
public NumberToDurationConverterTests(String name,

0 commit comments

Comments
 (0)