Skip to content

Commit 18c93a0

Browse files
committed
Remove deprecated method (plus JSpecify alignment)
See gh-35594
1 parent 8792b39 commit 18c93a0

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

spring-core/src/main/java/org/springframework/util/PlaceholderParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,14 +314,14 @@ private static class PartResolutionContext implements PlaceholderResolver {
314314

315315
private final boolean ignoreUnresolvablePlaceholders;
316316

317-
private final Function<String, List<Part>> parser;
317+
private final Function<String, @Nullable List<Part>> parser;
318318

319319
private final PlaceholderResolver resolver;
320320

321321
private @Nullable Set<String> visitedPlaceholders;
322322

323323
PartResolutionContext(PlaceholderResolver resolver, String prefix, String suffix,
324-
boolean ignoreUnresolvablePlaceholders, Function<String, List<Part>> parser) {
324+
boolean ignoreUnresolvablePlaceholders, Function<String, @Nullable List<Part>> parser) {
325325
this.prefix = prefix;
326326
this.suffix = suffix;
327327
this.ignoreUnresolvablePlaceholders = ignoreUnresolvablePlaceholders;

spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,6 @@ public String replacePlaceholders(String value, PlaceholderResolver placeholderR
9696
return this.parser.replacePlaceholders(value, placeholderResolver);
9797
}
9898

99-
@Deprecated(since = "6.2.12", forRemoval = true)
100-
protected String parseStringValue(String value, PlaceholderResolver placeholderResolver) {
101-
return this.parser.replacePlaceholders(value, placeholderResolver);
102-
}
103-
10499

105100
/**
106101
* Strategy interface used to resolve replacement values for placeholders contained in Strings.

0 commit comments

Comments
 (0)