diff --git a/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java b/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java index b983917c..e0f29a47 100644 --- a/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java +++ b/src/main/java/io/github/robwin/swagger2markup/Swagger2MarkupConverter.java @@ -214,7 +214,7 @@ public class Swagger2MarkupConverter { * @param swaggerPath the local Path */ Builder(Path swaggerPath) { - this.swaggerLocation = swaggerPath.toUri(); + this.swaggerLocation = swaggerPath.toAbsolutePath().toUri(); this.swagger = readSwagger(swaggerPath.toString()); } diff --git a/src/main/java/io/github/robwin/swagger2markup/builder/document/DefinitionsDocument.java b/src/main/java/io/github/robwin/swagger2markup/builder/document/DefinitionsDocument.java index 074df94c..4fd525cc 100644 --- a/src/main/java/io/github/robwin/swagger2markup/builder/document/DefinitionsDocument.java +++ b/src/main/java/io/github/robwin/swagger2markup/builder/document/DefinitionsDocument.java @@ -167,9 +167,9 @@ public class DefinitionsDocument extends MarkupDocument { */ private String resolveDefinitionDocument(String definitionName) { if (config.isSeparatedDefinitions()) - return new File(config.getSeparatedDefinitionsFolder(), markupDocBuilder.addfileExtension(normalizeName(definitionName))).getPath(); + return new File(config.getSeparatedDefinitionsFolder(), markupDocBuilder.addFileExtension(normalizeName(definitionName))).getPath(); else - return markupDocBuilder.addfileExtension(config.getDefinitionsDocument()); + return markupDocBuilder.addFileExtension(config.getDefinitionsDocument()); } /** @@ -439,7 +439,7 @@ public class DefinitionsDocument extends MarkupDocument { String defaultResolver = super.apply(definitionName); if (defaultResolver != null && config.isSeparatedDefinitions()) - return defaultString(config.getInterDocumentCrossReferencesPrefix()) + markupDocBuilder.addfileExtension(normalizeName(definitionName)); + return defaultString(config.getInterDocumentCrossReferencesPrefix()) + markupDocBuilder.addFileExtension(normalizeName(definitionName)); else return defaultResolver; } diff --git a/src/main/java/io/github/robwin/swagger2markup/builder/document/MarkupDocument.java b/src/main/java/io/github/robwin/swagger2markup/builder/document/MarkupDocument.java index dcab24dd..d218297d 100644 --- a/src/main/java/io/github/robwin/swagger2markup/builder/document/MarkupDocument.java +++ b/src/main/java/io/github/robwin/swagger2markup/builder/document/MarkupDocument.java @@ -246,9 +246,9 @@ public abstract class MarkupDocument { if (!config.isInterDocumentCrossReferences() || outputPath == null) return null; else if (config.isSeparatedDefinitions()) - return defaultString(config.getInterDocumentCrossReferencesPrefix()) + new File(config.getSeparatedDefinitionsFolder(), markupDocBuilder.addfileExtension(IOUtils.normalizeName(definitionName))).getPath(); + return defaultString(config.getInterDocumentCrossReferencesPrefix()) + new File(config.getSeparatedDefinitionsFolder(), markupDocBuilder.addFileExtension(IOUtils.normalizeName(definitionName))).getPath(); else - return defaultString(config.getInterDocumentCrossReferencesPrefix()) + markupDocBuilder.addfileExtension(config.getDefinitionsDocument()); + return defaultString(config.getInterDocumentCrossReferencesPrefix()) + markupDocBuilder.addFileExtension(config.getDefinitionsDocument()); } } } diff --git a/src/main/java/io/github/robwin/swagger2markup/builder/document/PathsDocument.java b/src/main/java/io/github/robwin/swagger2markup/builder/document/PathsDocument.java index bff541c3..866fe95f 100644 --- a/src/main/java/io/github/robwin/swagger2markup/builder/document/PathsDocument.java +++ b/src/main/java/io/github/robwin/swagger2markup/builder/document/PathsDocument.java @@ -230,9 +230,9 @@ public class PathsDocument extends MarkupDocument { */ private String resolveOperationDocument(PathOperation operation) { if (config.isSeparatedOperations()) - return new File(config.getSeparatedOperationsFolder(), this.markupDocBuilder.addfileExtension(normalizeName(operation.getId()))).getPath(); + return new File(config.getSeparatedOperationsFolder(), this.markupDocBuilder.addFileExtension(normalizeName(operation.getId()))).getPath(); else - return this.markupDocBuilder.addfileExtension(config.getPathsDocument()); + return this.markupDocBuilder.addFileExtension(config.getPathsDocument()); } /**