Alexa SkillStreamHandler subclass check for RequestStreamHandler

quarkusio · Mar 19, 2020 · d9d2d37 · d9d2d37
1 parent 08972b0
commit d9d2d37
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -140,6 +140,7 @@
         <aws-lambda-serverless-java-container.version>1.3.1</aws-lambda-serverless-java-container.version>
         <aws-xray.version>2.4.0</aws-xray.version>
         <awssdk.version>2.10.70</awssdk.version>
+        <aws-asksdk.version>2.28.0</aws-asksdk.version>
         <azure-functions-java-library.version>1.3.0</azure-functions-java-library.version>
         <kotlin.version>1.3.61</kotlin.version>
         <dekorate.version>0.11.3</dekorate.version>

diff --git a/...a/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java b/...a/deployment/src/main/java/io/quarkus/amazon/lambda/deployment/AmazonLambdaProcessor.java
@@ -50,6 +50,7 @@ public final class AmazonLambdaProcessor {
 
     private static final DotName REQUEST_HANDLER = DotName.createSimple(RequestHandler.class.getName());
     private static final DotName REQUEST_STREAM_HANDLER = DotName.createSimple(RequestStreamHandler.class.getName());
+    private static final DotName SKILL_STREAM_HANDLER = DotName.createSimple("com.amazon.ask.SkillStreamHandler");
 
     private static final DotName NAMED = DotName.createSimple(Named.class.getName());
     private static final Logger log = Logger.getLogger(AmazonLambdaProcessor.class);
@@ -70,11 +71,13 @@ List<AmazonLambdaBuildItem> discover(CombinedIndexBuildItem combinedIndexBuildIt
             BuildProducer<AdditionalBeanBuildItem> additionalBeanBuildItemBuildProducer,
             BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClassBuildItemBuildProducer) throws BuildException {
+
         Collection<ClassInfo> allKnownImplementors = combinedIndexBuildItem.getIndex().getAllKnownImplementors(REQUEST_HANDLER);
-        Collection<ClassInfo> allKnownStreamImplementors = combinedIndexBuildItem.getIndex()
-                .getAllKnownImplementors(REQUEST_STREAM_HANDLER);
+        allKnownImplementors.addAll(combinedIndexBuildItem.getIndex()
+                .getAllKnownImplementors(REQUEST_STREAM_HANDLER));
+        allKnownImplementors.addAll(combinedIndexBuildItem.getIndex()
+                .getAllKnownImplementors(SKILL_STREAM_HANDLER));
 
-        allKnownImplementors.addAll(allKnownStreamImplementors);
         if (allKnownImplementors.size() > 0 && providedLambda.isPresent()) {
             throw new BuildException(
                     "Multiple handler classes.  You have a custom handler class and the " + providedLambda.get().getProvider()