Replace javax.inject -> jakarta.inject

agentgt · agentgt · commit d18f7fcfa607 · 2022-09-16T08:56:08.000-04:00
diff --git a/docs/asciidoc/di-dagger.adoc b/docs/asciidoc/di-dagger.adoc
@@ -134,7 +134,7 @@ fun main(args: Array<String>) {
 <2> Register MVC route provided by Dagger
 
 Due the static nature of Dagger mvc integration identical to normal usage. For custom scopes/lifecycles
-Dagger generate a `javax.inject.Provider` on such use cases you need to switch and use the provider
+Dagger generate a `jakarta.inject.Provider` on such use cases you need to switch and use the provider
 version of the `mvc` method:
 
 .MVC and Dagger provider
diff --git a/docs/asciidoc/modules/guice.adoc b/docs/asciidoc/modules/guice.adoc
@@ -132,4 +132,4 @@ fun main(args: Array<String>) {
 The lifecycle of `MyController` is now managed by Guice. Also:
 
 - In Guice, the default scope is `prototype` (creates a new instance per request)
-- If you prefer a single instance add the `javax.inject.Singleton` annotation
+- If you prefer a single instance add the `jakarta.inject.Singleton` annotation
diff --git a/docs/asciidoc/modules/quartz.adoc b/docs/asciidoc/modules/quartz.adoc
@@ -186,7 +186,7 @@ This other example uses Guice as dependency provider:
 .Guice provisioning
 [source,java]
 ----
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 {
   install(new GuiceModule());
diff --git a/docs/asciidoc/modules/spring.adoc b/docs/asciidoc/modules/spring.adoc
@@ -92,7 +92,7 @@ public class BillingService {
 .Kotlin
 [source,kotlin,role="secondary"]
 ----
-import javax.inject.Inject
+import jakarta.inject.Inject
 import org.springframework.beans.factory.annotation.Value
 
 class BillingService @Inject constructor(@Value("\${currency}") val currency: String) {
diff --git a/docs/asciidoc/modules/weld.adoc b/docs/asciidoc/modules/weld.adoc
@@ -97,7 +97,7 @@ The Weld extension does a bit more in relation to MVC routes:
 automatically registered. No need to register it manually
 
 - The default scope is `prototype` (creates a new instance per request). If you prefer a single 
-instance add the `javax.inject.Singleton` annotation
+instance add the `jakarta.inject.Singleton` annotation
 
 .MVC route
 [source, java, role="primary"]
diff --git a/docs/asciidoc/mvc-api.adoc b/docs/asciidoc/mvc-api.adoc
@@ -183,7 +183,7 @@ one you like most.
 [source, java, role = "primary"]
 ----
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 public class App extends Jooby {
   {
@@ -201,7 +201,7 @@ public class App extends Jooby {
 .Kotlin
 [source, kotlin, role = "secondary"]
 ----
-import javax.inject.Provider
+import jakarta.inject.Provider
 import io.jooby.*
 
 fun main(args: Array<String>) {
@@ -212,7 +212,7 @@ fun main(args: Array<String>) {
 }
 ----
 
-The javadoc:Jooby[mvc, javax.inject.Provider] does the same job, might or might not delegate
+The javadoc:Jooby[mvc, jakarta.inject.Provider] does the same job, might or might not delegate
 instantiation to a dependency injection framework but most important let you control lifecycle of
 MVC routes (Singleton vs Non-Singleton routes).
 
diff --git a/docs/asciidoc/value-api.adoc b/docs/asciidoc/value-api.adoc
@@ -401,14 +401,14 @@ The target `POJO` must follow one of these rules:
 - Has a zero argguments/default constructor, or
 - Has only one constructor
 - Has multiple constructors, but only one is annotated with 
-https://static.javadoc.io/javax.inject/javax.inject/1/javax/inject/Inject.html[Inject]
+https://static.javadoc.io/jakarta.inject/jakarta.inject/1/javax/inject/Inject.html[Inject]
 
 The decoder matches HTTP parameters in the following order:
 
 - As constructor arguments
 - As setter method
 
-HTTP parameter name which are not a valid Java identifier must be annotated with https://static.javadoc.io/javax.inject/javax.inject/1/javax/inject/Named.html[Named]:
+HTTP parameter name which are not a valid Java identifier must be annotated with https://static.javadoc.io/jakarta.inject/jakarta.inject/1/javax/inject/Named.html[Named]:
 
 .Java
 [source, java,role="primary"]
diff --git a/jooby/pom.xml b/jooby/pom.xml
@@ -167,10 +167,10 @@
       <optional>true</optional>
     </dependency>
 
-    <!-- javax.inject -->
+    <!-- jakarta.inject -->
     <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
     </dependency>
 
     <!-- config -->
diff --git a/jooby/src/main/java/io/jooby/Jooby.java b/jooby/src/main/java/io/jooby/Jooby.java
@@ -43,7 +43,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/jooby/src/main/java/io/jooby/MvcFactory.java b/jooby/src/main/java/io/jooby/MvcFactory.java
@@ -6,7 +6,7 @@
 package io.jooby;
 
 import javax.annotation.Nonnull;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 /**
  * Created by a Jooby annotation processor tool using the {@link java.util.ServiceLoader} API.
diff --git a/jooby/src/main/java/io/jooby/Router.java b/jooby/src/main/java/io/jooby/Router.java
@@ -11,7 +11,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/jooby/src/main/java/io/jooby/ServiceRegistry.java b/jooby/src/main/java/io/jooby/ServiceRegistry.java
@@ -9,7 +9,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import java.util.Map;
 import java.util.Set;
 
diff --git a/jooby/src/main/java/io/jooby/annotations/Header.java b/jooby/src/main/java/io/jooby/annotations/Header.java
@@ -5,7 +5,7 @@
  */
 package io.jooby.annotations;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/jooby/src/main/java/io/jooby/internal/ContextAsServiceInitializer.java b/jooby/src/main/java/io/jooby/internal/ContextAsServiceInitializer.java
@@ -9,7 +9,7 @@
 import io.jooby.RequestScope;
 import io.jooby.exception.RegistryException;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import static io.jooby.RequestScope.bind;
 import static io.jooby.RequestScope.unbind;
diff --git a/jooby/src/main/java/io/jooby/internal/RouterImpl.java b/jooby/src/main/java/io/jooby/internal/RouterImpl.java
@@ -31,7 +31,7 @@
 import java.util.stream.Stream;
 
 import javax.annotation.Nonnull;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/jooby/src/main/java/io/jooby/internal/ServiceRegistryImpl.java b/jooby/src/main/java/io/jooby/internal/ServiceRegistryImpl.java
@@ -10,7 +10,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/jooby/src/main/java/io/jooby/internal/converter/ReflectiveBeanConverter.java b/jooby/src/main/java/io/jooby/internal/converter/ReflectiveBeanConverter.java
@@ -24,8 +24,8 @@
 import java.util.function.Consumer;
 
 import javax.annotation.Nonnull;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import io.jooby.BeanConverter;
 import io.jooby.FileUpload;
diff --git a/jooby/src/test/java/io/jooby/ValueToBeanTest.java b/jooby/src/test/java/io/jooby/ValueToBeanTest.java
@@ -4,8 +4,8 @@
 import io.jooby.internal.ValueConverterHelper;
 import org.junit.jupiter.api.Test;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/HandlerCompiler.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/HandlerCompiler.java
@@ -19,7 +19,7 @@
 import org.objectweb.asm.Type;
 
 import javax.annotation.processing.ProcessingEnvironment;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
diff --git a/modules/jooby-apt/src/test/java/io/jooby/apt/MvcModuleCompilerRunner.java b/modules/jooby-apt/src/test/java/io/jooby/apt/MvcModuleCompilerRunner.java
@@ -10,7 +10,7 @@
 import io.jooby.internal.converter.ReflectiveBeanConverter;
 import org.objectweb.asm.util.ASMifier;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import javax.tools.JavaFileObject;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
diff --git a/modules/jooby-apt/src/test/java/output/MvcExtension.java b/modules/jooby-apt/src/test/java/output/MvcExtension.java
@@ -6,7 +6,7 @@
 import source.Controller1527;
 
 import javax.annotation.Nonnull;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 public class MvcExtension implements MvcFactory {
 
diff --git a/modules/jooby-apt/src/test/java/output/MyControllerHandler.java b/modules/jooby-apt/src/test/java/output/MyControllerHandler.java
@@ -1,7 +1,7 @@
 package output;
 
 import javax.annotation.Nonnull;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import io.jooby.Context;
 import io.jooby.Route;
diff --git a/modules/jooby-apt/src/test/java/tests/Expected1786b.java b/modules/jooby-apt/src/test/java/tests/Expected1786b.java
@@ -6,7 +6,7 @@
 import source.Controller1786b;
 
 import javax.annotation.Nonnull;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import java.util.UUID;
 
 public class Expected1786b implements MvcFactory {
diff --git a/modules/jooby-apt/src/test/java/tests/i1807/Expected1807.java b/modules/jooby-apt/src/test/java/tests/i1807/Expected1807.java
@@ -6,7 +6,7 @@
 import source.Controller1786b;
 
 import javax.annotation.Nonnull;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import java.util.UUID;
 
 public class Expected1807 implements MvcFactory {
diff --git a/modules/jooby-apt/src/test/java/tests/i1814/Expected1814.java b/modules/jooby-apt/src/test/java/tests/i1814/Expected1814.java
@@ -5,7 +5,7 @@
 import io.jooby.Route;
 
 import javax.annotation.Nonnull;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 public class Expected1814 implements MvcFactory {
 
diff --git a/modules/jooby-apt/src/test/java/tests/i1859/Expected1859.java b/modules/jooby-apt/src/test/java/tests/i1859/Expected1859.java
@@ -5,7 +5,7 @@
 import io.jooby.Route;
 
 import javax.annotation.Nonnull;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 public class Expected1859 implements MvcFactory {
 
diff --git a/modules/jooby-apt/src/test/java/tests/i2026/Expected2026.java b/modules/jooby-apt/src/test/java/tests/i2026/Expected2026.java
@@ -1,6 +1,6 @@
 package tests.i2026;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import io.jooby.Extension;
 import io.jooby.Jooby;
diff --git a/modules/jooby-apt/src/test/java/tests/i2325/Expected2325.java b/modules/jooby-apt/src/test/java/tests/i2325/Expected2325.java
@@ -1,6 +1,6 @@
 package tests.i2325;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import io.jooby.Extension;
 import io.jooby.Jooby;
diff --git a/modules/jooby-banner/src/main/java/io/jooby/banner/BannerModule.java b/modules/jooby-banner/src/main/java/io/jooby/banner/BannerModule.java
@@ -10,7 +10,7 @@
 import org.slf4j.Logger;
 
 import javax.annotation.Nonnull;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import java.util.Optional;
 
 import static com.github.lalyos.jfiglet.FigletFont.convertOneLine;
diff --git a/modules/jooby-banner/src/test/java/io/jooby/banner/BannerModuleTest.java b/modules/jooby-banner/src/test/java/io/jooby/banner/BannerModuleTest.java
@@ -9,7 +9,7 @@
 import org.mockito.Mockito;
 import org.slf4j.Logger;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import static com.github.lalyos.jfiglet.FigletFont.convertOneLine;
 import static io.jooby.banner.BannerModule.fontPath;
diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml
@@ -56,7 +56,7 @@
   <jakarta.json.bind-api.version>1.0.2</jakarta.json.bind-api.version>
   <jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version>
   <jasypt.version>1.9.3</jasypt.version>
-  <javax.inject.version>1</javax.inject.version>
+  <jakarta.inject.version>1</jakarta.inject.version>
   <jboss-modules.version>1.11.0.Final</jboss-modules.version>
   <jdbi.version>3.32.0</jdbi.version>
   <jetty.version>11.0.11</jetty.version>
@@ -719,9 +719,9 @@
       <type>jar</type>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>${javax.inject.version}</version>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject</artifactId>
+      <version>${jakarta.inject.version}</version>
       <type>jar</type>
     </dependency>
     <dependency>
diff --git a/modules/jooby-commons-email/src/main/java/io/jooby/email/CommonsEmailModule.java b/modules/jooby-commons-email/src/main/java/io/jooby/email/CommonsEmailModule.java
@@ -20,7 +20,7 @@
 import org.apache.commons.mail.SimpleEmail;
 
 import javax.annotation.Nonnull;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import java.util.stream.Stream;
 
 import static java.util.Objects.requireNonNull;
diff --git a/modules/jooby-guice/src/main/java/io/jooby/di/JoobyModule.java b/modules/jooby-guice/src/main/java/io/jooby/di/JoobyModule.java
@@ -19,7 +19,7 @@
 import io.jooby.ServiceRegistry;
 
 import javax.annotation.Nonnull;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.Map;
diff --git a/modules/jooby-hibernate/src/main/java/io/jooby/hibernate/HibernateModule.java b/modules/jooby-hibernate/src/main/java/io/jooby/hibernate/HibernateModule.java
@@ -28,7 +28,7 @@
 import org.hibernate.cfg.AvailableSettings;
 
 import javax.annotation.Nonnull;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
diff --git a/modules/jooby-hibernate/src/main/java/io/jooby/internal/hibernate/SessionServiceProvider.java b/modules/jooby-hibernate/src/main/java/io/jooby/internal/hibernate/SessionServiceProvider.java
@@ -10,7 +10,7 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.context.internal.ManagedSessionContext;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 public class SessionServiceProvider implements Provider<Session> {
   private final SessionFactory sessionFactory;
diff --git a/modules/jooby-hibernate/src/main/java/io/jooby/internal/hibernate/UnitOfWorkProvider.java b/modules/jooby-hibernate/src/main/java/io/jooby/internal/hibernate/UnitOfWorkProvider.java
@@ -12,7 +12,7 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.context.internal.ManagedSessionContext;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 public class UnitOfWorkProvider implements Provider<UnitOfWork> {
 
diff --git a/modules/jooby-jdbi/src/main/java/io/jooby/internal/jdbi/HandleProvider.java b/modules/jooby-jdbi/src/main/java/io/jooby/internal/jdbi/HandleProvider.java
@@ -9,7 +9,7 @@
 import org.jdbi.v3.core.Handle;
 import org.jdbi.v3.core.Jdbi;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 public class HandleProvider implements Provider<Handle> {
   private Jdbi jdbi;
diff --git a/modules/jooby-jdbi/src/main/java/io/jooby/internal/jdbi/SqlObjectProvider.java b/modules/jooby-jdbi/src/main/java/io/jooby/internal/jdbi/SqlObjectProvider.java
@@ -10,7 +10,7 @@
 import org.jdbi.v3.core.Handle;
 import org.jdbi.v3.core.Jdbi;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 public class SqlObjectProvider implements Provider {
   private Jdbi jdbi;
diff --git a/modules/jooby-jdbi/src/main/java/io/jooby/jdbi/JdbiModule.java b/modules/jooby-jdbi/src/main/java/io/jooby/jdbi/JdbiModule.java
@@ -15,7 +15,7 @@
 import org.jdbi.v3.core.Jdbi;
 
 import javax.annotation.Nonnull;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import javax.sql.DataSource;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/AnnotationParser.java b/modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/AnnotationParser.java
diff --git a/modules/jooby-openapi/src/test/java/issues/i2594/ControllerV12594.java b/modules/jooby-openapi/src/test/java/issues/i2594/ControllerV12594.java
diff --git a/modules/jooby-openapi/src/test/java/issues/i2594/ControllerV22594.java b/modules/jooby-openapi/src/test/java/issues/i2594/ControllerV22594.java
diff --git a/modules/jooby-openapi/src/test/java/issues/i2594/HealthController2594.java b/modules/jooby-openapi/src/test/java/issues/i2594/HealthController2594.java
diff --git a/modules/jooby-openapi/src/test/kotlin/kt/KtController.kt b/modules/jooby-openapi/src/test/kotlin/kt/KtController.kt
diff --git a/modules/jooby-openapi/src/test/kotlin/kt/KtObjectController.kt b/modules/jooby-openapi/src/test/kotlin/kt/KtObjectController.kt
diff --git a/modules/jooby-quartz/src/main/java/io/jooby/internal/quartz/JobGenerator.java b/modules/jooby-quartz/src/main/java/io/jooby/internal/quartz/JobGenerator.java
diff --git a/modules/jooby-spring/src/main/java/io/jooby/di/SpringModule.java b/modules/jooby-spring/src/main/java/io/jooby/di/SpringModule.java
diff --git a/modules/jooby-weld/src/main/java/io/jooby/di/JoobyExtension.java b/modules/jooby-weld/src/main/java/io/jooby/di/JoobyExtension.java
diff --git a/pom.xml b/pom.xml
diff --git a/starters/guice-starter/src/main/java/starter/domain/DatabaseOrderRepository.java b/starters/guice-starter/src/main/java/starter/domain/DatabaseOrderRepository.java
diff --git a/starters/guice-starter/src/main/java/starter/service/BillingService.java b/starters/guice-starter/src/main/java/starter/service/BillingService.java
diff --git a/starters/spring-starter/src/main/java/starter/api/PetController.java b/starters/spring-starter/src/main/java/starter/api/PetController.java
diff --git a/tests/src/test/java/io/jooby/i2325/MyID2325.java b/tests/src/test/java/io/jooby/i2325/MyID2325.java
diff --git a/tests/src/test/java/io/jooby/i2457/ControllerV12457.java b/tests/src/test/java/io/jooby/i2457/ControllerV12457.java
diff --git a/tests/src/test/java/io/jooby/i2457/ControllerV22457.java b/tests/src/test/java/io/jooby/i2457/ControllerV22457.java
diff --git a/tests/src/test/java/io/jooby/i2457/HealthController2457.java b/tests/src/test/java/io/jooby/i2457/HealthController2457.java

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ This other example uses Guice as dependency provider:`
`186`	`186`	`.Guice provisioning`
`187`	`187`	`[source,java]`
`188`	`188`	`----`
`189`		`-import javax.inject.Inject;`
	`189`	`+import jakarta.inject.Inject;`
`190`	`190`
`191`	`191`	`{`
`192`	`192`	`install(new GuiceModule());`