fix JavaDependencySampleApp in swift-java cli mode

Author: ktoso

Plugins/JExtractSwiftCommandPlugin/JExtractSwiftCommandPlugin.swift

@@ -81,7 +81,7 @@ final class JExtractSwiftCommandPlugin: SwiftJavaPluginProtocol, BuildToolPlugin
       //       We'll have to make up some caching inside the tool so we don't re-parse files which have not changed etc.
     ]
     // arguments.append(sourceDir) // TODO: we could do this shape maybe? to have the dirs last?
-    if let package = configuration.javaPackage, !package.isEmpty {
+    if let package = configuration?.javaPackage, !package.isEmpty {
       ["--java-package", package]
     }
 

Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift

@@ -42,7 +42,7 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
     let sourceDir = target.directory.string
     let configuration = try readConfiguration(sourceDir: "\(sourceDir)")
 
-    guard let javaPackage = configuration.javaPackage else {
+    guard let javaPackage = configuration?.javaPackage else {
       // throw SwiftJavaPluginError.missingConfiguration(sourceDir: "\(sourceDir)", key: "javaPackage")
       log("Skipping jextract step, no 'javaPackage' configuration in \(getSwiftJavaConfigPath(target: target) ?? "")")
       return []

Plugins/SwiftJavaPlugin/SwiftJavaPlugin.swift

@@ -38,7 +38,7 @@ struct SwiftJavaBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
     // which we are generating Swift wrappers for Java classes.
     let configFile = URL(filePath: sourceDir)
       .appending(path: SwiftJavaConfigFileName)
-    let config = try readConfiguration(sourceDir: sourceDir)
+    let config = try readConfiguration(sourceDir: sourceDir) ?? Configuration()
 
     log("Config on path: \(configFile.path(percentEncoded: false))")
     log("Config was: \(config)")

Sources/JExtractSwiftLib/SwiftThunkTranslator.swift

@@ -113,7 +113,7 @@ public struct JavaDependencyDescriptor: Hashable, Codable {
   }
 }
 
-public func readConfiguration(sourceDir: String, file: String = #fileID, line: UInt = #line) throws -> Configuration {
+public func readConfiguration(sourceDir: String, file: String = #fileID, line: UInt = #line) throws -> Configuration? {
   // Workaround since filePath is macOS 13
   let sourcePath =
   if sourceDir.hasPrefix("file://") { sourceDir } else { "file://" + sourceDir }
@@ -122,12 +122,15 @@ public func readConfiguration(sourceDir: String, file: String = #fileID, line: U
   return try readConfiguration(configPath: configPath, file: file, line: line)
 }
 
-public func readConfiguration(configPath: URL, file: String = #fileID, line: UInt = #line) throws -> Configuration {
+public func readConfiguration(configPath: URL, file: String = #fileID, line: UInt = #line) throws -> Configuration? {
+  guard let configData = try? Data(contentsOf: configPath) else {
+    return nil
+  }
+
   do {
-    let configData = try Data(contentsOf: configPath)
     return try JSONDecoder().decode(Configuration.self, from: configData)
   } catch {
-    throw ConfigurationError(message: "Failed to parse SwiftJava configuration at '\(configPath.absoluteURL)'!", error: error,
+    throw ConfigurationError(message: "Failed to parse SwiftJava configuration at '\(configPath.absoluteURL)'! \(#fileID):\(#line)", error: error,
       file: file, line: line)
   }
 }

Sources/JavaKitConfigurationShared/Configuration.swift

@@ -116,6 +116,7 @@ struct SwiftJava: AsyncParsableCommand {
           return nil
         }
 
+        print("[debug][swift-java] Module base directory based on outputDirectory!")
         return URL(fileURLWithPath: outputDirectory)
       }
 
@@ -186,21 +187,23 @@ struct SwiftJava: AsyncParsableCommand {
 
   mutating func run() async {
     print("[info][swift-java] Run: \(CommandLine.arguments.joined(separator: " "))")
+    print("[info][swift-java] Current work directory: \(URL(fileURLWithPath: "."))")
+    print("[info][swift-java] Module base directory: \(moduleBaseDir)")
     do {
-      var config: Configuration = Configuration()
+      var earlyConfig: Configuration?
       if let moduleBaseDir {
         print("[debug][swift-java] Load config from module base directory: \(moduleBaseDir.path)")
-        config = try readConfiguration(sourceDir: moduleBaseDir.path)
+        earlyConfig = try readConfiguration(sourceDir: moduleBaseDir.path)
       } else if let inputSwift {
         print("[debug][swift-java] Load config from module swift input directory: \(inputSwift)")
-        config = try readConfiguration(sourceDir: inputSwift)
+        earlyConfig = try readConfiguration(sourceDir: inputSwift)
       }
+      var config = earlyConfig ?? Configuration()
 
       config.logLevel = self.logLevel
       if let javaPackage {
         config.javaPackage = javaPackage
       }
-      assert(config.javaPackage != nil, "java-package was nil!")
 
       // Determine the mode in which we'll execute.
       let toolMode: ToolMode
@@ -461,7 +464,10 @@ extension SwiftJava {
       return (false, .init())
     case .amend:
       let configPath = actualOutputDirectory
-      return (true, try readConfiguration(sourceDir: configPath.path))
+      guard let config = try readConfiguration(sourceDir: configPath.path) else {
+        return (false, .init())
+      }
+      return (true, config)
     }
   }
 }