jextract: Support Java BooleanSupplier functional interface

Author: AmrDeveloper

Samples/SwiftAndJavaJarFFMSampleLib/Sources/MySwiftLibrary/MySwiftLibrary.swift

@@ -36,6 +36,10 @@ public func globalCallMeRunnable(run: () -> Void) {
   run()
 }
 
+public func globalCallMeBooleanSupplier(run: () -> Bool) -> Bool {
+  return run()
+}
+
 // ==== Internal helpers
 
 func p(_ msg: String, file: String = #fileID, line: UInt = #line, function: String = #function) {

Samples/SwiftAndJavaJarFFMSampleLib/src/test/java/com/example/swift/MySwiftLibraryTest.java

@@ -54,4 +54,9 @@ public void apply() {
         assertEquals(0, countDownLatch.getCount());
     }
 
+    @Test
+    void call_globalCallMeBooleanSupplier_noThrow() {
+        boolean result = MySwiftLibrary.globalCallMeBooleanSupplier(() -> { return true; });
+        assertEquals(true, result);
+    }
 }

Samples/SwiftJavaExtractFFMSampleApp/Sources/MySwiftLibrary/MySwiftLibrary.swift

@@ -48,6 +48,10 @@ public func globalCallMeRunnable(run: () -> Void) {
   run()
 }
 
+public func globalCallMeBooleanSupplier(run: () -> Bool) -> Bool {
+  return run()
+}
+
 public func globalReceiveRawBuffer(buf: UnsafeRawBufferPointer) -> Int {
   buf.count
 }

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

@@ -73,8 +73,6 @@ void call_globalStringIdentity_empty() {
         assertEquals("", result);
     }
 
-
-
     @Test
     @Disabled("Upcalls not yet implemented in new scheme")
     @SuppressWarnings({"Convert2Lambda", "Convert2MethodRef"})
@@ -148,4 +146,9 @@ void call_globalThrowingString_throws_checkMessage() {
         );
     }
 
+   @Test
+    void call_globalCallMeBooleanSupplier_noThrow() {
+        boolean result = MySwiftLibrary.globalCallMeBooleanSupplier(() -> { return true; });
+        assertEquals(true, result);
+    }
 }

Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/Closures.swift

@@ -20,6 +20,10 @@ public func closureWithInt(input: Int64, closure: (Int64) -> Int64) -> Int64 {
   closure(input)
 }
 
+public func globalCallMeBooleanSupplier(run: () -> Bool) -> Bool {
+  return run()
+}
+
 public func closureMultipleArguments(
   input1: Int64,
   input2: Int64,

Samples/SwiftJavaExtractJNISampleApp/src/test/java/com/example/swift/ClosuresTest.java

@@ -41,4 +41,10 @@ void closureMultipleArguments() {
         long result = MySwiftLibrary.closureMultipleArguments(5, 10, (a, b) -> a + b);
         assertEquals(15, result);
     }
-}
+
+    @Test
+    void globalCallMeBooleanSupplier() {
+        boolean result = MySwiftLibrary.globalCallMeBooleanSupplier(() -> true);
+        assertEquals(true, result);
+    }
+}

Sources/ExampleSwiftLibrary/MySwiftLibrary.swift

@@ -43,6 +43,10 @@ public func globalCallMeRunnable(run: () -> Void) {
   run()
 }
 
+public func globalCallMeBooleanSupplier(run: () -> Bool) -> Bool {
+  return run()
+}
+
 public func globalReceiveRawBuffer(buf: UnsafeRawBufferPointer) -> Int {
   buf.count
 }

Sources/JExtractSwiftLib/JavaTypes/JavaType+JDK.swift

@@ -30,6 +30,11 @@ extension JavaType {
     .class(package: "java.lang", name: "Runnable")
   }
 
+  /// The description of the type java.util.function.BooleanSupplier.
+  static var javaFunctionBooleanSupplier: JavaType {
+    .class(package: "java.util.function", name: "BooleanSupplier")
+  }
+
   /// The description of the type java.lang.Class.
   static var javaLangClass: JavaType {
     .class(package: "java.lang", name: "Class")

Sources/JExtractSwiftLib/KnownFunctionalInterfaces.swift

@@ -29,8 +29,16 @@ struct KnownJavaFunctionalInterface: Sendable {
     result: .void
   )
 
+  static let booleanSupplier = KnownJavaFunctionalInterface(
+    JavaType.javaFunctionBooleanSupplier,
+    method: "getAsBoolean",
+    parameters: [],
+    result: .boolean
+  )
+
   static let all: [KnownJavaFunctionalInterface] = [
-    .runnable
+    .runnable,
+    .booleanSupplier,
   ]
 
   static func find(parameters: [JavaType], result: JavaType) -> KnownJavaFunctionalInterface? {
@@ -59,6 +67,8 @@ struct KnownJavaFunctionalInterface: Sendable {
     return switch (parameters, result) {
     case ([], _) where result.isVoid:
       runnable
+    case ([], _) where result.isBoolean:
+      booleanSupplier
     default:
       nil
     }

Sources/SwiftExtract/SwiftTypes/SwiftType.swift

@@ -98,6 +98,13 @@ public enum SwiftType: Equatable {
     }
   }
 
+  public var isBoolean: Bool {
+    if case let .nominal(nominal) = self {
+      return nominal.nominalTypeDecl.knownTypeKind == .bool
+    }
+    return false
+  }
+
   /// Whether this is a pointer type. I.e 'Unsafe[Mutable][Raw]Pointer'
   public var isPointer: Bool {
     switch self {