Merge pull request #61 from cryptomator/feature/jdk-22

 Update project to JDK 22 and JEP 454

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 22
           distribution: 'zulu'
           cache: 'maven'
       - name: Setup fuse
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 22
           distribution: 'zulu'
           cache: 'maven'
       - name: Setup fuse
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 22
           distribution: 'zulu'
           cache: 'maven'
       - name: Setup fuse
@@ -83,7 +83,7 @@ jobs:
            fetch-depth: 0
       - uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 22
           distribution: 'zulu'
           cache: 'maven'
       - name: Cache SonarCloud packages

.github/workflows/publish-central.yml

@@ -15,7 +15,7 @@ jobs:
           ref: "refs/tags/${{ github.event.inputs.tag }}"
       - uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 22
           distribution: 'zulu'
           cache: 'maven'
           server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml

.github/workflows/publish-github.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 21
+          java-version: 22
           distribution: 'zulu'
           cache: 'maven'
           gpg-private-key: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }} # Value of the GPG private key to import

README.md

@@ -6,12 +6,12 @@
 
 # jFUSE
 
-Zero-Dependency Java bindings for FUSE using [JEP 442](https://openjdk.org/jeps/442).
+Zero-Dependency Java bindings for FUSE using [JEP 454](https://openjdk.org/jeps/454).
 
 ## Status
 
-This is currently an experimental library requiring JDK 21. As long as the [Foreign Function & Memory API](https://openjdk.org/jeps/442) is incubating, the required JDK will increase.
-Older JDK versions are *not supported*. Please refer to an older version of this lib, if you  are interested in using it with an older JDK. Older versions will not receive patches or any kind of support, though!
+This lib makes use of the [Foreign Function & Memory API](https://openjdk.org/jeps/454), requiring at least JDK 22.
+Older JDK versions are *not supported*. Please refer to an older version of this lib, if you  are interested in using it with an older JDK (with `--enable-preview`). Older versions will not receive patches or any kind of support, though!
 
 We attempt to support libfuse 3.x on Linux and Windows while also remaining compatible with libfuse 2.x on macOS, leading to some compromises in the API.
 
@@ -97,7 +97,6 @@ During runtime, you will need to add allow native access from platform-specific
 java -p path/to/mods \
   -m com.example.mymodule/com.example.mymodule \
   --enable-native-access=org.cryptomator.jfuse.mac \
-  --enable-preview
 ```
 
 ## Supported Platforms

jfuse-api/src/main/java/org/cryptomator/jfuse/api/util/MemoryUtils.java

@@ -8,7 +8,7 @@ public class MemoryUtils {
 
 	@Nullable
 	public static String toUtf8StringOrNull(MemorySegment string, long offset) {
-		return MemorySegment.NULL.equals(string) ? null : string.getUtf8String(offset);
+		return MemorySegment.NULL.equals(string) ? null : string.getString(offset);
 	}
 
 	@Nullable

jfuse-api/src/test/java/org/cryptomator/jfuse/api/util/MemoryUtilsTest.java

@@ -15,7 +15,7 @@ public class MemoryUtilsTest {
 	void testValidSegmentReturnsString() {
 		try (var arena = Arena.ofConfined()) {
 			var address = arena.allocate(4);
-			address.setUtf8String(0, "abc");
+			address.setString(0, "abc");
 			String result = MemoryUtils.toUtf8StringOrNull(address);
 			Assertions.assertEquals("abc", result);
 		}
@@ -26,7 +26,7 @@ void testValidSegmentReturnsString() {
 	void testValidSegmentReturnsStringAtOffset() {
 		try (var arena = Arena.ofConfined()) {
 			var address = arena.allocate(10);
-			address.setUtf8String(5, "abc");
+			address.setString(5, "abc");
 			String result = MemoryUtils.toUtf8StringOrNull(address, 5);
 			Assertions.assertEquals("abc", result);
 		}

jfuse-examples/README.md

@@ -2,7 +2,7 @@
 
 Assuming you have built the parent project (`mvn package`), you can run these examples directly from the shell.
 
-These examples require JDK 19 or newer. You may want to adjust paths, such as the `java.library.path`.
+These examples require JDK 22 or newer. You may want to adjust paths, such as the `java.library.path`.
 
 ### Running the hello world example:
 

jfuse-linux-aarch64/pom.xml

@@ -31,7 +31,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
-					<argLine>@{surefire.jacoco.args} -javaagent:${net.bytebuddy:byte-buddy-agent:jar} --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.aarch64</argLine>
+					<argLine>@{surefire.jacoco.args} -javaagent:${net.bytebuddy:byte-buddy-agent:jar} --enable-native-access=org.cryptomator.jfuse.linux.aarch64</argLine>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -81,7 +81,7 @@
 					<plugin>
 						<groupId>io.github.coffeelibs</groupId>
 						<artifactId>jextract-maven-plugin</artifactId>
-						<version>0.3.0</version>
+						<version>0.4.0</version>
 						<configuration>
 							<executable>/Users/sebastian/git/github.com/openjdk/jextract/build/jextract/bin/jextract</executable>
 							<headerSearchPaths>${linux.headerSearchPath}</headerSearchPaths>

jfuse-linux-aarch64/src/main/java/org/cryptomator/jfuse/linux/aarch64/DirFillerImpl.java

@@ -9,17 +9,13 @@
 import java.lang.foreign.MemorySegment;
 import java.util.function.Consumer;
 
-record DirFillerImpl(MemorySegment buf, fuse_fill_dir_t callback, Arena arena) implements DirFiller {
-
-	DirFillerImpl(MemorySegment buf, MemorySegment callback, Arena arena) {
-		this(buf, fuse_fill_dir_t.ofAddress(callback, arena), arena);
-	}
+record DirFillerImpl(MemorySegment buf, MemorySegment callback, Arena arena) implements DirFiller {
 
 	@Override
 	public int fill(String name, Consumer<Stat> statFiller, long offset, int flags) {
 		var statSegment = stat.allocate(arena);
 		statFiller.accept(new StatImpl(statSegment));
-		return callback.apply(buf, arena.allocateUtf8String(name), statSegment, offset, flags);
+		return fuse_fill_dir_t.invoke(callback, buf, arena.allocateFrom(name), statSegment, offset, flags);
 	}
 
 }

jfuse-linux-aarch64/src/main/java/org/cryptomator/jfuse/linux/aarch64/FileInfoImpl.java

@@ -5,7 +5,6 @@
 import org.cryptomator.jfuse.linux.aarch64.extr.fuse3.fuse_file_info;
 import org.jetbrains.annotations.Nullable;
 
-import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 import java.nio.file.StandardOpenOption;
 import java.util.EnumSet;
@@ -24,34 +23,29 @@ record FileInfoImpl(MemorySegment segment) implements FileInfo {
 	private static final int O_DSYNC = fcntl_h.O_DSYNC();
 
 	/**
-	 * Factory method to map native memory to an {@link FileInfo} object
+	 * Null-safe factory method to map native memory to an {@link FileInfo} object
 	 *
 	 * @param address the {@link MemorySegment} representing the starting address
-	 * @param scope   the {@link Arena} in which this object will be alive
 	 * @return an {@link FileInfo} object or {@code null} if {@code address} is a NULL pointer
 	 */
 	@Nullable
-	public static FileInfoImpl of(MemorySegment address, Arena scope) {
-		return MemorySegment.NULL.equals(address) ? null : new FileInfoImpl(address, scope);
-	}
-
-	public FileInfoImpl(MemorySegment address, Arena scope) {
-		this(fuse_file_info.ofAddress(address, scope));
+	public static FileInfoImpl ofNullable(MemorySegment address) {
+		return MemorySegment.NULL.equals(address) ? null : new FileInfoImpl(address);
 	}
 
 	@Override
 	public long getFh() {
-		return fuse_file_info.fh$get(segment);
+		return fuse_file_info.fh(segment);
 	}
 
 	@Override
 	public void setFh(long fh) {
-		fuse_file_info.fh$set(segment, fh);
+		fuse_file_info.fh(segment, fh);
 	}
 
 	@Override
 	public int getFlags() {
-		return fuse_file_info.flags$get(segment);
+		return fuse_file_info.flags(segment);
 	}
 
 	@Override
@@ -91,7 +85,7 @@ public Set<StandardOpenOption> getOpenFlags() {
 
 	@Override
 	public long getLockOwner() {
-		return fuse_file_info.lock_owner$get(segment);
+		return fuse_file_info.lock_owner(segment);
 	}
 
 }

jfuse-linux-aarch64/src/main/java/org/cryptomator/jfuse/linux/aarch64/FuseArgs.java

@@ -11,35 +11,35 @@ record FuseArgs(MemorySegment args, MemorySegment cmdLineOpts) {
 	@Override
 	public String toString() {
 		var sb = new StringBuilder();
-		var argc = fuse_args.argc$get(args);
-		var argv = fuse_args.argv$get(args);
+		var argc = fuse_args.argc(args);
+		var argv = fuse_args.argv(args);
 		for (int i = 0; i < argc; i++) {
 			var cString = argv.getAtIndex(ValueLayout.ADDRESS, i).reinterpret(Long.MAX_VALUE);
-			sb.append("arg[").append(i).append("] = ").append(cString.getUtf8String(0)).append(", ");
+			sb.append("arg[").append(i).append("] = ").append(cString.getString(0)).append(", ");
 		}
-		sb.append("mountPoint = ").append(mountPoint().getUtf8String(0));
-		sb.append("debug = ").append(fuse_cmdline_opts.debug$get(cmdLineOpts));
+		sb.append("mountPoint = ").append(mountPoint().getString(0));
+		sb.append("debug = ").append(fuse_cmdline_opts.debug(cmdLineOpts));
 		sb.append("singlethreaded = ").append(!multithreaded());
 		return sb.toString();
 	}
 
 	public MemorySegment mountPoint() {
-		return fuse_cmdline_opts.mountpoint$get(cmdLineOpts);
+		return fuse_cmdline_opts.mountpoint(cmdLineOpts);
 	}
 
 	public boolean multithreaded() {
-		return fuse_cmdline_opts.singlethread$get(cmdLineOpts) == 0;
+		return fuse_cmdline_opts.singlethread(cmdLineOpts) == 0;
 	}
 
 	public int cloneFd() {
-		return fuse_cmdline_opts.clone_fd$get(cmdLineOpts);
+		return fuse_cmdline_opts.clone_fd(cmdLineOpts);
 	}
 
 	public int maxIdleThreads() {
-		return fuse_cmdline_opts.max_idle_threads$get(cmdLineOpts);
+		return fuse_cmdline_opts.max_idle_threads(cmdLineOpts);
 	}
 
 	public int maxThreads() {
-		return fuse_cmdline_opts.max_threads$get(cmdLineOpts);
+		return fuse_cmdline_opts.max_threads(cmdLineOpts);
 	}
 }