springfox#3189 - return default value if property not found in environment

Viktar Beliakou · Viktar Beliakou · commit 83545c53f400 · 2019-11-20T10:32:21.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;
 
@@ -69,6 +69,7 @@ public String resolve(String expression) {
 
       // Store the value
       String key = matcher.group(1);
+      String defaultValue = matcher.group(3);
 
       // Get the value
       String value = environment.getProperty(key);
@@ -82,6 +83,11 @@ public String resolve(String expression) {
         // return the value
         return value;
 
+      } else if (defaultValue != null) {
+        // use default if value not found
+        cache.put(expression, defaultValue);
+
+        return defaultValue;
       }
 
     }
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
@@ -22,6 +22,8 @@ class DescriptionResolverSpec extends Specification {
       "key2value"   | '${key2}'
       "key2value"   | '${key2:}'
       "key2value"   | '${key2:key2default}'
+      "key3default" | '${key3:key3default}'
+      ""            | '${key3:}'
       '${unknown}'  | '${unknown}'
       "key1"        | 'key1'
       "key2"        | 'key2'
