Support Jspecify Annotations (#650)

* support jspecify annotations

* fix test

* make jakarta inject static transitive

* Update ExternalDeps.java

* Update ExternalDeps.java

* nullmarked

* Update pom.xml

* Update pom.xml

* Update DBeanScope.java

* bump prisms

* Revert "bump prisms"

This reverts commit 5c967b0.

* prisms 1.30

* Format, remove unused method

---------

Co-authored-by: Rob Bygrave <robin.bygrave@gmail.com>

inject-events/pom.xml

@@ -12,7 +12,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>10.0-RC6</version>
+      <version>10.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

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

@@ -52,7 +52,7 @@ private EventPublisherWriter(Element element) {
       .toString()
       .replaceFirst("java.", "")
       + ".events";
-    qualifier = Optional.ofNullable(Util.getNamed(element)).orElse("");
+    qualifier = Optional.ofNullable(Util.named(element)).orElse("");
     var className =
       packageName
         + "."
@@ -65,7 +65,7 @@ private EventPublisherWriter(Element element) {
     if (GENERATED_PUBLISHERS.containsKey(originName)) {
       //in super niche situations when compiling the same module, we need to tell avaje that these types already exist
       //got this when running both my eclipse compiler and then the terminal build
-      ProcessingContext.addOptionalType(UType.parse(asType).fullWithoutAnnotations(), Util.getNamed(element));
+      ProcessingContext.addOptionalType(UType.parse(asType).fullWithoutAnnotations(), Util.named(element));
       return;
     }
     importTypes.addAll(utype.importTypes());
@@ -77,7 +77,7 @@ private String getUniqueClassName(String className, Integer recursiveIndex) {
     Optional.ofNullable(APContext.typeElement(className)).ifPresent(e ->
       GENERATED_PUBLISHERS.put(
         e.getQualifiedName().toString(),
-        Optional.ofNullable(Util.getNamed(e)).orElse("")));
+        Optional.ofNullable(Util.named(e)).orElse("")));
 
     if (Optional.ofNullable(GENERATED_PUBLISHERS.get(className))
         .filter(not(qualifier::equals))

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

@@ -19,7 +19,7 @@ final class FieldReader {
 
   FieldReader(Element element) {
     this.element = element;
-    this.name = Util.getNamed(element);
+    this.name = Util.named(element);
     this.nullable = Util.isNullable(element);
     this.isBeanMap = QualifiedMapPrism.isPresent(element);
     this.utype = Util.determineType(element.asType(), isBeanMap);

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

@@ -155,7 +155,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
       .forEach(e -> {
         var type = UType.parse(e.asType());
         type = "java.util.List".equals(type.mainType()) ? type.param0() : type;
-        ProcessingContext.addOptionalType(type.fullWithoutAnnotations(), Util.getNamed(e));
+        ProcessingContext.addOptionalType(type.fullWithoutAnnotations(), Util.named(e));
         ProcessingContext.addOptionalType(type.fullWithoutAnnotations(), null);
       });
 

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

@@ -492,7 +492,7 @@ static class MethodParam {
     MethodParam(VariableElement param) {
       this.element = param;
       this.simpleName = param.getSimpleName().toString();
-      this.named = Util.getNamed(param);
+      this.named = Util.named(param);
       this.nullable = Util.isNullable(param);
       this.isBeanMap = QualifiedMapPrism.isPresent(param);
       this.utilType = Util.determineType(param.asType(), isBeanMap);
@@ -572,7 +572,7 @@ void addImports(ImportTypeMap importTypes) {
         importTypes.add("io.avaje.inject.events.ObserverManager");
       }
       importTypes.addAll(fullUType.importTypes());
-      Util.getNullableAnnotation(element).map(Object::toString).ifPresent(importTypes::add);
+      Util.nullableAnnotation(element).map(Object::toString).ifPresent(importTypes::add);
     }
 
     void checkRequest(BeanRequestParams requestParams) {

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

@@ -129,7 +129,7 @@ static boolean externallyProvided(String type) {
 
   static void addOptionalType(String paramType, String name) {
     if (!CTX.get().providedTypes.contains(paramType)) {
-      CTX.get().optionalTypes.add(Util.addQualifierSuffixTrim(name, paramType));
+      CTX.get().optionalTypes.add(ProcessorUtils.trimAnnotations(Util.addQualifierSuffixTrim(name, paramType)));
     }
   }
 

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

@@ -165,7 +165,7 @@ private void checkForAspect(ExecutableElement methodElement) {
 
 
   private void addFactoryMethod(ExecutableElement methodElement, BeanPrism bean) {
-    String qualifierName = Util.getNamed(methodElement);
+    String qualifierName = Util.named(methodElement);
     factoryMethods.add(new MethodReader(methodElement, baseType, bean, qualifierName, importTypes).read());
   }
 

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

@@ -183,16 +183,6 @@ static String trimmedName(UType type) {
     return shortName(type.mainType()).toLowerCase();
   }
 
-  String trimExtends(UType uType) {
-    String type = uType.mainType();
-    if (type != null && type.startsWith("? extends ")) {
-      return type.substring(10);
-    } else if ("?".equals(type)) {
-      return "Wildcard";
-    }
-    return type;
-  }
-
   static boolean isOptional(String rawType) {
     return rawType.startsWith(OPTIONAL_PREFIX);
   }
@@ -298,7 +288,7 @@ static String commonParent(String currentTop, String aPackage) {
   /**
    * Return the name via <code>@Named</code> or a Qualifier annotation.
    */
-  static String getNamed(Element p) {
+  static String named(Element p) {
     final NamedPrism named = NamedPrism.getInstanceOn(p);
     if (named != null) {
       return named.value().replace("\"", "\\\"");
@@ -320,17 +310,20 @@ static String getNamed(Element p) {
   /**
    * Return true if the element has a Nullable annotation.
    */
-  static boolean isNullable(Element p) {
-    for (final AnnotationMirror mirror : p.getAnnotationMirrors()) {
+  static boolean isNullable(Element element) {
+    if (ProcessorUtils.hasAnnotationWithName(element, NULLABLE)) {
+      return true;
+    }
+    for (final AnnotationMirror mirror : UType.parse(element.asType()).annotations()) {
       if (NULLABLE.equals(shortName(mirror.getAnnotationType().toString()))) {
         return true;
       }
     }
     return false;
   }
 
-  static Optional<DeclaredType> getNullableAnnotation(Element p) {
-    for (final AnnotationMirror mirror : p.getAnnotationMirrors()) {
+  static Optional<DeclaredType> nullableAnnotation(Element element) {
+    for (final AnnotationMirror mirror : element.getAnnotationMirrors()) {
       if (NULLABLE.equals(shortName(mirror.getAnnotationType().toString()))) {
         return Optional.of(mirror.getAnnotationType());
       }

inject-generator/src/test/java/io/avaje/inject/generator/models/valid/external/ExternalDeps.java

@@ -2,13 +2,17 @@
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.jspecify.annotations.Nullable;
 
 import io.avaje.inject.External;
-import io.avaje.lang.Nullable;
+import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
 @Singleton
 public class ExternalDeps {
+  @Inject @Nullable AtomicLong longy;
 
   public ExternalDeps(@External AtomicBoolean bool, @Nullable AtomicInteger inty) {}
 }

inject-test/src/main/java/io/avaje/inject/test/GlobalInitialise.java

@@ -2,7 +2,7 @@
 
 import io.avaje.inject.BeanScope;
 import io.avaje.inject.spi.AvajeModule;
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
 import java.io.InputStream;

inject-test/src/main/java/io/avaje/inject/test/PluginMgr.java

@@ -1,10 +1,12 @@
 package io.avaje.inject.test;
 
-import io.avaje.inject.BeanScope;
-import io.avaje.lang.Nullable;
-
 import java.util.ServiceLoader;
 
+import org.jspecify.annotations.Nullable;
+
+import io.avaje.inject.BeanScope;
+import io.avaje.inject.test.Plugin.Scope;
+
 final class PluginMgr {
 
   private PluginMgr() {}
@@ -23,8 +25,8 @@ static Plugin plugin() {
   /**
    * Return a new plugin scope (if there is a plugin).
    */
-   @Nullable
-  static Plugin.Scope scope(BeanScope beanScope) {
+  @Nullable
+  static Scope scope(BeanScope beanScope) {
     return plugin == null ? null : plugin.createScope(beanScope);
   }
 }

inject-test/src/main/java/io/avaje/inject/test/TestBeanScope.java

@@ -1,15 +1,16 @@
 package io.avaje.inject.test;
 
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
 import io.avaje.inject.BeanScope;
 import io.avaje.inject.BeanScopeBuilder;
-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
 
 /**
  * Provides access to the global "test scope" and helper methods to use it.
  *
  */
-@NonNullApi
+@NullMarked
 public abstract class TestBeanScope {
 
   /**

inject/pom.xml

@@ -12,6 +12,12 @@
   <description>avaje-inject dependency injection library using source code generation</description>
   <dependencies>
 
+    <dependency>
+      <groupId>org.jspecify</groupId>
+      <artifactId>jspecify</artifactId>
+      <version>1.0.0</version>
+    </dependency>
+
     <dependency>
       <groupId>jakarta.inject</groupId>
       <artifactId>jakarta.inject-api</artifactId>
@@ -24,12 +30,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.avaje</groupId>
-      <artifactId>avaje-lang</artifactId>
-      <version>1.1</version>
-    </dependency>
-
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-applog</artifactId>

inject/src/main/java/io/avaje/inject/BeanEntry.java

@@ -1,15 +1,12 @@
 package io.avaje.inject;
 
-import io.avaje.lang.NonNullApi;
-
 import java.util.Set;
 
 /**
  * A bean entry with priority and optional name.
  *
  * @see BeanScope#all()
  */
-@NonNullApi
 public interface BeanEntry {
 
   /**

inject/src/main/java/io/avaje/inject/BeanScope.java

@@ -6,8 +6,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Holds beans created by dependency injection.
@@ -67,7 +66,6 @@
  *
  * }</pre>
  */
-@NonNullApi
 public interface BeanScope extends AutoCloseable {
 
   /**

inject/src/main/java/io/avaje/inject/BeanScopeBuilder.java

@@ -1,15 +1,15 @@
 package io.avaje.inject;
 
-import io.avaje.inject.spi.AvajeModule;
-import io.avaje.inject.spi.ConfigPropertyPlugin;
-import io.avaje.inject.spi.PropertyRequiresPlugin;
-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
-
 import java.lang.reflect.Type;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
+
+import io.avaje.inject.spi.AvajeModule;
+import io.avaje.inject.spi.ConfigPropertyPlugin;
+import io.avaje.inject.spi.PropertyRequiresPlugin;
+
 /**
  * Build a bean scope with options for shutdown hook and supplying external dependencies.
  * <p>
@@ -30,7 +30,6 @@
  *
  * }</pre>
  */
-@NonNullApi
 public interface BeanScopeBuilder {
 
   /**

inject/src/main/java/io/avaje/inject/DBeanScopeBuilder.java

@@ -3,6 +3,7 @@
 import static java.lang.System.Logger.Level.DEBUG;
 import static java.lang.System.Logger.Level.INFO;
 import static java.util.Collections.emptySet;
+
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -14,14 +15,20 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
+
 import io.avaje.applog.AppLog;
-import io.avaje.inject.spi.*;
-import io.avaje.lang.NonNullApi;
-import io.avaje.lang.Nullable;
+import io.avaje.inject.spi.AvajeModule;
+import io.avaje.inject.spi.Builder;
+import io.avaje.inject.spi.ClosePair;
+import io.avaje.inject.spi.ConfigPropertyPlugin;
+import io.avaje.inject.spi.EnrichBean;
+import io.avaje.inject.spi.ModuleOrdering;
+import io.avaje.inject.spi.PropertyRequiresPlugin;
+import io.avaje.inject.spi.SuppliedBean;
 import jakarta.inject.Provider;
 
 /** Build a bean scope with options for shutdown hook and supplying test doubles. */
-@NonNullApi
 final class DBeanScopeBuilder implements BeanScopeBuilder.ForTesting {
 
   private static final System.Logger log = AppLog.getLogger("io.avaje.inject");

inject/src/main/java/io/avaje/inject/package-info.java

@@ -26,4 +26,5 @@
  *
  * }</pre>
  */
+@org.jspecify.annotations.NullMarked
 package io.avaje.inject;

inject/src/main/java/io/avaje/inject/spi/ConfigPropertyPlugin.java

@@ -2,7 +2,7 @@
 
 import java.util.Optional;
 
-import io.avaje.lang.NonNullApi;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * Plugin interface which contains the application properties used for wiring. Used with
@@ -11,28 +11,33 @@
  * <p>The plugin is loaded via ServiceLoader and defaults to an implementation that uses {@link
  * System#getProperty(String)} and {@link System#getenv(String)}.
  */
-@NonNullApi
+@NullMarked
 public interface ConfigPropertyPlugin extends InjectExtension, PropertyRequiresPlugin {
 
   /**
    * Return a configuration value that might not exist.
    */
+  @Override
   Optional<String> get(String property);
 
   /**
    * Return true if the property is defined.
    */
+  @Override
   boolean contains(String property);
 
   /** Return true if the property is not defined. */
+  @Override
   default boolean missing(String property) {
     return !contains(property);
   }
 
   /** Return true if the property is equal to the given value. */
+  @Override
   boolean equalTo(String property, String value);
 
   /** Return true if the property is not defined or not equal to the given value. */
+  @Override
   default boolean notEqualTo(String property, String value) {
     return !equalTo(property, value);
   }