Merge branch 'master' into qualified-members

Author: SentryMan

blackbox-aspect/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>9.11-RC1</version>
+    <version>9.11-RC2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

blackbox-other/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>9.11-RC1</version>
+    <version>9.11-RC2</version>
   </parent>
 
   <artifactId>blackbox-other</artifactId>

blackbox-test-inject/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>avaje-inject-parent</artifactId>
     <groupId>io.avaje</groupId>
-    <version>9.11-RC1</version>
+    <version>9.11-RC2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

blackbox-test-inject/src/main/java/org/example/myapp/assist/CssFactory.java

@@ -0,0 +1,6 @@
+package org.example.myapp.assist;
+
+public interface CssFactory {
+
+  Scanner scanner(String path);
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/CssThing.java

@@ -0,0 +1,18 @@
+package org.example.myapp.assist;
+
+import io.avaje.inject.Component;
+
+@Component
+public class CssThing {
+
+  private final CssFactory factory;
+
+  CssThing(CssFactory factory) {
+    this.factory = factory;
+  }
+
+  public String scan(String file) {
+    Scanner scanner = factory.scanner(file);
+    return scanner.scan();
+  }
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/JsFactory.java

@@ -0,0 +1,6 @@
+package org.example.myapp.assist;
+
+public interface JsFactory {
+
+  Scanner scanner(String path);
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/JsThing.java

@@ -0,0 +1,26 @@
+package org.example.myapp.assist;
+
+import io.avaje.inject.Component;
+import jakarta.inject.Named;
+
+@Component
+public class JsThing {
+
+  final JsFactory nameFactory;
+  final JsFactory qualFactory;
+
+  public JsThing(@Named("withName") JsFactory nameFactory, @MyJsName JsFactory qualFactory) {
+    this.nameFactory = nameFactory;
+    this.qualFactory = qualFactory;
+  }
+
+  public String nameScan(String input) {
+    var scanner = nameFactory.scanner(input);
+    return scanner.scan();
+  }
+
+  public String qualScan(String input) {
+    var scanner = qualFactory.scanner(input);
+    return scanner.scan();
+  }
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/MyJsName.java

@@ -0,0 +1,11 @@
+package org.example.myapp.assist;
+
+import jakarta.inject.Qualifier;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MyJsName {
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/Scanner.java

@@ -0,0 +1,6 @@
+package org.example.myapp.assist;
+
+public interface Scanner {
+
+  String scan();
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/Somthin.java

@@ -0,0 +1,10 @@
+package org.example.myapp.assist;
+
+import io.avaje.inject.Component;
+
+@Component
+public class Somthin {
+  public String hi() {
+    return "hi";
+  }
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/css/CssScanner.java

@@ -0,0 +1,24 @@
+package org.example.myapp.assist.css;
+
+import io.avaje.inject.AssistFactory;
+import io.avaje.inject.Assisted;
+import org.example.myapp.assist.CssFactory;
+import org.example.myapp.assist.Scanner;
+import org.example.myapp.assist.Somthin;
+
+@AssistFactory(CssFactory.class)
+class CssScanner implements Scanner {
+
+  private final String path;
+  private final Somthin somthin;
+
+  CssScanner(@Assisted String path, Somthin somthin) {
+    this.path = path;
+    this.somthin = somthin;
+  }
+
+  @Override
+  public String scan() {
+    return "scanWith|path=" + path + " | somethin=" + somthin.hi();
+  }
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/css/JsWithNameScanner.java

@@ -0,0 +1,24 @@
+package org.example.myapp.assist.css;
+
+import io.avaje.inject.AssistFactory;
+import io.avaje.inject.Assisted;
+import jakarta.inject.Named;
+import org.example.myapp.assist.*;
+
+@Named("withName")
+@AssistFactory(JsFactory.class)
+class JsWithNameScanner implements Scanner {
+
+  private final String path;
+  private final Somthin somthin;
+
+  JsWithNameScanner(@Assisted String path, Somthin somthin) {
+    this.path = path;
+    this.somthin = somthin;
+  }
+
+  @Override
+  public String scan() {
+    return "jsScanNamed|path=" + path + " | somethin=" + somthin.hi();
+  }
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/css/JsWithQualScanner.java

@@ -0,0 +1,27 @@
+package org.example.myapp.assist.css;
+
+import io.avaje.inject.AssistFactory;
+import io.avaje.inject.Assisted;
+import jakarta.inject.Named;
+import org.example.myapp.assist.JsFactory;
+import org.example.myapp.assist.MyJsName;
+import org.example.myapp.assist.Scanner;
+import org.example.myapp.assist.Somthin;
+
+@MyJsName
+@AssistFactory(JsFactory.class)
+class JsWithQualScanner implements Scanner {
+
+  private final String path;
+  private final Somthin somthin;
+
+  JsWithQualScanner(@Assisted String path, Somthin somthin) {
+    this.path = path;
+    this.somthin = somthin;
+  }
+
+  @Override
+  public String scan() {
+    return "jsScanQual|path=" + path + " | somethin=" + somthin.hi();
+  }
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/Car.java

@@ -0,0 +1,14 @@
+package org.example.myapp.assist.droid;
+
+import java.util.List;
+
+import io.avaje.inject.AssistFactory;
+import io.avaje.inject.Assisted;
+import io.avaje.lang.Nullable;
+import jakarta.inject.Named;
+
+@Named("tomato")
+@AssistFactory(CarFactory.class)
+public class Car {
+  public Car(@Assisted Paint paint, @Assisted List<String> type, @Nullable Engine engine) {}
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/CarFactory.java

@@ -0,0 +1,8 @@
+package org.example.myapp.assist.droid;
+
+import java.util.List;
+
+public interface CarFactory {
+
+  Car create(Paint paint, List<String> type);
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/DroidConstructor.java

@@ -0,0 +1,35 @@
+package org.example.myapp.assist.droid;
+
+import io.avaje.inject.Assisted;
+import io.avaje.inject.AssistFactory;
+import jakarta.inject.Named;
+
+@Named("android")
+@AssistFactory(DroidFactory.class)
+public class DroidConstructor implements DroidFactory.Droid {
+
+  private final int personality;
+  private final Model model;
+  private final Engine wiring;
+  private final Radio radio;
+
+  public DroidConstructor(@Assisted int personality, @Assisted Model model, Engine wiring, @Named("red") Radio radio) {
+    this.personality = personality;
+    this.model = model;
+    this.wiring = wiring;
+    this.radio = radio;
+  }
+
+  public int personality() {
+    return personality;
+  }
+
+  public Model model() {
+    return model;
+  }
+
+  @Override
+  public boolean dependenciesAreWired() {
+    return wiring != null && radio != null;
+  }
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/DroidFactory.java

@@ -0,0 +1,15 @@
+package org.example.myapp.assist.droid;
+
+public interface DroidFactory {
+
+  Droid createDroid(int personality, Model model);
+
+  interface Droid {
+
+    int personality();
+
+    Model model();
+
+    boolean dependenciesAreWired();
+  }
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/DroidField.java

@@ -0,0 +1,29 @@
+package org.example.myapp.assist.droid;
+
+import io.avaje.inject.Assisted;
+import io.avaje.inject.AssistFactory;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
+@Named("androidfield")
+@AssistFactory(DroidFactory.class)
+public class DroidField implements DroidFactory.Droid {
+  @Assisted int personality;
+  @Assisted Model model;
+  @Inject Engine wiring;
+
+  @Named("red") @Inject Radio radio;
+
+  public int personality() {
+    return personality;
+  }
+
+  public Model model() {
+    return model;
+  }
+
+  @Override
+  public boolean dependenciesAreWired() {
+    return wiring != null && radio != null;
+  }
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/DroidMethod.java

@@ -0,0 +1,39 @@
+package org.example.myapp.assist.droid;
+
+import io.avaje.inject.Assisted;
+import io.avaje.inject.AssistFactory;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
+@Named("androidmethod")
+@AssistFactory(DroidFactory.class)
+public class DroidMethod implements DroidFactory.Droid {
+
+  private int personality;
+  private Model model;
+  private Engine wiring;
+
+  private Radio radio;
+  @Inject
+  public void inject(@Assisted int personality, @Assisted Model model, Engine wiring, @Named("red") Radio radio) {
+    this.personality = personality;
+    this.model = model;
+    this.wiring = wiring;
+    this.radio = radio;
+  }
+
+  @Override
+  public int personality() {
+    return personality;
+  }
+
+  @Override
+  public Model model() {
+    return model;
+  }
+
+  @Override
+  public boolean dependenciesAreWired() {
+    return wiring != null && radio != null;
+  }
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/DroidThing.java

@@ -0,0 +1,35 @@
+package org.example.myapp.assist.droid;
+
+import io.avaje.inject.Component;
+import jakarta.inject.Named;
+
+@Component
+public class DroidThing {
+
+
+  final DroidFactory factoryViaField;
+
+  final DroidFactory factoryViaMethod;
+
+
+  final DroidFactory factoryViaConstructor;
+
+  public DroidThing(@Named("androidfield") DroidFactory factoryViaField,
+                    @Named("androidmethod") DroidFactory factoryViaMethod,
+                    @Named("android") DroidFactory factoryViaConstructor) {
+    this.factoryViaField = factoryViaField;
+    this.factoryViaMethod = factoryViaMethod;
+    this.factoryViaConstructor = factoryViaConstructor;
+  }
+
+  public DroidFactory.Droid viaField(int p, Model m) {
+    return factoryViaField.createDroid(p, m);
+  }
+
+  public DroidFactory.Droid viaMethod(int p, Model m) {
+    return factoryViaMethod.createDroid(p, m);
+  }
+  public DroidFactory.Droid viaCtor(int p, Model m) {
+    return factoryViaConstructor.createDroid(p, m);
+  }
+}

blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/Engine.java

@@ -0,0 +1,6 @@
+package org.example.myapp.assist.droid;
+
+import jakarta.inject.Singleton;
+
+@Singleton
+public class Engine {}

blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/Model.java

@@ -0,0 +1,7 @@
+package org.example.myapp.assist.droid;
+ public enum Model {
+    SCANNER,
+    BATTLE,
+    EXECUTION,
+    OPERATOR
+  }

blackbox-test-inject/src/main/java/org/example/myapp/assist/droid/Paint.java

@@ -0,0 +1,3 @@
+package org.example.myapp.assist.droid;
+
+public interface Paint {}