Spring/spring-restdocs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2017-10-20 11:04:08 +01:00
parent 660c440c6c 07bca1875f
commit 7e0da73dd2
2 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-restdocs-core/src/main/java/org/springframework/restdocs/snippet/StandardWriterResolver.java
View File

@@ -65,11 +65,12 @@ public final class StandardWriterResolver implements WriterResolver {
@Override
public Writer resolve(String operationName, String snippetName,
RestDocumentationContext context) throws IOException {
File outputFile = resolveFile(
this.propertyPlaceholderHelper.replacePlaceholders(operationName,
this.placeholderResolverFactory.create(context)),
snippetName + "." + this.templateFormat.getFileExtension(), context);
PlaceholderResolver placeholderResolver = this.placeholderResolverFactory
.create(context);
String outputDirectory = replacePlaceholders(placeholderResolver, operationName);
String fileName = replacePlaceholders(placeholderResolver, snippetName) + "."
+ this.templateFormat.getFileExtension();
File outputFile = resolveFile(outputDirectory, fileName, context);
if (outputFile != null) {
createDirectoriesIfNecessary(outputFile);
return new OutputStreamWriter(new FileOutputStream(outputFile),
@@ -80,6 +81,10 @@ public final class StandardWriterResolver implements WriterResolver {
}
}
private String replacePlaceholders(PlaceholderResolver resolver, String input) {
return this.propertyPlaceholderHelper.replacePlaceholders(input, resolver);
}
File resolveFile(String outputDirectory, String fileName,
RestDocumentationContext context) {
File outputFile = new File(outputDirectory, fileName);