From 6de95a2b37737fea3b53c03075dbca08db25a7a2 Mon Sep 17 00:00:00 2001 From: graceyu Date: Tue, 1 Aug 2023 16:00:00 +0800 Subject: [PATCH] Provide methods for obtaining include/exclude patterns in MappedInterceptor Prior to this commit, MappedInterceptor had a getPathPatterns() method that returned the include patterns. This commit introduces getIncludePathPatterns() (which effectively replaces getPathPatterns()) and getExcludePathPatterns(). In addition, this commit deprecates getPathPatterns(). Closes gh-30971 --- .../servlet/handler/MappedInterceptor.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java index ebac18eedaf..bb960440c27 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java @@ -140,12 +140,33 @@ public final class MappedInterceptor implements HandlerInterceptor { * Return the patterns this interceptor is mapped to. */ @Nullable + @Deprecated public String[] getPathPatterns() { return (!ObjectUtils.isEmpty(this.includePatterns) ? Arrays.stream(this.includePatterns).map(PatternAdapter::getPatternString).toArray(String[]::new) : null); } + /** + * Return the include path patterns this interceptor is mapped to. + */ + @Nullable + public String[] getIncludePathPatterns() { + return (!ObjectUtils.isEmpty(this.includePatterns) ? + Arrays.stream(this.includePatterns).map(PatternAdapter::getPatternString).toArray(String[]::new) : + null); + } + + /** + * Return the exclude path patterns this interceptor is mapped to. + */ + @Nullable + public String[] getExcludePathPatterns() { + return (!ObjectUtils.isEmpty(this.excludePatterns) ? + Arrays.stream(this.excludePatterns).map(PatternAdapter::getPatternString).toArray(String[]::new) : + null); + } + /** * The target {@link HandlerInterceptor} to invoke in case of a match. */