Browse Source

Remove obsolete code

pull/31837/head
Sam Brannen 2 years ago
parent
commit
7471fd1dd0
  1. 13
      spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java

13
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java

@ -294,19 +294,6 @@ public abstract class RequestPredicates { @@ -294,19 +294,6 @@ public abstract class RequestPredicates {
}
}
private static Map<String, String> mergePathVariables(Map<String, String> oldVariables,
Map<String, String> newVariables) {
if (!newVariables.isEmpty()) {
Map<String, String> mergedVariables = new LinkedHashMap<>(oldVariables);
mergedVariables.putAll(newVariables);
return mergedVariables;
}
else {
return oldVariables;
}
}
private static PathPattern mergePatterns(@Nullable PathPattern oldPattern, PathPattern newPattern) {
if (oldPattern != null) {
return oldPattern.combine(newPattern);

Loading…
Cancel
Save