Merge branch 'master' into bugfix/#2932-spring-boot-2.2.0

springfox · Jan 6, 2020 · 6f15b63 · 6f15b63
2 parents 42b8900 + 2af84cd
commit 6f15b63
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 10 deletions.
diff --git a/buildSrc/src/main/groovy/springfox/gradlebuild/BuildInfoFactory.groovy b/buildSrc/src/main/groovy/springfox/gradlebuild/BuildInfoFactory.groovy
@@ -20,7 +20,7 @@ class BuildInfoFactory {
     def isReleaseBuild = project.gradle.startParameter.taskNames.contains("release")
 
     SemanticVersion buildVersion = versioningStrategy.buildVersion(releaseType, isReleaseBuild)
-    project.logger.lifecycle("[RELEASE] current verison: ${versioningStrategy.current(project)}, " +
+    project.logger.lifecycle("[RELEASE] current version: ${versioningStrategy.current(project)}, " +
         "build version: $buildVersion, dryRun: $dryRun, releaseBuild: $isReleaseBuild")
     new BuildInfo(
         versioningStrategy.current(project),

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -6,7 +6,7 @@ ext {
   equalsverifierVersion = '3.1.5'
   groovy = "2.5.4"
   jacocoVersion = '0.8.5'
-  jackson = '2.10.0'
+  jackson = '2.10.1'
   joda = "2.10.1"
   jsonPath = "2.4.0"
   jsonAssert = "1.5.0"

diff --git a/...java/springfox/documentation/spring/web/plugins/SpringRestDocsOperationBuilderPlugin.java b/...java/springfox/documentation/spring/web/plugins/SpringRestDocsOperationBuilderPlugin.java
@@ -36,7 +36,6 @@
 import springfox.documentation.spi.service.OperationBuilderPlugin;
 import springfox.documentation.spi.service.contexts.OperationContext;
 
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -110,7 +109,7 @@ protected Set<ResponseMessage> read(OperationContext context) {
 
   private Function<Resource, RawHttpResponse<Void>> toRawHttpResponse() {
     return resource -> {
-      try (InputStream resourceAsStream = new FileInputStream(resource.getFile())) {
+      try (InputStream resourceAsStream = resource.getInputStream()) {
         RawHttp rawHttp = new RawHttp();
         // must extract the body before the stream is closed
         return (RawHttpResponse<Void>) rawHttp.parseResponse(resourceAsStream).eagerly();

diff --git a/...gfox-spring-web/src/main/java/springfox/documentation/spring/web/DescriptionResolver.java b/...gfox-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/...ing-web/src/test/groovy/springfox/documentation/spring/web/DescriptionResolverSpec.groovy b/...ing-web/src/test/groovy/springfox/documentation/spring/web/DescriptionResolverSpec.groovy
@@ -20,6 +20,10 @@ class DescriptionResolverSpec extends Specification {
       value         | key
       "key1value"   | '${key1}'
       "key2value"   | '${key2}'
+      "key2value"   | '${key2:}'
+      "key2value"   | '${key2:key2default}'
+      "key3default" | '${key3:key3default}'
+      ""            | '${key3:}'
       '${unknown}'  | '${unknown}'
       "key1"        | 'key1'
       "key2"        | 'key2'

diff --git a/springfox-swagger-ui/build.gradle b/springfox-swagger-ui/build.gradle
@@ -29,7 +29,7 @@ plugins {
 }
 
 ext {
-  swaggerUiVersion = '3.23.4'
+  swaggerUiVersion = '3.23.11'
   swaggerUiDist = "build/libs/swagger-ui-dist.zip"
   swaggerUiExplodedDir = "swagger-ui-${swaggerUiVersion}/dist/"
   downloadUrl = "https://github.com/swagger-api/swagger-ui/archive/v${swaggerUiVersion}.zip"

diff --git a/springfox-swagger-ui/src/web/package-lock.json b/springfox-swagger-ui/src/web/package-lock.json
diff --git a/...ct-tests/src/test/groovy/springfox/test/contract/swaggertests/FunctionContractSpec.groovy b/...ct-tests/src/test/groovy/springfox/test/contract/swaggertests/FunctionContractSpec.groovy
@@ -142,7 +142,8 @@ class FunctionContractSpec extends Specification implements FileAccess {
     then:
     response.statusCode == HttpStatus.OK
 
-    JSONAssert.assertEquals(contract, response.body, NON_EXTENSIBLE)
+    def bodyWithLFOnly = response.body.replaceAll("\\\\r\\\\n", "\\\\n") //Make sure if we're running on windows the line endings which are double-escaped match up with the resource file above.
+    JSONAssert.assertEquals(contract, bodyWithLFOnly, NON_EXTENSIBLE)
   }
 
   @Unroll