Fix TYPE_USE annotated dependencies (#823)

* Bump the dependencies group with 2 updates

Bumps the dependencies group with 2 updates: [io.avaje:avaje-config](https://github.com/avaje/avaje-config) and [io.avaje:avaje-jsonb](https://github.com/avaje/avaje-jsonb).


Updates `io.avaje:avaje-config` from 4.0 to 4.1
- [Release notes](https://github.com/avaje/avaje-config/releases)
- [Commits](avaje/avaje-config@4.0...4.1)

Updates `io.avaje:avaje-jsonb` from 3.4 to 3.5
- [Release notes](https://github.com/avaje/avaje-jsonb/releases)
- [Commits](avaje/avaje-jsonb@3.4...3.5)

---
updated-dependencies:
- dependency-name: io.avaje:avaje-config
  dependency-version: '4.1'
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: io.avaje:avaje-jsonb
  dependency-version: '3.5'
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>

* fix jspecify nullable

* Update UtilType.java

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: SentryMan

blackbox-test-inject/pom.xml

@@ -29,13 +29,13 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb</artifactId>
-      <version>3.4</version>
+      <version>3.5</version>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>4.0</version>
+      <version>4.1</version>
     </dependency>
 
     <dependency>

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;
 

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")

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 {

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 {
 

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;

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

inject-aop/pom.xml

@@ -8,6 +8,7 @@
     <version>11.6-RC1</version>
   </parent>
   <artifactId>avaje-inject-aop</artifactId>
+  <name>avaje inject aspect orient programming</name>
   <dependencies>
     <!-- test dependencies -->
     <dependency>

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);
   }
 
   /**

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<")) {

inject-maven-plugin/pom.xml

@@ -9,6 +9,7 @@
 
   <artifactId>avaje-inject-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
+  <name>avaje inject maven plugin</name>
 
   <dependencies>
     <dependency>

inject-test/pom.xml

@@ -111,7 +111,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-jsonb</artifactId>
-      <version>3.4</version>
+      <version>3.5</version>
       <scope>test</scope>
     </dependency>
 

inject/pom.xml

@@ -39,7 +39,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>4.0</version>
+      <version>4.1</version>
       <optional>true</optional>
     </dependency>