From 18c93a071c2fe00de208e2f08e8db2ec53245f84 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 10 Oct 2025 17:08:19 +0200 Subject: [PATCH] Remove deprecated method (plus JSpecify alignment) See gh-35594 --- .../java/org/springframework/util/PlaceholderParser.java | 4 ++-- .../org/springframework/util/PropertyPlaceholderHelper.java | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/util/PlaceholderParser.java b/spring-core/src/main/java/org/springframework/util/PlaceholderParser.java index 5402cd3b962..217238d4020 100644 --- a/spring-core/src/main/java/org/springframework/util/PlaceholderParser.java +++ b/spring-core/src/main/java/org/springframework/util/PlaceholderParser.java @@ -314,14 +314,14 @@ final class PlaceholderParser { private final boolean ignoreUnresolvablePlaceholders; - private final Function> parser; + private final Function> parser; private final PlaceholderResolver resolver; private @Nullable Set visitedPlaceholders; PartResolutionContext(PlaceholderResolver resolver, String prefix, String suffix, - boolean ignoreUnresolvablePlaceholders, Function> parser) { + boolean ignoreUnresolvablePlaceholders, Function> parser) { this.prefix = prefix; this.suffix = suffix; this.ignoreUnresolvablePlaceholders = ignoreUnresolvablePlaceholders; diff --git a/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java b/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java index 3f06f98f171..c6581b9fa36 100644 --- a/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java +++ b/spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java @@ -96,11 +96,6 @@ public class PropertyPlaceholderHelper { return this.parser.replacePlaceholders(value, placeholderResolver); } - @Deprecated(since = "6.2.12", forRemoval = true) - protected String parseStringValue(String value, PlaceholderResolver placeholderResolver) { - return this.parser.replacePlaceholders(value, placeholderResolver); - } - /** * Strategy interface used to resolve replacement values for placeholders contained in Strings.