springfox#3189 - handle defaults in Spring placeholders

Viktar Beliakou · Viktar Beliakou · commit d6b4b211f5ef · 2019-11-19T18:41:17.000+03:00
diff --git a/springfox-spring-web/src/main/java/springfox/documentation/spring/web/DescriptionResolver.java b/springfox-spring-web/src/main/java/springfox/documentation/spring/web/DescriptionResolver.java
@@ -29,7 +29,7 @@
 import static org.springframework.util.StringUtils.*;
 
 public class DescriptionResolver {
-  private static final Pattern PATTERN = Pattern.compile("\\Q${\\E(.+?)\\Q}\\E");
+  private static final Pattern PATTERN = Pattern.compile("\\Q${\\E(.+?)(:.*)?\\Q}\\E");
   private final Environment environment;
   private Map<String, String> cache;
 
diff --git a/springfox-spring-web/src/test/groovy/springfox/documentation/spring/web/DescriptionResolverSpec.groovy b/springfox-spring-web/src/test/groovy/springfox/documentation/spring/web/DescriptionResolverSpec.groovy
@@ -20,6 +20,8 @@ class DescriptionResolverSpec extends Specification {
       value         | key
       "key1value"   | '${key1}'
       "key2value"   | '${key2}'
+      "key2value"   | '${key2:}'
+      "key2value"   | '${key2:key2default}'
       '${unknown}'  | '${unknown}'
       "key1"        | 'key1'
       "key2"        | 'key2'
