print methods and initializers

Author: madsodgaard

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

@@ -53,4 +53,23 @@ void takeCombinedGenericProtocol() {
             assertEquals(15, MySwiftLibrary.takeCombinedGenericProtocol(proto1));
         }
     }
+
+    @Test
+    void protocolVariables() {
+        try (var arena = SwiftArena.ofConfined()) {
+            ProtocolA proto1 = ConcreteProtocolAB.init(10, 5, arena);
+            assertEquals(10, proto1.getConstantA());
+            assertEquals(0, proto1.getMutable());
+            proto1.setMutable(3);
+            assertEquals(3, proto1.getMutable());
+        }
+    }
+
+    @Test
+    void protocolMethod() {
+        try (var arena = SwiftArena.ofConfined()) {
+            ProtocolA proto1 = ConcreteProtocolAB.init(10, 5, arena);
+            assertEquals("ConcreteProtocolAB", proto1.name());
+        }
+    }
 }

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift

@@ -113,6 +113,16 @@ extension JNISwift2JavaGenerator {
   private func printProtocol(_ printer: inout CodePrinter, _ decl: ImportedNominalType) {
     let extends = ["JNISwiftInstance"]
     printer.printBraceBlock("public interface \(decl.swiftNominal.name) extends \(extends.joined(separator: ", "))") { printer in
+      for initializer in decl.initializers {
+        printFunctionDowncallMethods(&printer, initializer, signaturesOnly: true)
+        printer.println()
+      }
+
+      for method in decl.methods {
+        printFunctionDowncallMethods(&printer, method, signaturesOnly: true)
+        printer.println()
+      }
+
       for variable in decl.variables {
         printFunctionDowncallMethods(&printer, variable, signaturesOnly: true)
         printer.println()
@@ -135,9 +145,6 @@ extension JNISwift2JavaGenerator {
         """
       )
 
-      let p1: UnsafeMutableRawPointer!
-      let ex = UnsafeMutablePointer<(any Equatable)>.allocate(capacity: 1)
-
       printer.print(
         """
         /**
@@ -429,8 +436,10 @@ extension JNISwift2JavaGenerator {
     }
       .map { "\($0) extends \($1.compactMap(\.className).joined(separator: " & "))" }
       .joined(separator: ", ")
-    let genericsStr = generics.isEmpty ? "" : "<" + generics + ">"
-    modifiers.append(genericsStr)
+
+    if !generics.isEmpty {
+      modifiers.append("<" + generics + ">")
+    }
 
     var annotationsStr = translatedSignature.annotations.map({ $0.render() }).joined(separator: "\n")
     if !annotationsStr.isEmpty { annotationsStr += "\n" }