Merge pull request #434 from avaje/feature/433-followup

#433 followup - Add test and update style on BeanReader

Author: SentryMan

blackbox-test-inject/src/main/java/org/example/myapp/conditional/WithAspectConditional.java

@@ -0,0 +1,15 @@
+package org.example.myapp.conditional;
+
+import io.avaje.inject.Component;
+import io.avaje.inject.RequiresProperty;
+import org.example.myapp.aspect.MyAround;
+
+@Component
+@RequiresProperty(value = "factory")
+public class WithAspectConditional {
+
+  @MyAround
+  void test(String str) {
+    // does nothing
+  }
+}

blackbox-test-inject/src/test/java/org/example/myapp/conditional/ConditionalTests.java

@@ -21,7 +21,6 @@ class ConditionalTests {
 
   @BeforeEach
   void clearConfig() {
-
     Config.eventBuilder("")
         .remove("secondary")
         .remove("factory")
@@ -32,15 +31,14 @@ void clearConfig() {
   }
 
   @Test
-  void basic() throws IOException {
+  void basic() {
     // just wire everything with no test scope, mocks etc
     final BeanScope beanScope = BeanScope.builder().build();
     assertTrue(beanScope.getOptional(Bird.class).isEmpty());
   }
 
   @Test
-  void jay() throws IOException {
-
+  void jay() {
     Config.setProperty("factory", "bird");
 
     final BeanScope beanScope = BeanScope.builder().build();
@@ -51,8 +49,7 @@ void jay() throws IOException {
   }
 
   @Test
-  void birdWatch() throws IOException {
-
+  void birdWatch() {
     Config.setProperty("factory", "bird");
     Config.setProperty("watcher", "bird");
 
@@ -62,8 +59,7 @@ void birdWatch() throws IOException {
   }
 
   @Test
-  void missingBeans() throws IOException {
-
+  void missingBeans() {
     Config.setProperty("watcher", "bird");
 
     final BeanScope beanScope = BeanScope.builder().build();
@@ -72,34 +68,33 @@ void missingBeans() throws IOException {
   }
 
   @Test
-  void noFactory() throws IOException {
-
+  void noFactory() {
     Config.setProperty("kiwi", "somethin");
     Config.setProperty("watcher", "bird");
 
     final BeanScope beanScope = BeanScope.builder().build();
 
+    assertTrue(beanScope.getOptional(WithAspectConditional.class).isEmpty());
     assertTrue(beanScope.getOptional(BirdFactory.class).isEmpty());
     assertTrue(beanScope.getOptional(BlueJay.class).isEmpty());
     assertTrue(beanScope.getOptional(BirdWatcher.class).isPresent());
     assertEquals("Kiwi", beanScope.get(Bird.class).toString());
   }
 
   @Test
-  void factoryKiwiOverride() throws IOException {
-
+  void factoryKiwiOverride() {
     Config.setProperty("kiwi", "somethin");
     Config.setProperty("factory", "bird");
     Config.setProperty("watcher", "bird");
 
     final BeanScope beanScope = BeanScope.builder().build();
     assertTrue(beanScope.getOptional(BirdWatcher.class).isPresent());
+    assertTrue(beanScope.getOptional(WithAspectConditional.class).isPresent());
     assertEquals("Kiwi", beanScope.get(Bird.class).toString());
   }
 
   @Test
-  void factorySecondaryOverride() throws IOException {
-
+  void factorySecondaryOverride() {
     Config.setProperty("secondary", "somethin");
     Config.setProperty("factory", "bird");
     Config.setProperty("watcher", "bird");
@@ -110,16 +105,14 @@ void factorySecondaryOverride() throws IOException {
   }
 
   @Test
-  void qualifierTest() throws IOException {
-
+  void qualifierTest() {
     final BeanScope beanScope =
         BeanScope.builder().bean("finch", Bird.class, new StrawberryFinch()).build();
     assertTrue(beanScope.getOptional(QualifiedBirdWatcher.class).isPresent());
   }
 
   @Test
-  void metaMetaAnnotationTest() throws IOException {
-
+  void metaMetaAnnotationTest() {
     Config.setProperty("finch-time", "somethin");
     Config.setProperty("factory", "bird");
     Config.setProperty("watcher", "bird");

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

@@ -61,19 +61,14 @@ final class BeanReader {
     this.importedComponent = importedComponent && (constructor != null && constructor.isPublic());
 
     var proxyPrism = ProxyPrism.getInstanceOn(beanType);
-
     if (proxyPrism != null) {
       this.proxy = true;
       var proxyMirror = proxyPrism.value();
-
       if (!"Void".equals(proxyMirror.toString())) {
-
         conditions.readAll(APContext.asTypeElement(proxyMirror));
       }
     } else {
-
       conditions.readAll(beanType);
-
       this.proxy = false;
     }
   }