feat: enable constructor injection of NamedDynamoDbTable (quarkiverse…

…#1469)
scrocquesel · Nov 17, 2024 · d6837ae · d6837ae
1 parent f1fcf4c
commit d6837ae
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 23 deletions.
diff --git a/...java/io/quarkus/amazon/dynamodb/enhanced/deployment/DynamodbEnhancedDbTableProcessor.java b/...java/io/quarkus/amazon/dynamodb/enhanced/deployment/DynamodbEnhancedDbTableProcessor.java
@@ -15,9 +15,10 @@
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.ClassType;
 import org.jboss.jandex.DotName;
-import org.jboss.jandex.FieldInfo;
 import org.jboss.jandex.IndexView;
+import org.jboss.jandex.MethodParameterInfo;
 import org.jboss.jandex.ParameterizedType;
+import org.jboss.jandex.Type;
 
 import io.quarkus.amazon.common.deployment.RequireAmazonClientInjectionBuildItem;
 import io.quarkus.amazon.common.runtime.ClientUtil;
@@ -72,31 +73,50 @@ void discoverDynamoDbTable(CombinedIndexBuildItem combinedIndexBuildItem,
         IndexView index = combinedIndexBuildItem.getIndex();
         Collection<AnnotationInstance> ais = index.getAnnotations(DotNames.DYNAMODB_NAMED_TABLE);
         for (AnnotationInstance ano : ais) {
+            String tableName = ano.value().asString();
+            Type targetType = null;
+
             if (ano.target().kind().equals(Kind.FIELD)) {
-                FieldInfo field = ano.target().asField();
-                String tableName = ano.value().asString();
-                DotName beanClassName = field.type().asParameterizedType().arguments().get(0).name();
-
-                ClassInfo beanClass = index.getClassByName(beanClassName);
-                if (beanClass.annotation(DotNames.DYNAMODB_ENHANCED_BEAN) == null
-                        && beanClass.annotation(DotNames.DYNAMODB_ENHANCED_IMMUTABLE) == null) {
-                    throw new DeploymentException(String
-                            .format("'%s' must be bean annotated with @DynamoDbBean or @DynamoDbImmutable", beanClassName));
+                targetType = ano.target().asField().type();
+            } else if (ano.target().kind().equals(Kind.METHOD_PARAMETER)) {
+                MethodParameterInfo mpi = ano.target().asMethodParameter();
+                if (mpi.method().isConstructor()) {
+                    targetType = mpi.type();
                 }
+            }
+
+            if (targetType == null) {
+                continue;
+            }
+
+            DotName beanClassName = targetType.asParameterizedType().arguments().get(0).name();
+            DotName dbTableClassName = targetType.name();
+
+            ClassInfo beanClass = index.getClassByName(beanClassName);
 
-                if (DotNames.DYNAMODB_TABLE.equals(field.type().name())) {
-                    if (syncSeen.add(Map.entry(tableName, beanClassName))) {
-                        tables.produce(new DynamodbEnhancedTableBuildItem(tableName, beanClassName,
-                                DotNames.DYNAMODB_ENHANCED_CLIENT, DYNAMODB_ENHANCED_CLIENT_TABLE_METHOD,
-                                DotNames.DYNAMODB_TABLE));
-                    }
+            if (beanClass == null) {
+                throw new DeploymentException(String
+                        .format("'%s' is not in the Jandex index", beanClassName));
+            }
+
+            if (beanClass.annotation(DotNames.DYNAMODB_ENHANCED_BEAN) == null
+                    && beanClass.annotation(DotNames.DYNAMODB_ENHANCED_IMMUTABLE) == null) {
+                throw new DeploymentException(String
+                        .format("'%s' must be bean annotated with @DynamoDbBean or @DynamoDbImmutable", beanClassName));
+            }
+
+            if (DotNames.DYNAMODB_TABLE.equals(dbTableClassName)) {
+                if (syncSeen.add(Map.entry(tableName, beanClassName))) {
+                    tables.produce(new DynamodbEnhancedTableBuildItem(tableName, beanClassName,
+                            DotNames.DYNAMODB_ENHANCED_CLIENT, DYNAMODB_ENHANCED_CLIENT_TABLE_METHOD,
+                            DotNames.DYNAMODB_TABLE));
                 }
-                if (DotNames.DYNAMODB_ASYNC_TABLE.equals(field.type().name())) {
-                    if (asyncSeen.add(Map.entry(tableName, beanClassName))) {
-                        tables.produce(new DynamodbEnhancedTableBuildItem(tableName, beanClassName,
-                                DotNames.DYNAMODB_ENHANCED_ASYNC_CLIENT, DYNAMODB_ENHANCED_ASYNC_CLIENT_TABLE_METHOD,
-                                DotNames.DYNAMODB_ASYNC_TABLE));
-                    }
+            }
+            if (DotNames.DYNAMODB_ASYNC_TABLE.equals(dbTableClassName)) {
+                if (asyncSeen.add(Map.entry(tableName, beanClassName))) {
+                    tables.produce(new DynamodbEnhancedTableBuildItem(tableName, beanClassName,
+                            DotNames.DYNAMODB_ENHANCED_ASYNC_CLIENT, DYNAMODB_ENHANCED_ASYNC_CLIENT_TABLE_METHOD,
+                            DotNames.DYNAMODB_ASYNC_TABLE));
                 }
             }
         }

diff --git a/...rkus/amazon/dynamodb/enhanced/deployment/DynamoDBEnhancedDbTableConstructorInjection.java b/...rkus/amazon/dynamodb/enhanced/deployment/DynamoDBEnhancedDbTableConstructorInjection.java
@@ -0,0 +1,21 @@
+package io.quarkus.amazon.dynamodb.enhanced.deployment;
+
+import jakarta.enterprise.context.ApplicationScoped;
+
+import io.quarkus.amazon.dynamodb.enhanced.runtime.NamedDynamoDbTable;
+import software.amazon.awssdk.enhanced.dynamodb.DynamoDbTable;
+
+@ApplicationScoped
+public class DynamoDBEnhancedDbTableConstructorInjection {
+
+    private DynamoDbTable<DynamoDBExampleTableEntry> syncTable;
+
+    DynamoDBEnhancedDbTableConstructorInjection(
+            @NamedDynamoDbTable("sync") DynamoDbTable<DynamoDBExampleTableEntry> syncTable) {
+        this.syncTable = syncTable;
+    }
+
+    public DynamoDbTable<DynamoDBExampleTableEntry> getSyncTable() {
+        return syncTable;
+    }
+}
diff --git a/...test/java/io/quarkus/amazon/dynamodb/enhanced/deployment/DynamoDbEnhancedDbTableTest.java b/...test/java/io/quarkus/amazon/dynamodb/enhanced/deployment/DynamoDbEnhancedDbTableTest.java
@@ -38,10 +38,14 @@ public class DynamoDbEnhancedDbTableTest {
     @Inject
     DynamoDbAsyncTable<DynamoDBExampleTableEntry> asyncTableOther;
 
+    @Inject
+    DynamoDBEnhancedDbTableConstructorInjection constructorInjection;
+
     @RegisterExtension
     static final QuarkusUnitTest config = new QuarkusUnitTest()
             .withApplicationRoot((jar) -> jar
                     .addClass(DynamoDBExampleTableEntry.class)
+                    .addClass(DynamoDBEnhancedDbTableConstructorInjection.class)
                     .addAsResource("full-config.properties", "application.properties"));
 
     @Test
@@ -53,5 +57,6 @@ public void test() {
         assertEquals("async", asyncTable.tableName());
         assertEquals("async", asyncTableDuplicate.tableName());
         assertEquals("async-other", asyncTableOther.tableName());
+        assertEquals("sync", constructorInjection.getSyncTable().tableName());
     }
 }
diff --git a/...runtime/src/main/java/io/quarkus/amazon/dynamodb/enhanced/runtime/NamedDynamoDbTable.java b/...runtime/src/main/java/io/quarkus/amazon/dynamodb/enhanced/runtime/NamedDynamoDbTable.java
@@ -1,6 +1,7 @@
 package io.quarkus.amazon.dynamodb.enhanced.runtime;
 
 import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Documented;
@@ -12,7 +13,7 @@
 /**
  * Specification of DynamoDb table to be injected.
  */
-@Target({ FIELD })
+@Target({ FIELD, PARAMETER })
 @Retention(RUNTIME)
 @Qualifier
 @Documented