make some file URIs work on windows

basically File.toURI() is broken - it does not produce legal URLs - however nio Path does....
ivoa · Aug 14, 2024 · b644e35 · b644e35
1 parent aa6ec34
commit b644e35
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...gradletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlBaseTask.kt b/...gradletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlBaseTask.kt
@@ -114,7 +114,7 @@ class ExternalModelHelper constructor (private val project: Project, private val
                  """.trimIndent()
             )
             v.forEach {
-                out.write("   <uri name=\"${it.name}\" uri=\"${it.toURI().toURL()}\"/>\n")
+                out.write("   <uri name=\"${it.name}\" uri=\"${java.nio.file.Paths.get(it.toURI()).toUri()}\"/>\n") //IMPL note that the File.toURI() does not produce a legal file: URI!
             }
             out.write(
                 """

diff --git a/...adletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlSchemaTask.kt b/...adletooling/gradle-plugin/src/main/kotlin/net/ivoa/vodml/gradle/plugin/VodmlSchemaTask.kt
@@ -7,9 +7,7 @@ import org.gradle.api.tasks.*
 import java.io.File
 import javax.inject.Inject
 import com.fasterxml.jackson.databind.ObjectMapper
-
-
-
+import java.nio.file.Paths
 
 
 /*
@@ -61,11 +59,15 @@ open class VodmlSchemaTask  @Inject constructor(ao1: ArchiveOperations) : VodmlB
             outfile.get().asFile.writeText(pretty)
         }
 
+        val xmlcat = java.nio.file.Paths.get(schemaDir.file("xmlcat.xml").get().asFile.toURI()).toUri().toString()
+        val jsoncat = java.nio.file.Paths.get(schemaDir.file("jsoncat.txt").get().asFile.toURI()).toUri().toString()
         logger.info("generating Catalogues")
+        logger.info("xml = $xmlcat")
+        logger.info("json= $jsoncat")
         Vodml2Catalogues.doTransform(mapOf(
             "binding" to bindingFiles.joinToString(separator = ",") { it.toURI().toURL().toString() },
-            "xml-catalogue" to schemaDir.file("xmlcat.xml").get().asFile.absolutePath,
-            "json-catalogue" to schemaDir.file("jsoncat.txt").get().asFile.absolutePath
+            "xml-catalogue" to xmlcat,
+            "json-catalogue" to jsoncat
 
         )
             )