Support Kotlin suspend functions as scheduler methods

quarkusio · Apr 5, 2022 · d5b19bd · d5b19bd
1 parent 85e1f13
commit d5b19bd
Show file tree

Hide file tree

Showing 38 changed files with 514 additions and 69 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -1797,6 +1797,21 @@
                 <artifactId>quarkus-undertow-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-scheduler-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-scheduler-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-scheduler-kotlin</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-scheduler</artifactId>

diff --git a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.java b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.java
@@ -65,14 +65,14 @@
 import io.quarkus.scheduler.SkippedExecution;
 import io.quarkus.scheduler.SuccessfulExecution;
 import io.quarkus.scheduler.Trigger;
-import io.quarkus.scheduler.runtime.ScheduledInvoker;
-import io.quarkus.scheduler.runtime.ScheduledMethodMetadata;
-import io.quarkus.scheduler.runtime.SchedulerContext;
+import io.quarkus.scheduler.common.runtime.ScheduledInvoker;
+import io.quarkus.scheduler.common.runtime.ScheduledMethodMetadata;
+import io.quarkus.scheduler.common.runtime.SchedulerContext;
+import io.quarkus.scheduler.common.runtime.SkipConcurrentExecutionInvoker;
+import io.quarkus.scheduler.common.runtime.SkipPredicateInvoker;
+import io.quarkus.scheduler.common.runtime.StatusEmitterInvoker;
+import io.quarkus.scheduler.common.runtime.util.SchedulerUtils;
 import io.quarkus.scheduler.runtime.SchedulerRuntimeConfig;
-import io.quarkus.scheduler.runtime.SkipConcurrentExecutionInvoker;
-import io.quarkus.scheduler.runtime.SkipPredicateInvoker;
-import io.quarkus.scheduler.runtime.StatusEmitterInvoker;
-import io.quarkus.scheduler.runtime.util.SchedulerUtils;
 import io.smallrye.common.vertx.VertxContext;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;

diff --git a/extensions/scheduler/api/pom.xml b/extensions/scheduler/api/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-scheduler-parent</artifactId>
+    <version>999-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>quarkus-scheduler-api</artifactId>
+  <name>Quarkus - Scheduler - API</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-arc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-vertx</artifactId>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/...io/quarkus/scheduler/FailedExecution.java → ...io/quarkus/scheduler/FailedExecution.java b/...io/quarkus/scheduler/FailedExecution.java → ...io/quarkus/scheduler/FailedExecution.java
diff --git a/.../java/io/quarkus/scheduler/Scheduled.java → .../java/io/quarkus/scheduler/Scheduled.java b/.../java/io/quarkus/scheduler/Scheduled.java → .../java/io/quarkus/scheduler/Scheduled.java
diff --git a/...quarkus/scheduler/ScheduledExecution.java → ...quarkus/scheduler/ScheduledExecution.java b/...quarkus/scheduler/ScheduledExecution.java → ...quarkus/scheduler/ScheduledExecution.java
diff --git a/.../java/io/quarkus/scheduler/Scheduler.java → .../java/io/quarkus/scheduler/Scheduler.java b/.../java/io/quarkus/scheduler/Scheduler.java → .../java/io/quarkus/scheduler/Scheduler.java
diff --git a/...o/quarkus/scheduler/SkippedExecution.java → ...o/quarkus/scheduler/SkippedExecution.java b/...o/quarkus/scheduler/SkippedExecution.java → ...o/quarkus/scheduler/SkippedExecution.java
diff --git a/...uarkus/scheduler/SuccessfulExecution.java → ...uarkus/scheduler/SuccessfulExecution.java b/...uarkus/scheduler/SuccessfulExecution.java → ...uarkus/scheduler/SuccessfulExecution.java
diff --git a/...in/java/io/quarkus/scheduler/Trigger.java → ...in/java/io/quarkus/scheduler/Trigger.java b/...in/java/io/quarkus/scheduler/Trigger.java → ...in/java/io/quarkus/scheduler/Trigger.java
diff --git a/extensions/scheduler/common/pom.xml b/extensions/scheduler/common/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>io.quarkus</groupId>
+    <artifactId>quarkus-scheduler-parent</artifactId>
+    <version>999-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>quarkus-scheduler-common</artifactId>
+  <name>Quarkus - Scheduler - Common</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-scheduler-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.cronutils</groupId>
+      <artifactId>cron-utils</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.glassfish</groupId>
+          <artifactId>javax.el</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/...kus/scheduler/runtime/DefaultInvoker.java → ...eduler/common/runtime/DefaultInvoker.java b/...kus/scheduler/runtime/DefaultInvoker.java → ...eduler/common/runtime/DefaultInvoker.java
@@ -1,4 +1,4 @@
-package io.quarkus.scheduler.runtime;
+package io.quarkus.scheduler.common.runtime;
 
 import java.util.concurrent.CompletionStage;
 

diff --git a/...us/scheduler/runtime/DelegateInvoker.java → ...duler/common/runtime/DelegateInvoker.java b/...us/scheduler/runtime/DelegateInvoker.java → ...duler/common/runtime/DelegateInvoker.java
@@ -1,4 +1,4 @@
-package io.quarkus.scheduler.runtime;
+package io.quarkus.scheduler.common.runtime;
 
 abstract class DelegateInvoker implements ScheduledInvoker {
 

diff --git a/...s/scheduler/runtime/ScheduledInvoker.java → ...uler/common/runtime/ScheduledInvoker.java b/...s/scheduler/runtime/ScheduledInvoker.java → ...uler/common/runtime/ScheduledInvoker.java
@@ -1,4 +1,4 @@
-package io.quarkus.scheduler.runtime;
+package io.quarkus.scheduler.common.runtime;
 
 import java.util.concurrent.CompletionStage;
 

diff --git a/...uler/runtime/ScheduledMethodMetadata.java → ...mmon/runtime/ScheduledMethodMetadata.java b/...uler/runtime/ScheduledMethodMetadata.java → ...mmon/runtime/ScheduledMethodMetadata.java
@@ -1,4 +1,4 @@
-package io.quarkus.scheduler.runtime;
+package io.quarkus.scheduler.common.runtime;
 
 import java.util.List;
 
@@ -47,4 +47,4 @@ public void setSchedules(List<Scheduled> schedules) {
         this.schedules = schedules;
     }
 
-}
+}
diff --git a/...s/scheduler/runtime/SchedulerContext.java → ...uler/common/runtime/SchedulerContext.java b/...s/scheduler/runtime/SchedulerContext.java → ...uler/common/runtime/SchedulerContext.java
@@ -1,4 +1,4 @@
-package io.quarkus.scheduler.runtime;
+package io.quarkus.scheduler.common.runtime;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;

diff --git a/...ntime/SkipConcurrentExecutionInvoker.java → ...ntime/SkipConcurrentExecutionInvoker.java b/...ntime/SkipConcurrentExecutionInvoker.java → ...ntime/SkipConcurrentExecutionInvoker.java
@@ -1,4 +1,4 @@
-package io.quarkus.scheduler.runtime;
+package io.quarkus.scheduler.common.runtime;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;

diff --git a/...heduler/runtime/SkipPredicateInvoker.java → .../common/runtime/SkipPredicateInvoker.java b/...heduler/runtime/SkipPredicateInvoker.java → .../common/runtime/SkipPredicateInvoker.java
@@ -1,4 +1,4 @@
-package io.quarkus.scheduler.runtime;
+package io.quarkus.scheduler.common.runtime;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;

diff --git a/...heduler/runtime/StatusEmitterInvoker.java → .../common/runtime/StatusEmitterInvoker.java b/...heduler/runtime/StatusEmitterInvoker.java → .../common/runtime/StatusEmitterInvoker.java
@@ -1,4 +1,4 @@
-package io.quarkus.scheduler.runtime;
+package io.quarkus.scheduler.common.runtime;
 
 import java.util.concurrent.CompletionStage;
 

diff --git a/...cheduler/runtime/util/SchedulerUtils.java → ...r/common/runtime/util/SchedulerUtils.java b/...cheduler/runtime/util/SchedulerUtils.java → ...r/common/runtime/util/SchedulerUtils.java
@@ -1,4 +1,4 @@
-package io.quarkus.scheduler.runtime.util;
+package io.quarkus.scheduler.common.runtime.util;
 
 import static io.smallrye.common.expression.Expression.Flag.LENIENT_SYNTAX;
 import static io.smallrye.common.expression.Expression.Flag.NO_TRIM;

diff --git a/...nsions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/KotlinUtil.java b/...nsions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/KotlinUtil.java
@@ -0,0 +1,38 @@
+package io.quarkus.scheduler.deployment;
+
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
+
+final class KotlinUtil {
+
+    private static final Type VOID_CLASS = Type.create(SchedulerDotNames.VOID, Type.Kind.CLASS);
+
+    private KotlinUtil() {
+    }
+
+    static boolean isSuspendMethod(MethodInfo methodInfo) {
+        if (!methodInfo.parameters().isEmpty()) {
+            return methodInfo.parameters().get(methodInfo.parameters().size() - 1).name()
+                    .equals(SchedulerDotNames.CONTINUATION);
+        }
+        return false;
+    }
+
+    static Type determineReturnTypeOfSuspendMethod(MethodInfo methodInfo) {
+        Type lastParamType = methodInfo.parameters().get(methodInfo.parameters().size() - 1);
+        if (lastParamType.kind() != Type.Kind.PARAMETERIZED_TYPE) {
+            throw new IllegalStateException("Something went wrong during parameter type resolution - expected "
+                    + lastParamType + " to be a Continuation with a generic type");
+        }
+        lastParamType = lastParamType.asParameterizedType().arguments().get(0);
+        if (lastParamType.kind() != Type.Kind.WILDCARD_TYPE) {
+            throw new IllegalStateException("Something went wrong during parameter type resolution - expected "
+                    + lastParamType + " to be a Continuation with a generic type");
+        }
+        lastParamType = lastParamType.asWildcardType().superBound();
+        if (lastParamType.name().equals(SchedulerDotNames.KOTLIN_UNIT)) {
+            return VOID_CLASS;
+        }
+        return lastParamType;
+    }
+}
diff --git a/...deployment/src/main/java/io/quarkus/scheduler/deployment/ScheduledBusinessMethodItem.java b/...deployment/src/main/java/io/quarkus/scheduler/deployment/ScheduledBusinessMethodItem.java
@@ -25,7 +25,7 @@ public ScheduledBusinessMethodItem(BeanInfo bean, MethodInfo method, List<Annota
         this.method = method;
         this.schedules = schedules;
         this.nonBlocking = hasNonBlockingAnnotation || SchedulerDotNames.COMPLETION_STAGE.equals(method.returnType().name())
-                || SchedulerDotNames.UNI.equals(method.returnType().name());
+                || SchedulerDotNames.UNI.equals(method.returnType().name()) || KotlinUtil.isSuspendMethod(method);
     }
 
     /**

diff --git a/...scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerDotNames.java b/...scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerDotNames.java
@@ -18,4 +18,9 @@ class SchedulerDotNames {
     static final DotName COMPLETION_STAGE = DotName.createSimple(CompletionStage.class.getName());
     static final DotName VOID = DotName.createSimple(Void.class.getName());
 
+    static final DotName CONTINUATION = DotName.createSimple("kotlin.coroutines.Continuation");
+    static final DotName KOTLIN_UNIT = DotName.createSimple("kotlin.Unit");
+    static final DotName ABSTRACT_COROUTINE_INVOKER = DotName
+            .createSimple("io.quarkus.scheduler.kotlin.runtime.AbstractCoroutineInvoker");
+
 }