From 3e8e21aef444984fed378dff5ae8bb7dd1e81e15 Mon Sep 17 00:00:00 2001 From: Robert Winkler Date: Thu, 12 Feb 2015 10:00:27 +0100 Subject: [PATCH] Renamed method names --- README.adoc | 3 ++- .../swagger2asciidoc/Swagger2AsciiDocConverter.java | 11 +++++------ .../Swagger2AsciiDocConverterTest.java | 5 +---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/README.adoc b/README.adoc index 215dc942..4c38c833 100644 --- a/README.adoc +++ b/README.adoc @@ -19,7 +19,8 @@ public class Swagger2AsciiDocTest { @Test public void convertSwaggerToAsciiDoc() { - Swagger2AsciiDocConverter.newInstance("http://localhost:8080/api-docs", "src/docs/asciidoc/example.adoc").convertSwagger2AsciiDoc(); + Swagger2AsciiDocConverter.from("http://localhost:8080/api-docs") + .convertTo("src/docs/asciidoc/swagger.adoc"); } } diff --git a/src/main/java/io/swagger2asciidoc/Swagger2AsciiDocConverter.java b/src/main/java/io/swagger2asciidoc/Swagger2AsciiDocConverter.java index 47b5ba63..2e45b315 100644 --- a/src/main/java/io/swagger2asciidoc/Swagger2AsciiDocConverter.java +++ b/src/main/java/io/swagger2asciidoc/Swagger2AsciiDocConverter.java @@ -36,19 +36,18 @@ public class Swagger2AsciiDocConverter { private static final List IGNORED_DEFINITIONS = Arrays.asList("Void"); private final AsciiDocBuilder asciiDocBuilder; private final Swagger swagger; - private final String asciiDocFileLocation; - private Swagger2AsciiDocConverter(String swaggerFileLocation, String asciiDocFileLocation){ + private Swagger2AsciiDocConverter(String swaggerFileLocation){ swagger = new SwaggerParser().read(swaggerFileLocation); - this.asciiDocFileLocation = asciiDocFileLocation; + asciiDocBuilder = new AsciiDocBuilder(); } - public static Swagger2AsciiDocConverter newInstance(String swaggerFileLocation, String asciiDocFileLocation){ - return new Swagger2AsciiDocConverter(swaggerFileLocation, asciiDocFileLocation); + public static Swagger2AsciiDocConverter from(String swaggerFileLocation){ + return new Swagger2AsciiDocConverter(swaggerFileLocation); } - public void convertSwagger2AsciiDoc(){ + public void convertTo(String asciiDocFileLocation){ documentHeader(swagger.getInfo()); paths(swagger.getPaths()); definitions(swagger.getDefinitions()); diff --git a/src/test/java/io/swagger2asciidoc/Swagger2AsciiDocConverterTest.java b/src/test/java/io/swagger2asciidoc/Swagger2AsciiDocConverterTest.java index 36aad0dd..8a203544 100644 --- a/src/test/java/io/swagger2asciidoc/Swagger2AsciiDocConverterTest.java +++ b/src/test/java/io/swagger2asciidoc/Swagger2AsciiDocConverterTest.java @@ -12,9 +12,6 @@ public class Swagger2AsciiDocConverterTest { @Test public void testSwagger2AsciiDocConverter(){ File file = new File(Swagger2AsciiDocConverterTest.class.getResource("/json/swagger.json").getFile()); - Swagger2AsciiDocConverter.newInstance( - file.getAbsolutePath(), - "C:\\Users\\robert.winkler\\Documents\\git\\swagger2asciidoc\\src\\docs\\asciidoc\\swagger.adoc") - .convertSwagger2AsciiDoc(); + Swagger2AsciiDocConverter.from(file.getAbsolutePath()).convertTo("src/docs/asciidoc/swagger.adoc"); } }