Upgrade guice 7.0

gradle/dependencies.gradle

@@ -23,7 +23,7 @@ ext {
     dropwizardMetrics: "4.2.21",
     groovy           : "3.0.9", // Gradle 7.4 uses Groovy 3.0.9
     guava            : "31.1-jre",
-    guice            : "5.1.0",
+    guice            : "7.0.0",
     jackson          : "2.13.3",
     javassist        : "3.29.0-GA",
     log4j            : "2.17.2",

ratpack-core/src/main/java/ratpack/core/server/RatpackServerSpec.java

@@ -113,7 +113,7 @@ default RatpackServerSpec serverConfig(Action<? super ServerConfigBuilder> actio
    * import ratpack.core.handling.Handler;
    * import ratpack.test.embed.EmbeddedApp;
    *
-   * import javax.inject.Inject;
+   * import jakarta.inject.Inject;
    *
    * import static org.junit.jupiter.api.Assertions.assertEquals;
    *

ratpack-core/src/main/java/ratpack/core/service/Service.java

@@ -147,7 +147,7 @@
  * import ratpack.core.service.StopEvent;
  * import ratpack.guice.Guice;
  * import ratpack.func.Types;
- * import javax.inject.Inject;
+ * import jakarta.inject.Inject;
  *
  * import java.util.List;
  * import java.util.LinkedList;

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/DropwizardMetricsModule.java

@@ -25,7 +25,7 @@
 import com.codahale.metrics.jvm.MemoryUsageGaugeSet;
 import com.codahale.metrics.jvm.ThreadStatesGaugeSet;
 import com.google.inject.Injector;
-import com.google.inject.Provider;
+import jakarta.inject.Provider;
 import com.google.inject.matcher.Matchers;
 import com.google.inject.multibindings.Multibinder;
 import io.netty.buffer.ByteBufAllocator;
@@ -43,7 +43,7 @@
 import ratpack.core.service.StartEvent;
 import ratpack.core.service.StopEvent;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import java.util.ArrayList;
 import java.util.Collections;

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/AbstractReporterProvider.java

@@ -18,7 +18,7 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Reporter;
-import com.google.inject.Provider;
+import jakarta.inject.Provider;
 import ratpack.dropwizard.metrics.DropwizardMetricsConfig;
 import ratpack.dropwizard.metrics.ReporterConfigSupport;
 

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/BlockingExecTimingInterceptorProvider.java

@@ -20,8 +20,8 @@
 import ratpack.dropwizard.metrics.BlockingExecTimingInterceptor;
 import ratpack.dropwizard.metrics.DropwizardMetricsConfig;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 /**
  * Provide a timer for blocking executions.

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/ConsoleReporterProvider.java

@@ -21,7 +21,7 @@
 import ratpack.dropwizard.metrics.ConsoleConfig;
 import ratpack.dropwizard.metrics.DropwizardMetricsConfig;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * A Provider implementation that sets up a {@link ConsoleReporter} for a {@link MetricRegistry}.

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/CsvReporterProvider.java

@@ -20,7 +20,7 @@
 import ratpack.dropwizard.metrics.CsvConfig;
 import ratpack.dropwizard.metrics.DropwizardMetricsConfig;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * A Provider implementation that sets up a {@link CsvReporter} for a {@link MetricRegistry}.

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/GaugeTypeListener.java

@@ -25,7 +25,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.lang.reflect.Method;
 
 /**

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/GraphiteReporterProvider.java

@@ -21,7 +21,7 @@
 import ratpack.dropwizard.metrics.DropwizardMetricsConfig;
 import ratpack.dropwizard.metrics.GraphiteConfig;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * A Provider implementation that sets up a {@link GraphiteReporter} for a {@link MetricRegistry}.

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/JmxReporterProvider.java

@@ -22,7 +22,7 @@
 import ratpack.dropwizard.metrics.DropwizardMetricsConfig;
 import ratpack.dropwizard.metrics.JmxConfig;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * A Provider implementation that sets up a {@link JmxReporter} for a {@link MetricRegistry}.

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/MeteredMethodInterceptor.java

@@ -21,7 +21,7 @@
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.lang.reflect.Method;
 
 /**

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/MetricRegistryPeriodicPublisher.java

@@ -21,7 +21,7 @@
 import ratpack.exec.ExecController;
 import ratpack.exec.stream.internal.PeriodicPublisher;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.time.Duration;
 
 public class MetricRegistryPeriodicPublisher extends PeriodicPublisher<MetricRegistry> {

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/MetricsBroadcaster.java

@@ -19,7 +19,7 @@
 import com.codahale.metrics.MetricRegistry;
 import ratpack.exec.stream.internal.MulticastPublisher;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * A message broadcaster for sending metrics to its subscribers.

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/RequestTimingHandlerProvider.java

@@ -21,8 +21,8 @@
 import ratpack.dropwizard.metrics.RequestTimingHandler;
 import ratpack.core.handling.Context;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 /**
  * Provide an instance of a request timing handler.

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/Slf4jReporterProvider.java

@@ -20,7 +20,7 @@
 import ratpack.dropwizard.metrics.DropwizardMetricsConfig;
 import ratpack.dropwizard.metrics.Slf4jConfig;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * A Provider implementation that sets up a {@link Slf4jReporter} for a {@link MetricRegistry}.

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/TimedMethodInterceptor.java

@@ -23,7 +23,7 @@
 import org.aopalliance.intercept.MethodInvocation;
 import ratpack.exec.Promise;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;
 

ratpack-exec/src/main/java/ratpack/exec/registry/internal/CachingBackedRegistry.java

@@ -68,9 +68,7 @@ protected <O> Iterable<O> transformToInstances(Iterable<? extends Supplier<O>> s
   }
 
   protected <T> Iterable<? extends Supplier<T>> getSuppliers(TypeToken<T> type) {
-    Iterable<? extends Supplier<?>> suppliers = compute(supplierCache, type, t ->
-        registryBacking.provide(type)
-    );
+    Iterable<? extends Supplier<?>> suppliers = compute(supplierCache, type, t -> registryBacking.provide(type));
     return Types.cast(suppliers);
   }
 

ratpack-groovy/src/main/java/ratpack/groovy/sql/SqlProvider.java

@@ -18,8 +18,8 @@
 
 import groovy.sql.Sql;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 import javax.sql.DataSource;
 
 public class SqlProvider implements Provider<Sql> {

ratpack-groovy/src/main/java/ratpack/groovy/template/MarkupTemplateModule.java

@@ -25,7 +25,7 @@
 import ratpack.core.render.Renderer;
 import ratpack.core.server.ServerConfig;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.nio.file.Path;
 
 /**

ratpack-groovy/src/main/java/ratpack/groovy/template/internal/MarkupTemplateRenderer.java

@@ -27,7 +27,7 @@
 import ratpack.core.handling.Context;
 import ratpack.core.render.RendererSupport;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;

ratpack-groovy/src/main/java/ratpack/groovy/template/internal/TextTemplateRenderer.java

@@ -21,7 +21,7 @@
 import ratpack.core.handling.Context;
 import ratpack.core.render.RendererSupport;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class TextTemplateRenderer extends RendererSupport<TextTemplate> {
 

ratpack-groovy/src/main/java/ratpack/groovy/template/internal/TextTemplateRenderingEngine.java

@@ -22,7 +22,7 @@
 import ratpack.config.FileSystemBinding;
 import ratpack.groovy.script.internal.ScriptEngine;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;

ratpack-groovy/src/test/groovy/ratpack/groovy/handling/GroovyScriptAppSpec.groovy

@@ -303,7 +303,7 @@ class GroovyScriptAppSpec extends RatpackGroovyScriptAppSpec {
       import ratpack.groovy.Groovy.Ratpack
 
       import org.slf4j.*
-      import javax.inject.Inject
+      import jakarta.inject.Inject
       import groovy.util.logging.*
 
       final Logger log = LoggerFactory.getLogger(Ratpack)

ratpack-guice/src/main/java/ratpack/guice/BindingsSpec.java

@@ -19,7 +19,7 @@
 import com.google.common.reflect.TypeToken;
 import com.google.inject.Binder;
 import com.google.inject.Module;
-import com.google.inject.Provider;
+import jakarta.inject.Provider;
 import com.google.inject.TypeLiteral;
 import com.google.inject.multibindings.Multibinder;
 import ratpack.func.Action;

ratpack-guice/src/main/java/ratpack/guice/ConfigurableModule.java

@@ -22,14 +22,14 @@
 import com.google.common.reflect.TypeToken;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
+import jakarta.inject.Singleton;
 import ratpack.config.ConfigObject;
-import ratpack.func.Action;
-import ratpack.func.Factory;
 import ratpack.core.server.ServerConfig;
+import ratpack.func.Action;
 import ratpack.func.Exceptions;
+import ratpack.func.Factory;
 import ratpack.func.Types;
 
-import javax.inject.Singleton;
 import java.lang.reflect.Constructor;
 
 /**

ratpack-guice/src/main/java/ratpack/guice/Guice.java

@@ -64,8 +64,8 @@
  * import ratpack.core.handling.Handler;
  * import ratpack.test.embed.EmbeddedApp;
  *
- * import javax.inject.Inject;
- * import javax.inject.Singleton;
+ * import jakarta.inject.Inject;
+ * import jakarta.inject.Singleton;
  *
  * import static org.junit.jupiter.api.Assertions.*;
  *

ratpack-guice/src/main/java/ratpack/guice/internal/GuiceUtil.java

@@ -18,11 +18,15 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.reflect.TypeToken;
-import com.google.inject.*;
+import com.google.inject.Binding;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.TypeLiteral;
+import jakarta.inject.Provider;
 import ratpack.func.Action;
 import ratpack.func.Function;
-import ratpack.func.internal.TypeCaching;
 import ratpack.func.Types;
+import ratpack.func.internal.TypeCaching;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentMap;

ratpack-guice/src/main/java/ratpack/guice/internal/InjectorRegistryBacking.java

@@ -21,7 +21,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.reflect.TypeToken;
 import com.google.inject.Injector;
-import com.google.inject.Provider;
+import jakarta.inject.Provider;
 import ratpack.exec.registry.RegistryBacking;
 
 public class InjectorRegistryBacking implements RegistryBacking {

ratpack-guice/src/main/java/ratpack/guice/internal/RatpackBaseRegistryModule.java

@@ -20,27 +20,20 @@
 import com.google.common.collect.Iterables;
 import com.google.common.reflect.TypeToken;
 import com.google.inject.*;
-import com.google.inject.matcher.AbstractMatcher;
+import com.google.inject.matcher.Matcher;
 import com.google.inject.matcher.Matchers;
 import io.netty.buffer.ByteBufAllocator;
 import org.aopalliance.intercept.MethodInterceptor;
-import ratpack.exec.api.Blocks;
+import ratpack.config.FileSystemBinding;
 import ratpack.core.error.ClientErrorHandler;
 import ratpack.core.error.ServerErrorHandler;
-import ratpack.exec.ExecController;
-import ratpack.exec.ExecInitializer;
-import ratpack.exec.Execution;
-import ratpack.config.FileSystemBinding;
 import ratpack.core.file.MimeTypes;
 import ratpack.core.file.internal.FileRenderer;
 import ratpack.core.form.internal.FormParser;
-import ratpack.guice.ExecutionScoped;
-import ratpack.guice.RequestScoped;
 import ratpack.core.handling.Redirector;
 import ratpack.core.http.Request;
 import ratpack.core.http.Response;
 import ratpack.core.http.client.HttpClient;
-import ratpack.exec.registry.Registry;
 import ratpack.core.render.internal.CharSequenceRenderer;
 import ratpack.core.render.internal.PromiseRenderer;
 import ratpack.core.render.internal.PublisherRenderer;
@@ -49,6 +42,13 @@
 import ratpack.core.server.RatpackServer;
 import ratpack.core.server.ServerConfig;
 import ratpack.core.sse.client.ServerSentEventClient;
+import ratpack.exec.ExecController;
+import ratpack.exec.ExecInitializer;
+import ratpack.exec.Execution;
+import ratpack.exec.api.Blocks;
+import ratpack.exec.registry.Registry;
+import ratpack.guice.ExecutionScoped;
+import ratpack.guice.RequestScoped;
 
 import java.lang.reflect.Method;
 import java.util.List;
@@ -169,7 +169,7 @@ public <T> void doAdd(Execution execution, Key<T> key) {
     }
   }
 
-  private static class NotGroovyMethodMatcher extends AbstractMatcher<Method> {
+  private static class NotGroovyMethodMatcher implements Matcher<Method> {
     @Override
     public boolean matches(Method method) {
       return !method.isSynthetic();

ratpack-guice/src/test/groovy/ratpack/guice/BindingsSpecSpec.groovy

@@ -19,7 +19,7 @@ package ratpack.guice
 import com.google.inject.AbstractModule
 import ratpack.test.internal.RatpackGroovyDslSpec
 
-import javax.inject.Provider
+import jakarta.inject.Provider
 
 class BindingsSpecSpec extends RatpackGroovyDslSpec {
 

ratpack-guice/src/test/groovy/ratpack/guice/GuiceLifecycleEventSpec.groovy

@@ -20,7 +20,7 @@ import ratpack.core.service.Service
 import ratpack.core.service.StartEvent
 import ratpack.test.internal.RatpackGroovyDslSpec
 
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 class GuiceLifecycleEventSpec extends RatpackGroovyDslSpec {