Merge pull request #288 from cryptomator/feature/dagger-2.55

Feature: Dagger 2.55

Author: infeo

pom.xml

@@ -20,7 +20,7 @@
 		<!-- dependencies -->
 		<cryptolib.version>2.2.0</cryptolib.version>
 		<jwt.version>4.5.0</jwt.version>
-		<dagger.version>2.51.1</dagger.version>
+		<dagger.version>2.55</dagger.version>
 		<guava.version>33.4.0-jre</guava.version>
 		<caffeine.version>3.2.0</caffeine.version>
 		<slf4j.version>2.0.17</slf4j.version>
@@ -91,6 +91,11 @@
 			<artifactId>dagger</artifactId>
 			<version>${dagger.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.inject</groupId>
+			<artifactId>jakarta.inject-api</artifactId>
+			<version>2.0.1</version>
+		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
@@ -182,6 +187,7 @@
 							<version>${jmh.version}</version>
 						</path>
 					</annotationProcessorPaths>
+					<compilerArgs>-Adagger.useBindingGraphFix=ENABLED</compilerArgs>
 				</configuration>
 			</plugin>
 			<plugin>

src/main/java/module-info.java

@@ -19,6 +19,7 @@
 	// https://github.com/javax-inject/javax-inject/issues/33
 	// May be provided by another lib during runtime
 	requires static javax.inject;
+	requires jakarta.inject;
 	requires java.compiler;
 
 	exports org.cryptomator.cryptofs;

src/main/java/org/cryptomator/cryptofs/CopyOperation.java

@@ -2,8 +2,8 @@
 
 import org.cryptomator.cryptofs.common.ArrayUtils;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.nio.channels.FileChannel;
 import java.nio.file.CopyOption;

src/main/java/org/cryptomator/cryptofs/CryptoFileStore.java

@@ -10,7 +10,7 @@
 
 import org.cryptomator.cryptofs.attr.AttributeViewType;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.nio.file.FileStore;
 import java.nio.file.attribute.FileAttributeView;

src/main/java/org/cryptomator/cryptofs/CryptoFileSystemImpl.java

@@ -22,7 +22,7 @@
 import org.cryptomator.cryptofs.fh.OpenCryptoFiles;
 import org.cryptomator.cryptolib.api.Cryptor;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.nio.channels.FileChannel;
 import java.nio.file.AccessDeniedException;

src/main/java/org/cryptomator/cryptofs/CryptoFileSystemProviderComponent.java

@@ -3,7 +3,7 @@
 import dagger.BindsInstance;
 import dagger.Component;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.security.SecureRandom;
 
 @Singleton

src/main/java/org/cryptomator/cryptofs/CryptoFileSystemScoped.java

@@ -5,7 +5,7 @@
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 
-import javax.inject.Scope;
+import jakarta.inject.Scope;
 
 @Scope
 @Documented

src/main/java/org/cryptomator/cryptofs/CryptoFileSystemStats.java

@@ -4,7 +4,7 @@
 
 import java.util.concurrent.atomic.LongAdder;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * Provides access to file system performance metrics.

src/main/java/org/cryptomator/cryptofs/CryptoFileSystems.java

@@ -9,8 +9,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystemAlreadyExistsException;

src/main/java/org/cryptomator/cryptofs/CryptoPathFactory.java

@@ -2,7 +2,7 @@
 
 import com.google.common.base.Splitter;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.text.Normalizer;
 import java.util.Collections;
 import java.util.stream.Stream;

src/main/java/org/cryptomator/cryptofs/CryptoPathMapper.java

@@ -19,7 +19,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileAlreadyExistsException;

src/main/java/org/cryptomator/cryptofs/DirectoryIdBackup.java

@@ -6,7 +6,7 @@
 import org.cryptomator.cryptolib.common.DecryptingReadableByteChannel;
 import org.cryptomator.cryptolib.common.EncryptingWritableByteChannel;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ByteChannel;

src/main/java/org/cryptomator/cryptofs/DirectoryIdLoader.java

@@ -4,7 +4,7 @@
 import org.cryptomator.cryptofs.event.BrokenDirFileEvent;
 import org.cryptomator.cryptofs.event.FilesystemEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.channels.Channels;

src/main/java/org/cryptomator/cryptofs/DirectoryIdProvider.java

@@ -14,7 +14,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Path;

src/main/java/org/cryptomator/cryptofs/FileNameDecryptor.java

@@ -8,7 +8,7 @@
 import org.cryptomator.cryptolib.api.Cryptor;
 import org.cryptomator.cryptolib.api.FileNameCryptor;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.nio.file.FileSystemException;
 import java.nio.file.NoSuchFileException;

src/main/java/org/cryptomator/cryptofs/GlobToRegexConverter.java

@@ -1,7 +1,7 @@
 package org.cryptomator.cryptofs;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import static org.cryptomator.cryptofs.common.Constants.SEPARATOR;
 

src/main/java/org/cryptomator/cryptofs/LongFileNameProvider.java

@@ -14,7 +14,7 @@
 import com.google.common.io.BaseEncoding;
 import org.cryptomator.cryptolib.common.MessageDigestSupplier;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.ByteBuffer;

src/main/java/org/cryptomator/cryptofs/MoveOperation.java

@@ -2,8 +2,8 @@
 
 import org.cryptomator.cryptofs.common.ArrayUtils;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.nio.file.AtomicMoveNotSupportedException;
 import java.nio.file.CopyOption;

src/main/java/org/cryptomator/cryptofs/PathMatcherFactory.java

@@ -1,7 +1,7 @@
 package org.cryptomator.cryptofs;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.nio.file.PathMatcher;
 import java.util.regex.Pattern;
 

src/main/java/org/cryptomator/cryptofs/PathToVault.java

@@ -5,7 +5,7 @@
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 @Qualifier
 @Documented

src/main/java/org/cryptomator/cryptofs/ReadonlyFlag.java

@@ -3,7 +3,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.nio.file.ReadOnlyFileSystemException;
 
 @CryptoFileSystemScoped

src/main/java/org/cryptomator/cryptofs/Symlinks.java

@@ -4,7 +4,7 @@
 import org.cryptomator.cryptofs.common.Constants;
 import org.cryptomator.cryptofs.fh.OpenCryptoFiles;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;

src/main/java/org/cryptomator/cryptofs/attr/AttributeByNameProvider.java

@@ -12,7 +12,7 @@
 import org.cryptomator.cryptofs.CryptoFileSystemScoped;
 import org.cryptomator.cryptofs.CryptoPath;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.nio.file.LinkOption;
 import java.nio.file.attribute.BasicFileAttributeView;

src/main/java/org/cryptomator/cryptofs/attr/AttributeComponent.java

@@ -4,7 +4,7 @@
 import dagger.Subcomponent;
 import org.cryptomator.cryptofs.common.CiphertextFileType;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
 

src/main/java/org/cryptomator/cryptofs/attr/AttributeModule.java

@@ -8,7 +8,7 @@
 import org.cryptomator.cryptofs.fh.OpenCryptoFiles;
 import org.cryptomator.cryptolib.api.Cryptor;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.DosFileAttributes;

src/main/java/org/cryptomator/cryptofs/attr/AttributeProvider.java

@@ -15,7 +15,7 @@
 import org.cryptomator.cryptofs.common.ArrayUtils;
 import org.cryptomator.cryptofs.common.CiphertextFileType;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;

src/main/java/org/cryptomator/cryptofs/attr/AttributeScoped.java

@@ -1,6 +1,6 @@
 package org.cryptomator.cryptofs.attr;
 
-import javax.inject.Scope;
+import jakarta.inject.Scope;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

src/main/java/org/cryptomator/cryptofs/attr/AttributeViewModule.java

@@ -6,7 +6,7 @@
 import dagger.multibindings.ClassKey;
 import dagger.multibindings.IntoMap;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import java.nio.file.attribute.BasicFileAttributeView;
 import java.nio.file.attribute.DosFileAttributeView;
 import java.nio.file.attribute.FileAttributeView;
@@ -44,12 +44,12 @@ abstract class AttributeViewModule {
 
 	@Provides
 	@AttributeViewScoped
-	public static Optional<FileAttributeView> provideAttributeView(Map<Class<?>, Provider<FileAttributeView>> providers, Class<? extends FileAttributeView> requestedType) {
-		Provider<FileAttributeView> provider = providers.get(requestedType);
-		if (provider == null) {
+	public static Optional<FileAttributeView> provideAttributeView(Map<Class<?>, FileAttributeView> providers, Class<? extends FileAttributeView> requestedType) {
+		var view = providers.get(requestedType);
+		if (view == null) {
 			return Optional.empty();
 		} else {
-			return Optional.of(provider.get());
+			return Optional.of(view);
 		}
 	}
 

src/main/java/org/cryptomator/cryptofs/attr/AttributeViewProvider.java

@@ -13,7 +13,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.nio.file.Files;
 import java.nio.file.LinkOption;
 import java.nio.file.attribute.FileAttributeView;

src/main/java/org/cryptomator/cryptofs/attr/AttributeViewScoped.java

@@ -1,6 +1,6 @@
 package org.cryptomator.cryptofs.attr;
 
-import javax.inject.Scope;
+import jakarta.inject.Scope;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

src/main/java/org/cryptomator/cryptofs/attr/CryptoBasicFileAttributeView.java

@@ -14,7 +14,7 @@
 import org.cryptomator.cryptofs.Symlinks;
 import org.cryptomator.cryptofs.fh.OpenCryptoFiles;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.nio.file.LinkOption;
 import java.nio.file.attribute.BasicFileAttributeView;

src/main/java/org/cryptomator/cryptofs/attr/CryptoDosFileAttributeView.java

@@ -14,7 +14,7 @@
 import org.cryptomator.cryptofs.Symlinks;
 import org.cryptomator.cryptofs.fh.OpenCryptoFiles;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.nio.file.LinkOption;
 import java.nio.file.attribute.DosFileAttributeView;

src/main/java/org/cryptomator/cryptofs/attr/CryptoFileOwnerAttributeView.java

@@ -14,7 +14,7 @@
 import org.cryptomator.cryptofs.Symlinks;
 import org.cryptomator.cryptofs.fh.OpenCryptoFiles;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.nio.file.LinkOption;
 import java.nio.file.attribute.FileOwnerAttributeView;

src/main/java/org/cryptomator/cryptofs/attr/CryptoPosixFileAttributeView.java

@@ -14,7 +14,7 @@
 import org.cryptomator.cryptofs.Symlinks;
 import org.cryptomator.cryptofs.fh.OpenCryptoFiles;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.nio.file.LinkOption;
 import java.nio.file.attribute.GroupPrincipal;

src/main/java/org/cryptomator/cryptofs/ch/ChannelScoped.java

@@ -1,6 +1,6 @@
 package org.cryptomator.cryptofs.ch;
 
-import javax.inject.Scope;
+import jakarta.inject.Scope;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 

src/main/java/org/cryptomator/cryptofs/ch/CleartextFileChannel.java

@@ -16,7 +16,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;

src/main/java/org/cryptomator/cryptofs/common/FinallyUtil.java

@@ -1,7 +1,7 @@
 package org.cryptomator.cryptofs.common;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.stream.Stream;

src/main/java/org/cryptomator/cryptofs/dir/BrokenDirectoryFilter.java

@@ -5,7 +5,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;

src/main/java/org/cryptomator/cryptofs/dir/C9rConflictResolver.java

@@ -13,8 +13,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;