Skip to content

Commit d1e5fe3

Browse files
committed
Merge branch '3.5.x'
Closes gh-48106
2 parents 55c3f03 + 1ce1b7e commit d1e5fe3

File tree

71 files changed

+120
-119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+120
-119
lines changed

build-plugin/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/PluginClasspathGradleBuild.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
*/
5757
public class PluginClasspathGradleBuild extends GradleBuild {
5858

59-
private boolean kotlin = false;
59+
private boolean kotlin;
6060

6161
public PluginClasspathGradleBuild(BuildOutput buildOutput) {
6262
super(buildOutput);

buildSrc/src/main/java/org/springframework/boot/build/mavenplugin/PluginXmlParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public Iterator<Node> iterator() {
142142

143143
return new Iterator<>() {
144144

145-
private int index = 0;
145+
private int index;
146146

147147
@Override
148148
public boolean hasNext() {

buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/socket/FileDescriptorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class FileDescriptorTests {
3131

3232
private final int sourceHandle = 123;
3333

34-
private int closedHandle = 0;
34+
private int closedHandle;
3535

3636
@Test
3737
void acquireReturnsHandle() throws Exception {

config/checkstyle/checkstyle.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
1717
<module name="io.spring.javaformat.checkstyle.check.SpringDeprecatedCheck" />
1818
<module name="io.spring.javaformat.checkstyle.check.SpringJUnit5Check" />
19+
<module name="ExplicitInitialization" />
1920
<module
2021
name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
2122
<property name="regexp" value="true" />

core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ public class MessageSourceProperties {
7676
* Whether to always apply the MessageFormat rules, parsing even messages without
7777
* arguments.
7878
*/
79-
private boolean alwaysUseMessageFormat = false;
79+
private boolean alwaysUseMessageFormat;
8080

8181
/**
8282
* Whether to use the message code as the default message instead of throwing a
8383
* "NoSuchMessageException". Recommended during development only.
8484
*/
85-
private boolean useCodeAsDefaultMessage = false;
85+
private boolean useCodeAsDefaultMessage;
8686

8787
public List<String> getBasename() {
8888
return this.basename;

core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ public class JmxProperties {
3333
/**
3434
* Expose Spring's management beans to the JMX domain.
3535
*/
36-
private boolean enabled = false;
36+
private boolean enabled;
3737

3838
/**
3939
* Whether unique runtime object names should be ensured.
4040
*/
41-
private boolean uniqueNames = false;
41+
private boolean uniqueNames;
4242

4343
/**
4444
* MBeanServer bean name.

core/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebProperties.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public static class Resources {
101101
*/
102102
private boolean addMappings = true;
103103

104-
private boolean customized = false;
104+
private boolean customized;
105105

106106
private final Chain chain = new Chain();
107107

@@ -151,7 +151,7 @@ public boolean hasBeenCustomized() {
151151
*/
152152
public static class Chain {
153153

154-
boolean customized = false;
154+
boolean customized;
155155

156156
/**
157157
* Whether to enable the Spring Resource Handling chain. By default, disabled
@@ -169,7 +169,7 @@ public static class Chain {
169169
* brotli). Checks for a resource name with the '.gz' or '.br' file
170170
* extensions.
171171
*/
172-
private boolean compressed = false;
172+
private boolean compressed;
173173

174174
private final Strategy strategy = new Strategy();
175175

@@ -246,7 +246,7 @@ private boolean hasBeenCustomized() {
246246
*/
247247
public static class Content {
248248

249-
private boolean customized = false;
249+
private boolean customized;
250250

251251
/**
252252
* Whether to enable the content Version Strategy.
@@ -287,7 +287,7 @@ private boolean hasBeenCustomized() {
287287
*/
288288
public static class Fixed {
289289

290-
private boolean customized = false;
290+
private boolean customized;
291291

292292
/**
293293
* Whether to enable the fixed Version Strategy.
@@ -346,7 +346,7 @@ private boolean hasBeenCustomized() {
346346
*/
347347
public static class Cache {
348348

349-
private boolean customized = false;
349+
private boolean customized;
350350

351351
/**
352352
* Cache period for the resources served by the resource handler. If a
@@ -398,7 +398,7 @@ private boolean hasBeenCustomized() {
398398
*/
399399
public static class Cachecontrol {
400400

401-
private boolean customized = false;
401+
private boolean customized;
402402

403403
/**
404404
* Maximum time the response should be cached, in seconds if no duration

core/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Counter counter() {
130130
@ManagedResource
131131
public static class Counter {
132132

133-
private int counter = 0;
133+
private int counter;
134134

135135
@ManagedAttribute
136136
public int get() {

core/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ssl/FileWatcherTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ private static final class WaitingCallback implements Runnable {
336336

337337
private CountDownLatch latch = new CountDownLatch(1);
338338

339-
volatile boolean changed = false;
339+
volatile boolean changed;
340340

341341
@Override
342342
public void run() {

core/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestWebEnvironmentMockTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
class SpringBootTestWebEnvironmentMockTests {
4747

4848
@Value("${value}")
49-
private int value = 0;
49+
private int value;
5050

5151
@Autowired
5252
private WebApplicationContext context;

0 commit comments

Comments
 (0)