diff --git a/blackbox-test-inject/pom.xml b/blackbox-test-inject/pom.xml index 9fcdbcdb..aa01f9ee 100644 --- a/blackbox-test-inject/pom.xml +++ b/blackbox-test-inject/pom.xml @@ -29,13 +29,13 @@ io.avaje avaje-jsonb - 3.4 + 3.5 io.avaje avaje-config - 4.0 + 4.1 diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/ACar.java b/blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/ACar.java index 03ad6b78..22e2a29b 100644 --- a/blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/ACar.java +++ b/blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/ACar.java @@ -2,9 +2,10 @@ import java.util.List; +import org.jspecify.annotations.Nullable; + import io.avaje.inject.AssistFactory; import io.avaje.inject.Assisted; -import io.avaje.lang.Nullable; import jakarta.inject.Inject; import jakarta.inject.Named; diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/Car.java b/blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/Car.java index e70f90ec..02279732 100644 --- a/blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/Car.java +++ b/blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/Car.java @@ -2,9 +2,10 @@ import java.util.List; +import org.jspecify.annotations.Nullable; + import io.avaje.inject.AssistFactory; import io.avaje.inject.Assisted; -import io.avaje.lang.Nullable; import jakarta.inject.Named; @Named("tomato") diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/config/SomeOptionalUser.java b/blackbox-test-inject/src/main/java/org/example/myapp/config/SomeOptionalUser.java index 21cc4647..96c27986 100644 --- a/blackbox-test-inject/src/main/java/org/example/myapp/config/SomeOptionalUser.java +++ b/blackbox-test-inject/src/main/java/org/example/myapp/config/SomeOptionalUser.java @@ -1,9 +1,9 @@ package org.example.myapp.config; +import org.jspecify.annotations.Nullable; import org.other.one.SomeOptionalDep; import io.avaje.inject.Component; -import io.avaje.lang.Nullable; @Component public class SomeOptionalUser { diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/config/SomeOptionalUser2.java b/blackbox-test-inject/src/main/java/org/example/myapp/config/SomeOptionalUser2.java index 7d35932f..4d684f07 100644 --- a/blackbox-test-inject/src/main/java/org/example/myapp/config/SomeOptionalUser2.java +++ b/blackbox-test-inject/src/main/java/org/example/myapp/config/SomeOptionalUser2.java @@ -1,12 +1,11 @@ package org.example.myapp.config; -import io.avaje.inject.Component; -import io.avaje.lang.Nullable; - import java.util.Optional; import org.other.one.SomeOptionalDep; +import io.avaje.inject.Component; + @Component public class SomeOptionalUser2 { diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/lazy/LazyBean.java b/blackbox-test-inject/src/main/java/org/example/myapp/lazy/LazyBean.java index 19a16f91..fcba81c9 100644 --- a/blackbox-test-inject/src/main/java/org/example/myapp/lazy/LazyBean.java +++ b/blackbox-test-inject/src/main/java/org/example/myapp/lazy/LazyBean.java @@ -2,10 +2,11 @@ import java.util.concurrent.atomic.AtomicBoolean; +import org.jspecify.annotations.Nullable; + import io.avaje.inject.BeanScope; import io.avaje.inject.Lazy; import io.avaje.inject.PostConstruct; -import io.avaje.lang.Nullable; import jakarta.inject.Inject; import jakarta.inject.Named; import jakarta.inject.Singleton; diff --git a/blackbox-test-inject/src/main/java/org/example/myapp/lazy/LazyFactory.java b/blackbox-test-inject/src/main/java/org/example/myapp/lazy/LazyFactory.java index 06328273..5302a743 100644 --- a/blackbox-test-inject/src/main/java/org/example/myapp/lazy/LazyFactory.java +++ b/blackbox-test-inject/src/main/java/org/example/myapp/lazy/LazyFactory.java @@ -2,10 +2,11 @@ import java.util.concurrent.atomic.AtomicBoolean; +import org.jspecify.annotations.Nullable; + import io.avaje.inject.Bean; import io.avaje.inject.Factory; import io.avaje.inject.Lazy; -import io.avaje.lang.Nullable; import jakarta.inject.Named; @Lazy diff --git a/inject-aop/pom.xml b/inject-aop/pom.xml index fa24303f..877e271d 100644 --- a/inject-aop/pom.xml +++ b/inject-aop/pom.xml @@ -8,6 +8,7 @@ 11.6-RC1 avaje-inject-aop + avaje inject aspect orient programming diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/Util.java b/inject-generator/src/main/java/io/avaje/inject/generator/Util.java index 473ab393..fc6f47cb 100644 --- a/inject-generator/src/main/java/io/avaje/inject/generator/Util.java +++ b/inject-generator/src/main/java/io/avaje/inject/generator/Util.java @@ -1,5 +1,13 @@ package io.avaje.inject.generator; +import static java.util.function.Predicate.not; +import static java.util.stream.Collectors.toList; + +import java.util.List; +import java.util.Optional; +import java.util.regex.Pattern; +import java.util.stream.Stream; + import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; @@ -9,14 +17,6 @@ import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; -import static java.util.function.Predicate.not; -import static java.util.stream.Collectors.toList; - -import java.util.List; -import java.util.Optional; -import java.util.regex.Pattern; -import java.util.stream.Stream; - final class Util { static final String ASPECT_PROVIDER_PREFIX = "io.avaje.inject.aop.AspectProvider<"; static final String PROVIDER_PREFIX = "jakarta.inject.Provider"; @@ -150,7 +150,7 @@ static String shortName(String fullType) { char firstChar = part.charAt(0); if (foundClass || Character.isUpperCase(firstChar) - || (!Character.isAlphabetic(firstChar) && Character.isJavaIdentifierStart(firstChar))) { + || !Character.isAlphabetic(firstChar) && Character.isJavaIdentifierStart(firstChar)) { foundClass = true; result += (result.isEmpty() ? "" : ".") + part; } @@ -223,7 +223,7 @@ static String extractMap(String rawType) { } static UtilType determineType(TypeMirror rawType, boolean beanMap) { - return UtilType.of(rawType.toString(), beanMap, rawType); + return UtilType.of(beanMap, rawType); } /** diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/UtilType.java b/inject-generator/src/main/java/io/avaje/inject/generator/UtilType.java index 2d3d5a0a..d84e18bd 100644 --- a/inject-generator/src/main/java/io/avaje/inject/generator/UtilType.java +++ b/inject-generator/src/main/java/io/avaje/inject/generator/UtilType.java @@ -23,8 +23,9 @@ private UtilType(Type type, String rawType, UType uType) { this.uType = uType; } - static UtilType of(String rawType, boolean beanMap, TypeMirror mirror) { + static UtilType of(boolean beanMap, TypeMirror mirror) { var uType = UType.parse(mirror); + var rawType = uType.fullWithoutAnnotations().replace(" ", ""); if (rawType.startsWith("java.util.List<")) { return new UtilType(Type.LIST, rawType, uType.param0()); } else if (rawType.startsWith("java.util.Set<")) { diff --git a/inject-maven-plugin/pom.xml b/inject-maven-plugin/pom.xml index e390c3d6..900421a2 100644 --- a/inject-maven-plugin/pom.xml +++ b/inject-maven-plugin/pom.xml @@ -9,6 +9,7 @@ avaje-inject-maven-plugin maven-plugin + avaje inject maven plugin diff --git a/inject-test/pom.xml b/inject-test/pom.xml index 8d844b4d..ccaf2857 100644 --- a/inject-test/pom.xml +++ b/inject-test/pom.xml @@ -111,7 +111,7 @@ io.avaje avaje-jsonb - 3.4 + 3.5 test diff --git a/inject/pom.xml b/inject/pom.xml index 8e8a220e..b91b53c9 100644 --- a/inject/pom.xml +++ b/inject/pom.xml @@ -39,7 +39,7 @@ io.avaje avaje-config - 4.0 + 4.1 true