config: log-level should encode as string

Author: ktoso

Samples/SwiftJavaExtractFFMSampleApp/Sources/MySwiftLibrary/LibrarySubDirectory/SwiftTypeInSubDirectory.swift

@@ -1,3 +1,4 @@
 {
-  "javaPackage": "com.example.swift"
+  "javaPackage": "com.example.swift",
+  "logLevel": "trace"
 }

Samples/SwiftJavaExtractFFMSampleApp/Sources/MySwiftLibrary/swift-java.config

@@ -0,0 +1,71 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+package com.example.swift;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.swift.swiftkit.core.SwiftLibraries;
+import org.swift.swiftkit.ffm.AllocatingSwiftArena;
+
+import java.io.File;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class MySwiftClassTest {
+
+    void checkPaths(Throwable throwable) {
+        var paths = SwiftLibraries.getJavaLibraryPath().split(":");
+        for (var path : paths) {
+            Stream.of(new File(path).listFiles())
+                    .filter(file -> !file.isDirectory())
+                    .forEach((file) -> {
+                        System.out.println("  - " + file.getPath());
+                    });
+        }
+
+        throw new RuntimeException(throwable);
+    }
+
+    @Test
+    void test_MySwiftClass_voidMethod() {
+        try(var arena = AllocatingSwiftArena.ofConfined()) {
+            MySwiftClass o = MySwiftClass.init(12, 42, arena);
+            o.voidMethod();
+        } catch (Throwable throwable) {
+            checkPaths(throwable);
+        }
+    }
+
+    @Test
+    void test_MySwiftClass_makeIntMethod() {
+        try(var arena = AllocatingSwiftArena.ofConfined()) {
+            MySwiftClass o = MySwiftClass.init(12, 42, arena);
+            var got = o.makeIntMethod();
+            assertEquals(12, got);
+        }
+    }
+
+    @Test
+    @Disabled // TODO: Need var mangled names in interfaces
+    void test_MySwiftClass_property_len() {
+        try(var arena = AllocatingSwiftArena.ofConfined()) {
+            MySwiftClass o = MySwiftClass.init(12, 42, arena);
+            var got = o.getLen();
+            assertEquals(12, got);
+        }
+    }
+
+}

Samples/SwiftJavaExtractFFMSampleApp/src/test/java/com/example/swift/SwiftTypeInSubDirectoryTest.java

@@ -1,5 +1,5 @@
 {
   "javaPackage": "com.example.swift",
   "mode": "jni",
-  "logLevel": ["debug"]
+  "logLevel": "debug"
 }

Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/swift-java.config

@@ -183,7 +183,10 @@ public func readConfiguration(string: String, configPath: URL?, file: String = #
     decoder.allowsJSON5 = true
     return try decoder.decode(Configuration.self, from: configData)
   } catch {
-    throw ConfigurationError(message: "Failed to parse SwiftJava configuration at '\(configPath.map({ $0.absoluteURL.description }) ?? "<no-path>")'! \(#fileID):\(#line)", error: error,
+    throw ConfigurationError(
+      message: "Failed to parse SwiftJava configuration at '\(configPath.map({ $0.absoluteURL.description }) ?? "<no-path>")'! \(#fileID):\(#line)", 
+      error: error,
+      text: string,
       file: file, line: line)
   }
 }
@@ -276,31 +279,37 @@ extension Configuration {
 public struct ConfigurationError: Error {
   let message: String
   let error: any Error
+  let text: String?
 
   let file: String
   let line: UInt
 
-  init(message: String, error: any Error, file: String = #fileID, line: UInt = #line) {
+  init(message: String, error: any Error, text: String?, file: String = #fileID, line: UInt = #line) {
     self.message = message
     self.error = error
+    self.text = text
     self.file = file
     self.line = line
   }
 }
 
-public enum LogLevel: String, Codable, Hashable {
+public enum LogLevel: String, ExpressibleByStringLiteral, Codable, Hashable {
   case trace = "trace"
   case debug = "debug"
   case info = "info"
   case notice = "notice"
   case warning = "warning"
   case error = "error"
   case critical = "critical"
+  
+  public init(stringLiteral value: String) {
+    self = LogLevel(rawValue: value) ?? .info
+  }
 }
 
 extension LogLevel {
   public init(from decoder: any Decoder) throws {
-    var container = try decoder.unkeyedContainer()
+    var container = try decoder.singleValueContainer()
     let string = try container.decode(String.self)
     switch string {
     case "trace": self = .trace