From 52f664139f65bc8573e70f8c770c4784f9163f23 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Tue, 13 Dec 2016 10:43:27 +0100 Subject: [PATCH] Improve VersionResourceResolve javadoc The `pathPatterns` args are relative to the patterns configured for the resource handler. Issue: SPR-14817 --- .../web/reactive/resource/VersionResourceResolver.java | 9 ++++++--- .../web/servlet/resource/VersionResourceResolver.java | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java index 86930e1112..0ddd2bda53 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java @@ -96,7 +96,8 @@ public class VersionResourceResolver extends AbstractResourceResolver { * default strategy to use except when it cannot be, for example when using * JavaScript module loaders, use {@link #addFixedVersionStrategy} instead * for serving JavaScript files. - * @param pathPatterns one or more resource URL path patterns + * @param pathPatterns one or more resource URL path patterns, + * relative to the pattern configured with the resource handler * @return the current instance for chained method invocation * @see ContentVersionStrategy */ @@ -118,7 +119,8 @@ public class VersionResourceResolver extends AbstractResourceResolver { * will also cofigure automatically a {@code "/v1.0.0/js/**"} with {@code "v1.0.0"} the * {@code version} String given as an argument. * @param version a version string - * @param pathPatterns one or more resource URL path patterns + * @param pathPatterns one or more resource URL path patterns, + * relative to the pattern configured with the resource handler * @return the current instance for chained method invocation * @see FixedVersionStrategy */ @@ -139,7 +141,8 @@ public class VersionResourceResolver extends AbstractResourceResolver { * Register a custom VersionStrategy to apply to resource URLs that match the * given path patterns. * @param strategy the custom strategy - * @param pathPatterns one or more resource URL path patterns + * @param pathPatterns one or more resource URL path patterns, + * relative to the pattern configured with the resource handler * @return the current instance for chained method invocation * @see VersionStrategy */ diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java index 3237c6cb2c..0a48c6611d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java @@ -94,7 +94,8 @@ public class VersionResourceResolver extends AbstractResourceResolver { * default strategy to use except when it cannot be, for example when using * JavaScript module loaders, use {@link #addFixedVersionStrategy} instead * for serving JavaScript files. - * @param pathPatterns one or more resource URL path patterns + * @param pathPatterns one or more resource URL path patterns, + * relative to the pattern configured with the resource handler * @return the current instance for chained method invocation * @see ContentVersionStrategy */ @@ -116,7 +117,8 @@ public class VersionResourceResolver extends AbstractResourceResolver { * will also cofigure automatically a {@code "/v1.0.0/js/**"} with {@code "v1.0.0"} the * {@code version} String given as an argument. * @param version a version string - * @param pathPatterns one or more resource URL path patterns + * @param pathPatterns one or more resource URL path patterns, + * relative to the pattern configured with the resource handler * @return the current instance for chained method invocation * @see FixedVersionStrategy */ @@ -137,7 +139,8 @@ public class VersionResourceResolver extends AbstractResourceResolver { * Register a custom VersionStrategy to apply to resource URLs that match the * given path patterns. * @param strategy the custom strategy - * @param pathPatterns one or more resource URL path patterns + * @param pathPatterns one or more resource URL path patterns, + * relative to the pattern configured with the resource handler * @return the current instance for chained method invocation * @see VersionStrategy */