panama-backend - basic integration with jextract

.github/workflows/ci.yml

@@ -215,6 +215,7 @@ jobs:
 
     - name: Test Dart
       run: cargo make test-dart
+
   test-kotlin:
     runs-on: ubuntu-latest
     steps:
@@ -231,3 +232,43 @@ jobs:
       uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
     - name: Test Kotlin
       run: cargo make test-kotlin
+
+  test-java:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install cargo-make
+      uses: taiki-e/install-action@cargo-make
+    - name: Set up JDK 22 for x64
+      uses: actions/setup-java@v4
+      with:
+        java-version: '22'
+        distribution: 'temurin'
+        architecture: x64
+        cache: maven
+    - name: Test Java
+      run: cargo make test-java
+
+  test-java-gen:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install cargo-make
+      uses: taiki-e/install-action@cargo-make
+    - name: Install curl
+      run: sudo apt-get update && sudo apt-get install -y curl
+    - name: Set up JDK 22 for x64
+      uses: actions/setup-java@v4
+      with:
+        java-version: '22'
+        distribution: 'temurin'
+        architecture: x64
+        cache: maven
+    - name: get jextract
+      run: curl -o /opt/jextract.tgz https://download.java.net/java/early_access/jextract/22/5/openjdk-22-jextract+5-33_linux-x64_bin.tar.gz
+    - name: config jextract
+      run: tar -xzf /opt/jextract.tgz -C /opt/
+    - name: Add jextract to path
+      run: echo "/opt/jextract-22/bin" >> $GITHUB_PATH
+    - name: Run generated java
+      run: cargo make gen-java

Makefile.toml

@@ -75,6 +75,12 @@ dependencies = [
     "test-kotlin-feature",
 ]
 
+[tasks.test-java]
+category = "Tests"
+dependencies = [
+    "test-java-feature",
+]
+
 [tasks.test-example]
 category = "Tests"
 dependencies = [
@@ -93,6 +99,7 @@ dependencies = [
     "test-demo-feature",
     "test-dart-feature",
     "test-kotlin-feature",
+    "test-java-feature",
 ]
 
 [tasks.test-cpp-example]
@@ -214,6 +221,23 @@ cd feature_tests/kotlin/somelib
 exec --fail-on-error gradle test  --warning-mode all 
 '''
 
+[tasks.test-java-feature.mac]
+env = {"OUT_FILE" = "dylib"}
+
+[tasks.test-java-feature.linux]
+env = {"OUT_FILE" = "so", "LD_LIBRARY_PATH" = "./"}
+
+[tasks.test-java-feature]
+category = "Tests"
+script_runner = "@duckscript"
+dependencies = ["build-feature"]
+script = '''
+exit_on_error true
+cp target/debug/libdiplomat_feature_tests.${OUT_FILE} feature_tests/java/somelib/libsomelib.${OUT_FILE}
+cd feature_tests/java/somelib
+exec --fail-on-error mvn test 
+'''
+
 [tasks.check-c-example]
 category = "Tests"
 script_runner = "@duckscript"
@@ -372,13 +396,20 @@ dependencies = [
     "gen-dart-feature",
     "gen-dart-example",
 ]
+
 [tasks.gen-kotlin]
 category = "Code generation"
 dependencies = [
     "gen-kotlin-feature",
     "gen-kotlin-example",
 ]
 
+[tasks.gen-java]
+category = "Code generation"
+dependencies = [
+    "gen-java-feature",
+]
+
 
 
 
@@ -473,6 +504,14 @@ exit_on_error true
 generate_generic example dart lib/src
 '''
 
+[tasks.gen-java-feature]
+category = "Code generation"
+script_runner = "@duckscript"
+script = '''
+exit_on_error true
+!include_files ./support/functions.ds
+generate_generic feature_tests java somelib "-l diplomat-java-conf.toml" /src/main/java
+'''
 # this task generates all of the kotlin code but does not copy generated project files over 
 # we only copy the generated main src files to preserve the tests
 [tasks.gen-kotlin-feature]

core/src/ast/types.rs

@@ -416,6 +416,7 @@ pub enum StdlibOrDiplomat {
 }
 
 /// A local type reference, such as the type of a field, parameter, or return value.
+///
 /// Unlike [`CustomType`], which represents a type declaration, [`TypeName`]s can compose
 /// types through references and boxing, and can also capture unresolved paths.
 #[derive(Clone, PartialEq, Eq, Hash, Serialize, Deserialize, Debug)]

feature_tests/diplomat-java-conf.toml

@@ -0,0 +1,2 @@
+domain = "dev.diplomattest"
+lib_name = "somelib"

feature_tests/java/somelib/.gitignore

@@ -0,0 +1,45 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+.idea/encodings.xml
+.idea/misc.xml
+.idea/vcs.xml
+.idea/codeStyles
+.idea/**
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
+
+libsomelib.dylib

feature_tests/java/somelib/pom.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>dev.diplomattest.somelib</groupId>
+    <artifactId>somelib</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>22</maven.compiler.source>
+        <maven.compiler.target>22</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>5.14.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.10.3</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>1.37</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-generator-annprocess</artifactId>
+            <version>1.37</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit47</artifactId>
+            <version>3.5.0</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.5.0</version>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

feature_tests/java/somelib/src/jmh/java/dev/diplomattest/somelib/OpaqueBench.java

@@ -0,0 +1,28 @@
+package dev.diplomattest.somelib;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.infra.Blackhole;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+public class OpaqueBench {
+    @Benchmark
+    public static void benchOpaque(Blackhole bh) {
+        var opaque = Opaque.fromStr("it's amazing to be here");
+        bh.consume(opaque);
+        // opaque.destroy();
+    }
+
+    public static void main(String[] args) throws RunnerException {
+        Options opt = new OptionsBuilder()
+                .include(OpaqueBench.class.getSimpleName())
+                .warmupIterations(2)
+                .measurementIterations(2)
+                .forks(1)
+                .build();
+
+        new Runner(opt).run();
+    }
+}