improved writing of 1.X specifications

Author: Ole Lensmar

src/main/java/com/smartbear/swagger4j/FileSwaggerStore.java

@@ -46,7 +46,7 @@ public Writer createResource(String path) throws IOException {
         // make sure directory exists
         if (path.indexOf('/') > 0) {
             String nm = path.substring(0, path.lastIndexOf('/'));
-            File f = new File(nm, this.path);
+            File f = new File(this.path, nm);
             if (!f.exists() || !f.isDirectory()) {
                 if (!f.mkdirs()) {
                     throw new IOException("Failed to create path [" + path + "] for file storage");
@@ -55,7 +55,7 @@ public Writer createResource(String path) throws IOException {
         }
 
         File file = new File(this.path, path);
-        if (path.equals("/api-docs") || path.equals("api-docs")) {
+        if (path.startsWith("/api-docs.") || path.startsWith("api-docs.")) {
             apiDocsPath = file.getAbsolutePath();
         }
 

src/main/java/com/smartbear/swagger4j/URISwaggerSource.java

@@ -85,6 +85,12 @@ public Reader readApiDeclaration(String basePath, String path) throws IOExceptio
 
                 if (basePath == null) {
                     basePath = uri.toString();
+
+                    int ix = basePath.lastIndexOf("/api-docs.");
+                    if (ix != -1) {
+                        basePath = basePath.substring(0, ix + 9);
+                    }
+
                 } else if (!basePath.toLowerCase().startsWith("file:") && !basePath.contains("://")) {
                     String uriString = uri.toString();
                     if (basePath.equals(".")) {

src/main/java/com/smartbear/swagger4j/impl/SwaggerWriterImpl.java

@@ -293,12 +293,12 @@ public SwaggerFormat getFormat() {
     }
 
     public void writeSwagger(SwaggerStore store, ResourceListing resourceListing) throws IOException {
-        Writer writer = store.createResource("api-docs");
+        Writer writer = store.createResource("api-docs." + format.getExtension());
         writeResourceListing(resourceListing, writer);
 
         for (ResourceListing.ResourceListingApi api : resourceListing.getApis()) {
             ApiDeclaration declaration = api.getDeclaration();
-            String path = Utils.createFileNameFromPath(api.getPath(), format);
+            String path = Utils.createFileNameFromPath("api-docs" + api.getPath(), format);
 
             writer = store.createResource(path);
             writeApiDeclaration(declaration, writer);

src/test/java/com/smartbear/swagger4j/SwaggerWriterTestCase.java

@@ -57,7 +57,7 @@ public void testJsonCreation() throws Exception {
         MapSwaggerStore store = new MapSwaggerStore();
         ResourceListing resourceListing = createResourceListingForCreationTesting(store, SwaggerFormat.json);
 
-        String json = store.getFileMap().get("api-docs").toString();
+        String json = store.getFileMap().get("api-docs.json").toString();
         assertTrue(json.length() > 0);
 
         JsonReader reader = Json.createReader(new StringReader(json));
@@ -66,7 +66,7 @@ public void testJsonCreation() throws Exception {
 
         System.out.println( json );
 
-        json = store.getFileMap().get("/user.json").toString();
+        json = store.getFileMap().get("api-docs/user.json").toString();
         System.out.println("Created: " + json);
         reader = Json.createReader(new StringReader(json));
         JsonObject object = reader.readObject();
@@ -118,7 +118,7 @@ public void testXmlCreation() throws Exception {
         MapSwaggerStore store = new MapSwaggerStore();
         ResourceListing resourceListing = createResourceListingForCreationTesting(store, SwaggerFormat.xml);
 
-        String xml = store.getFileMap().get("api-docs").toString();
+        String xml = store.getFileMap().get("api-docs.xml").toString();
         assertTrue(xml.length() > 0);
 
         Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource( new StringReader(xml)));
@@ -128,7 +128,7 @@ public void testXmlCreation() throws Exception {
         SwaggerVersion swaggerVersion = resourceListing.getSwaggerVersion();
         assertEquals(swaggerVersion.getIdentifier(), elm.getTextContent());
 
-        xml = store.getFileMap().get("/user.xml").toString();
+        xml = store.getFileMap().get("api-docs/user.xml").toString();
         document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(xml)));
         documentElement = document.getDocumentElement();
         assertEquals(Constants.API_DOCUMENTATION, documentElement.getNodeName());
@@ -154,13 +154,13 @@ private MapSwaggerStore testCreation(SwaggerFactory factory, ResourceListing res
         swaggerWriter.writeSwagger(store, resourceListing);
 
         assertEquals(3, store.getFileMap().size());
-        assertTrue(store.getFileMap().containsKey("api-docs"));
+        assertTrue(store.getFileMap().containsKey("api-docs.xml"));
 
         swaggerWriter = factory.createSwaggerWriter(SwaggerFormat.json);
         swaggerWriter.writeSwagger(store, resourceListing);
 
-        assertEquals(5, store.getFileMap().size());
-        assertTrue(store.getFileMap().containsKey("api-docs"));
+        assertEquals(6, store.getFileMap().size());
+        assertTrue(store.getFileMap().containsKey("api-docs.json"));
 
         return store;
     }