Change to jakarta.inject from javax.inject (#82)

Author: rbygrave

inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java

@@ -4,9 +4,9 @@
 import io.avaje.inject.Primary;
 import io.avaje.inject.Secondary;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Qualifier;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Qualifier;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;

inject-generator/src/main/java/io/avaje/inject/generator/Constants.java

@@ -4,9 +4,9 @@ class Constants {
 
   static final String KOTLIN_METADATA = "kotlin.Metadata";
 
-  static final String PROVIDER = "javax.inject.Provider";
-  static final String SINGLETON = "javax.inject.Singleton";
-  static final String INJECT = "javax.inject.Inject";
+  static final String PROVIDER = "jakarta.inject.Provider";
+  static final String SINGLETON = "jakarta.inject.Singleton";
+  static final String INJECT = "jakarta.inject.Inject";
 
   static final String PATH = "io.avaje.http.api.Path";
   static final String CONTROLLER = "io.avaje.http.api.Controller";

inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java

@@ -2,7 +2,7 @@
 
 import io.avaje.inject.Bean;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;

inject-generator/src/main/java/io/avaje/inject/generator/Processor.java

@@ -8,7 +8,7 @@
 import javax.annotation.processing.FilerException;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;

inject-generator/src/main/java/io/avaje/inject/generator/Util.java

@@ -1,15 +1,15 @@
 package io.avaje.inject.generator;
 
-import javax.inject.Named;
-import javax.inject.Qualifier;
+import jakarta.inject.Named;
+import jakarta.inject.Qualifier;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
 
 class Util {
 
-  private static final String PROVIDER_PREFIX = "javax.inject.Provider<";
+  private static final String PROVIDER_PREFIX = "jakarta.inject.Provider<";
 
   private static final int PROVIDER_LENGTH = PROVIDER_PREFIX.length();
 

inject-generator/src/test/java/io/avaje/inject/generator/IncludeAnnotationsTest.java

@@ -5,8 +5,8 @@
 import io.avaje.inject.Secondary;
 import org.junit.jupiter.api.Test;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 import static io.avaje.inject.generator.IncludeAnnotations.include;
 import static org.junit.jupiter.api.Assertions.assertFalse;

inject-test/src/test/java/org/example/coffee/CoffeeMaker.java

@@ -2,7 +2,7 @@
 
 import org.example.coffee.grind.Grinder;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 //@ContextModule(name = "coffee-maker")
 @Singleton

inject-test/src/test/java/org/example/coffee/circular/CircA.java

@@ -1,6 +1,6 @@
 package org.example.coffee.circular;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 class CircA {

inject-test/src/test/java/org/example/coffee/circular/CircB.java

@@ -1,6 +1,6 @@
 package org.example.coffee.circular;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 class CircB {

inject-test/src/test/java/org/example/coffee/circular/CircC.java

@@ -1,7 +1,7 @@
 package org.example.coffee.circular;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 class CircC {

inject-test/src/test/java/org/example/coffee/core/DuperPump.java

@@ -2,7 +2,7 @@
 
 import org.example.coffee.Pump;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class DuperPump implements Pump {

inject-test/src/test/java/org/example/coffee/core/Steamer.java

@@ -1,7 +1,7 @@
 package org.example.coffee.core;
 
 import javax.annotation.PreDestroy;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class Steamer {

inject-test/src/test/java/org/example/coffee/factory/Configuration.java

@@ -6,7 +6,7 @@
 import io.avaje.inject.PreDestroy;
 import org.example.coffee.CoffeeMaker;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * Factory bean (ala Micronaut @Factory or Spring @Configuration)

inject-test/src/test/java/org/example/coffee/factory/MultipleOtherThings.java

@@ -1,7 +1,7 @@
 package org.example.coffee.factory;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class MultipleOtherThings {

inject-test/src/test/java/org/example/coffee/factory/MyFactory.java

@@ -4,7 +4,7 @@
 import io.avaje.inject.Factory;
 import org.example.coffee.factory.other.Something;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Factory
 public class MyFactory {

inject-test/src/test/java/org/example/coffee/factory/SomeImplBean.java

@@ -3,7 +3,7 @@
 import io.avaje.inject.Secondary;
 import org.example.coffee.factory.other.Something;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Secondary
 @Singleton

inject-test/src/test/java/org/example/coffee/factory/StartConfig.java

@@ -1,6 +1,6 @@
 package org.example.coffee.factory;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class StartConfig {

inject-test/src/test/java/org/example/coffee/factory/Unused.java

@@ -2,8 +2,8 @@
 
 import org.example.coffee.factory.other.Something;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class Unused {

inject-test/src/test/java/org/example/coffee/factory/other/BlueOtherThing.java

@@ -2,8 +2,8 @@
 
 import org.example.coffee.factory.Otherthing;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Named("blue")

inject-test/src/test/java/org/example/coffee/factory/other/RedOtherThing.java

@@ -2,8 +2,8 @@
 
 import org.example.coffee.factory.Otherthing;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Named("red")

inject-test/src/test/java/org/example/coffee/fruit/AppleService.java

@@ -1,7 +1,7 @@
 package org.example.coffee.fruit;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 class AppleService {

inject-test/src/test/java/org/example/coffee/fruit/BananaService.java

@@ -1,7 +1,7 @@
 package org.example.coffee.fruit;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Fruit
 @Singleton

inject-test/src/test/java/org/example/coffee/fruit/PeachService.java

@@ -1,6 +1,6 @@
 package org.example.coffee.fruit;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Fruit
 @Singleton

inject-test/src/test/java/org/example/coffee/generic/HazManager.java

@@ -1,7 +1,7 @@
 package org.example.coffee.generic;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 /**
  * Has a Dependency via generic interface.

inject-test/src/test/java/org/example/coffee/generic/HazRepo.java

@@ -1,6 +1,6 @@
 package org.example.coffee.generic;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 /**
  * Implementation of a generic interface.

inject-test/src/test/java/org/example/coffee/generic/MultiGenericConsumer.java

@@ -2,7 +2,7 @@
 
 import org.example.coffee.grind.AMusher;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 /**
  * Has multiple dependencies that are generic interface.

inject-test/src/test/java/org/example/coffee/generic/SomeGenericString.java

@@ -1,6 +1,6 @@
 package org.example.coffee.generic;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class SomeGenericString implements SomeGeneric<String> {

inject-test/src/test/java/org/example/coffee/grind/AMusher.java

@@ -2,7 +2,7 @@
 
 import io.avaje.inject.spi.BeanLifecycle;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class AMusher implements BeanLifecycle {

inject-test/src/test/java/org/example/coffee/grind/BMusher.java

@@ -2,7 +2,7 @@
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class BMusher {

inject-test/src/test/java/org/example/coffee/grind/Grinder.java

@@ -8,8 +8,8 @@
 import lombok.extern.slf4j.Slf4j;
 
 import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 
 @Data

inject-test/src/test/java/org/example/coffee/list/A2Somei.java

@@ -1,7 +1,7 @@
 package org.example.coffee.list;
 
 import javax.annotation.Priority;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Priority(22)

inject-test/src/test/java/org/example/coffee/list/ASomei.java

@@ -1,7 +1,7 @@
 package org.example.coffee.list;
 
 import javax.annotation.Priority;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Priority(2)

inject-test/src/test/java/org/example/coffee/list/BSomei.java

@@ -1,7 +1,7 @@
 package org.example.coffee.list;
 
 import javax.annotation.Priority;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Priority(1)

inject-test/src/test/java/org/example/coffee/list/CombinedSetSomei.java

@@ -1,7 +1,7 @@
 package org.example.coffee.list;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;

inject-test/src/test/java/org/example/coffee/list/CombinedSomei.java

@@ -1,7 +1,7 @@
 package org.example.coffee.list;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.List;
 import java.util.stream.Collectors;
 

inject-test/src/test/java/org/example/coffee/primary/OtherPEmailer.java

@@ -1,6 +1,6 @@
 package org.example.coffee.primary;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 //@Secondary
 @Singleton

inject-test/src/test/java/org/example/coffee/primary/PrimePEmailer.java

@@ -2,7 +2,7 @@
 
 import io.avaje.inject.Primary;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Primary
 @Singleton

inject-test/src/test/java/org/example/coffee/primary/UserOfPEmailer.java

@@ -1,6 +1,6 @@
 package org.example.coffee.primary;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class UserOfPEmailer {

inject-test/src/test/java/org/example/coffee/priority/base/ABasei.java

@@ -2,7 +2,7 @@
 
 import io.avaje.inject.Priority;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Priority(42)

inject-test/src/test/java/org/example/coffee/priority/base/BBasei.java

@@ -2,7 +2,7 @@
 
 import io.avaje.inject.Priority;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Priority(7)

inject-test/src/test/java/org/example/coffee/priority/base/CBasei.java

@@ -2,7 +2,7 @@
 
 import io.avaje.inject.Priority;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Priority(1)