remove & replace usage of File with Path

Author: hauner

src/main/groovy/com/github/hauner/openapi/spring/parser/openapi4j/Parser.groovy

@@ -30,9 +30,12 @@ import org.openapi4j.parser.validation.v3.OpenApi3Validator
 class Parser {
 
     ParserOpenApi parse (String apiPath) {
+        if (!hasScheme (apiPath)) {
+            apiPath = "file://${apiPath}"
+        }
 
         OpenApi3 api = new OpenApi3Parser ()
-            .parse (new File (apiPath), true)
+            .parse (new URL (apiPath), true)
 
         ValidationResults results = OpenApi3Validator
             .instance ()
@@ -41,4 +44,8 @@ class Parser {
         new OpenApi (api, results)
     }
 
+    boolean hasScheme (String path) {
+        path.indexOf ("://") > -1
+    }
+
 }

src/main/groovy/com/github/hauner/openapi/spring/parser/swagger/Parser.groovy

@@ -22,13 +22,17 @@ import io.swagger.v3.parser.core.models.ParseOptions
 import io.swagger.v3.parser.core.models.SwaggerParseResult
 
 /**
- * openapi4j parser.
+ * swagger parser.
  *
  * @author Martin Hauner
  */
 class Parser {
 
     ParserOpenApi parse (String apiPath) {
+        if (!hasScheme (apiPath)) {
+            apiPath = "file://${apiPath}"
+        }
+
         ParseOptions opts = new ParseOptions(
             // loads $refs to other files into #/components/schema and replaces the $refs to the
             // external files with $refs to #/components/schema.
@@ -40,4 +44,8 @@ class Parser {
         new OpenApi(result)
     }
 
+    boolean hasScheme (String path) {
+        path.indexOf ("://") > -1
+    }
+
 }

src/main/groovy/com/github/hauner/openapi/spring/writer/ApiWriter.groovy

@@ -25,6 +25,9 @@ import com.google.googlejavaformat.java.Formatter
 import com.google.googlejavaformat.java.JavaFormatterOptions
 import groovy.util.logging.Slf4j
 
+import java.nio.file.Files
+import java.nio.file.Path
+
 import static com.github.hauner.openapi.support.Identifier.toClass
 
 /**
@@ -40,8 +43,8 @@ class ApiWriter {
     DataTypeWriter dataTypeWriter
     StringEnumWriter enumWriter
 
-    File apiFolder
-    File modelFolder
+    Path apiFolder
+    Path modelFolder
 
     Formatter formatter
 
@@ -69,22 +72,22 @@ class ApiWriter {
         createTargetFolders ()
 
         api.interfaces.each {
-            def target = new File (apiFolder, "${it.interfaceName}.java")
-            def writer = new FileWriter(target)
+            def target = apiFolder.resolve ("${it.interfaceName}.java")
+            def writer = new BufferedWriter (new PathWriter(target))
             writeInterface (writer, it)
             writer.close ()
         }
 
         api.models.objectDataTypes.each {
-            def target = new File (modelFolder, "${it.name}.java")
-            def writer = new FileWriter(target)
+            def target = modelFolder.resolve ("${it.name}.java")
+            def writer = new BufferedWriter (new PathWriter(target))
             writeDataType (writer, it)
             writer.close ()
         }
 
         api.models.enumDataTypes.each {
-            def target = new File (modelFolder, "${it.name}.java")
-            def writer = new FileWriter(target)
+            def target = modelFolder.resolve ("${it.name}.java")
+            def writer = new BufferedWriter (new PathWriter(target))
             writeEnumDataType (writer, it)
             writer.close ()
         }
@@ -132,23 +135,25 @@ class ApiWriter {
         log.debug ('creating target folders: {}', rootPkg)
 
         apiFolder = createTargetPackage (apiPkg)
-        log.debug ('created target folder: {}', apiFolder.absolutePath)
+        log.debug ('created target folder: {}', apiFolder.toAbsolutePath ().toString ())
 
         modelFolder = createTargetPackage (modelPkg)
-        log.debug ('created target folder: {}', modelFolder.absolutePath)
+        log.debug ('created target folder: {}', modelFolder.toAbsolutePath ().toString ())
     }
 
-    private File createTargetPackage (String apiPkg) {
-        def folder = new File ([options.targetDir, apiPkg].join (File.separator))
-        if (folder.exists () && folder.isDirectory ()) {
-            return folder
+    private Path createTargetPackage (String apiPkg) {
+        String root = options.targetDir
+        if (!hasScheme (root)) {
+            root = "file://${root}"
         }
 
-        def success = folder.mkdirs ()
-        if (!success) {
-            log.error ('failed to create package {}', folder)
-        }
-        folder
+        def target = Path.of (new URL ([root, apiPkg].join ('/')).toURI ())
+        Files.createDirectories (target)
+        target
+    }
+
+    private boolean hasScheme (String source) {
+        source.indexOf ("://") > -1
     }
 
 }

src/main/groovy/com/github/hauner/openapi/spring/writer/PathWriter.groovy

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2019-2020 the original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.github.hauner.openapi.spring.writer
+
+import java.nio.file.Files
+import java.nio.file.Path
+
+/**
+ * Path based Writer
+ *
+ * @author Martin Haner
+ */
+class PathWriter extends OutputStreamWriter {
+
+    PathWriter(Path target) throws IOException {
+        super(Files.newOutputStream (target));
+    }
+
+}

src/test/groovy/com/github/hauner/openapi/spring/writer/ApiWriterSpec.groovy

@@ -47,7 +47,8 @@ class ApiWriterSpec extends Specification {
         )
 
         when:
-        new ApiWriter (opts, Stub (InterfaceWriter), null, null).write (new Api())
+        new ApiWriter (opts, Stub (InterfaceWriter), null, null)
+            .write (new Api())
 
         then:
         def api = new File([opts.targetDir, 'com', 'github', 'hauner', 'openapi', 'api'].join(File.separator))