From 147d3d763bfb804fb35a29d6eb4fa0d13a5d26b2 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Mon, 2 Feb 2026 11:36:33 +0800 Subject: [PATCH] Members declared in final classes should not be protected See gh-49031 Signed-off-by: Yanming Zhou --- .../java/org/springframework/boot/build/bom/BomResolver.java | 2 +- .../boot/autoconfigure/info/ProjectInfoAutoConfiguration.java | 2 +- .../org/springframework/boot/test/util/TestPropertyValues.java | 2 +- .../boot/loader/tools/BuildPropertiesWriter.java | 2 +- .../org/springframework/boot/logging/log4j2/ColorConverter.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/bom/BomResolver.java b/buildSrc/src/main/java/org/springframework/boot/build/bom/BomResolver.java index fe865002f64..f0165d562ba 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/bom/BomResolver.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/bom/BomResolver.java @@ -199,7 +199,7 @@ class BomResolver { private static final class Node { - protected final XPath xpath; + private final XPath xpath; private final org.w3c.dom.Node delegate; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java index 98d99f1bb3e..d5700e951a9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfiguration.java @@ -73,7 +73,7 @@ public class ProjectInfoAutoConfiguration { loadFrom(this.properties.getBuild().getLocation(), "build", this.properties.getBuild().getEncoding())); } - protected Properties loadFrom(Resource location, String prefix, Charset encoding) throws IOException { + private Properties loadFrom(Resource location, String prefix, Charset encoding) throws IOException { prefix = prefix.endsWith(".") ? prefix : prefix + "."; Properties source = loadSource(location, encoding); Properties target = new Properties(); diff --git a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java index e0ce1267288..cb17a57aaac 100644 --- a/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java +++ b/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/util/TestPropertyValues.java @@ -308,7 +308,7 @@ public final class TestPropertyValues { return this.sourceClass; } - protected String applySuffix(String name) { + private String applySuffix(String name) { return (this.suffix != null) ? name + "-" + this.suffix : name; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/BuildPropertiesWriter.java b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/BuildPropertiesWriter.java index 9d55be1e0f0..cb426e93d9f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/BuildPropertiesWriter.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/BuildPropertiesWriter.java @@ -71,7 +71,7 @@ public final class BuildPropertiesWriter { } } - protected Properties createBuildInfo(ProjectDetails project) { + private Properties createBuildInfo(ProjectDetails project) { Properties properties = CollectionFactory.createSortedProperties(true); addIfHasValue(properties, "build.group", project.getGroup()); addIfHasValue(properties, "build.artifact", project.getArtifact()); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java index bd4cb6ba311..407e4759962 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java @@ -109,7 +109,7 @@ public final class ColorConverter extends LogEventPatternConverter { } } - protected void appendAnsiString(StringBuilder toAppendTo, String in, AnsiElement element) { + private void appendAnsiString(StringBuilder toAppendTo, String in, AnsiElement element) { toAppendTo.append(AnsiOutput.toString(element, in)); }