Uncap Dagger version (#2721)

The latest version of Dagger (2.55) now supports jakarta.inject.
2026-08-15 11:46:08 +00:00 · 2025-03-17 14:51:04 +00:00
parent 50260dca5f
commit 2d82646421
358 changed files with 510 additions and 506 deletions
@@ -31,8 +31,8 @@ import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.handler.ssl.OpenSsl;
 import io.netty.handler.ssl.SslProvider;
+import jakarta.inject.Singleton;
 import java.util.Set;
-import javax.inject.Singleton;
 import org.joda.time.Duration;

 /**
@@ -35,13 +35,13 @@ import io.netty.channel.local.LocalAddress;
 import io.netty.util.AttributeKey;
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.Timer;
+import jakarta.inject.Provider;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.net.UnknownHostException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
-import javax.inject.Provider;
 import org.joda.time.Duration;

 /**
@@ -203,11 +203,11 @@ public abstract class ProbingAction implements Callable<ChannelFuture> {
  public final String toString() {
    return String.format(
        """
-            ProbingAction with delay: %d
-            outboundMessage: %s
-            protocol: %s
-            host: %s
-            """,
+        ProbingAction with delay: %d
+        outboundMessage: %s
+        protocol: %s
+        host: %s
+        """,
        delay().getStandardSeconds(), outboundMessage(), protocol(), host());
  }

@@ -18,7 +18,7 @@ import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import io.netty.channel.ChannelHandler;
 import io.netty.util.AttributeKey;
-import javax.inject.Provider;
+import jakarta.inject.Provider;

 /** {@link AutoValue} class that stores all unchanged variables necessary for type of connection. */
@AutoValue
@@ -19,7 +19,7 @@ import google.registry.monitoring.blackbox.exception.UndeterminedStateException;
 import google.registry.monitoring.blackbox.message.EppResponseMessage;
 import google.registry.monitoring.blackbox.message.InboundMessageType;
 import io.netty.channel.ChannelHandlerContext;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 /**
 * Subclass of {@link ActionHandler} that deals with the Epp Sequence
@@ -23,8 +23,8 @@ import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPromise;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;

 /**
 * {@link io.netty.channel.ChannelHandler} that converts inbound {@link ByteBuf} to custom type
@@ -30,11 +30,11 @@ import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.HttpResponseStatus;
+import jakarta.inject.Inject;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import javax.inject.Inject;
 import org.joda.time.Duration;

 /**
@@ -21,7 +21,7 @@ import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPromise;
 import io.netty.handler.codec.http.FullHttpResponse;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 /**
 * {@link io.netty.channel.ChannelHandler} that converts inbound {@link FullHttpResponse} to custom
@@ -19,8 +19,8 @@ import io.netty.handler.codec.http.DefaultFullHttpRequest;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpVersion;
+import jakarta.inject.Inject;
 import java.util.Arrays;
-import javax.inject.Inject;

 /**
 * {@link OutboundMessageType} subtype that acts identically to {@link DefaultFullHttpRequest}.
@@ -21,8 +21,8 @@ import com.google.monitoring.metrics.IncrementableMetric;
 import com.google.monitoring.metrics.LabelDescriptor;
 import com.google.monitoring.metrics.MetricRegistryImpl;
 import google.registry.util.NonFinalForTesting;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

 /** Metrics collection instrumentation. */
@Singleton
@@ -21,6 +21,9 @@ import static google.registry.util.ResourceUtils.readResourceUtf8;
 import com.google.common.collect.ImmutableList;
 import dagger.Module;
 import dagger.Provides;
+import jakarta.inject.Provider;
+import jakarta.inject.Qualifier;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
@@ -29,9 +32,6 @@ import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-import javax.inject.Provider;
-import javax.inject.Qualifier;
-import javax.inject.Singleton;
 import org.joda.time.Duration;

 /**
@@ -46,13 +46,13 @@ import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
 import io.netty.handler.codec.LengthFieldPrepender;
 import io.netty.handler.ssl.SslProvider;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+import jakarta.inject.Qualifier;
+import jakarta.inject.Singleton;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
 import java.util.function.Supplier;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Qualifier;
-import javax.inject.Singleton;
 import org.joda.time.Duration;

 /**
@@ -40,9 +40,9 @@ import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.handler.codec.http.HttpClientCodec;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.ssl.SslProvider;
-import javax.inject.Provider;
-import javax.inject.Qualifier;
-import javax.inject.Singleton;
+import jakarta.inject.Provider;
+import jakarta.inject.Qualifier;
+import jakarta.inject.Singleton;
 import org.joda.time.Duration;

 /**
@@ -19,9 +19,9 @@ import google.registry.monitoring.blackbox.exception.UndeterminedStateException;
 import google.registry.monitoring.blackbox.message.EppRequestMessage;
 import google.registry.monitoring.blackbox.message.OutboundMessageType;
 import io.netty.channel.Channel;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.inject.Inject;
-import javax.inject.Named;

 /** {@link Token} subtype that deals performs specified actions for the EPP sequence. */
 public abstract class EppToken extends Token {
@@ -23,7 +23,7 @@ import com.google.common.collect.PeekingIterator;
 import google.registry.monitoring.blackbox.exception.UndeterminedStateException;
 import google.registry.monitoring.blackbox.message.OutboundMessageType;
 import google.registry.monitoring.blackbox.module.WebWhoisModule.WebWhoisProtocol;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 /**
 * {@link Token} subtype designed for WebWhois sequence.
@@ -37,7 +37,7 @@ import io.netty.channel.local.LocalChannel;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.handler.codec.http.FullHttpResponse;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import org.junit.jupiter.api.Test;

 /**