Merge pull request #7 from quarkusio/cdi-workaround

Install an ugly CDI workaround
quarkusio · Nov 23, 2023 · 8661348 · 8661348
2 parents bab9e09 + 16ed039
commit 8661348
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 2 deletions.
diff --git a/src/main/java/io/quarkus/bot/release/ReleaseAction.java b/src/main/java/io/quarkus/bot/release/ReleaseAction.java
@@ -23,6 +23,9 @@
 import io.quarkus.arc.InstanceHandle;
 import io.quarkus.bot.release.error.StatusUpdateException;
 import io.quarkus.bot.release.error.StepExecutionException;
+import io.quarkus.bot.release.step.ApproveCoreRelease;
+import io.quarkus.bot.release.step.CoreReleasePrepare;
+import io.quarkus.bot.release.step.Prerequisites;
 import io.quarkus.bot.release.step.Step;
 import io.quarkus.bot.release.step.StepHandler;
 import io.quarkus.bot.release.step.StepStatus;
@@ -40,6 +43,14 @@ public class ReleaseAction {
     @Inject
     Processes processes;
 
+    // ugly workaround...
+    @Inject
+    Prerequisites prerequisites;
+    @Inject
+    ApproveCoreRelease approveCoreRelease;
+    @Inject
+    CoreReleasePrepare coreReleasePrepare;
+
     @Action
     void startRelease(Context context, Commands commands, @Issue.Opened GHEventPayload.Issue issuePayload) throws Exception {
         GHIssue issue = issuePayload.getIssue();

diff --git a/src/main/java/io/quarkus/bot/release/step/ApproveCoreRelease.java b/src/main/java/io/quarkus/bot/release/step/ApproveCoreRelease.java
@@ -2,13 +2,16 @@
 
 import java.io.IOException;
 
+import jakarta.inject.Singleton;
+
 import org.kohsuke.github.GHIssue;
 import org.kohsuke.github.GHIssueComment;
 
 import io.quarkus.bot.release.ReleaseInformation;
 import io.quarkus.bot.release.ReleaseStatus;
 import io.quarkus.bot.release.util.Command;
 
+@Singleton
 public class ApproveCoreRelease implements StepHandler {
 
     @Override

diff --git a/src/main/java/io/quarkus/bot/release/step/CoreReleasePrepare.java b/src/main/java/io/quarkus/bot/release/step/CoreReleasePrepare.java
@@ -2,10 +2,13 @@
 
 import java.io.IOException;
 
+import jakarta.inject.Singleton;
+
 import org.kohsuke.github.GHIssue;
 
 import io.quarkus.bot.release.ReleaseInformation;
 
+@Singleton
 public class CoreReleasePrepare implements StepHandler {
 
     @Override

diff --git a/src/main/java/io/quarkus/bot/release/step/Prerequisites.java b/src/main/java/io/quarkus/bot/release/step/Prerequisites.java
@@ -6,16 +6,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.enterprise.context.Dependent;
 import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import org.kohsuke.github.GHIssue;
 
 import io.quarkus.bot.release.ReleaseInformation;
 import io.quarkus.bot.release.util.Issues;
 import io.quarkus.bot.release.util.Processes;
 
-@Dependent
+@Singleton
 public class Prerequisites implements StepHandler {
 
     @Inject

diff --git a/src/test/java/io/quarkus/bot/release/IssuesTest.java b/src/test/java/io/quarkus/bot/release/IssuesTest.java
@@ -7,6 +7,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.arc.Arc;
+import io.quarkus.bot.release.step.Prerequisites;
 import io.quarkus.bot.release.step.Step;
 import io.quarkus.bot.release.step.StepStatus;
 import io.quarkus.bot.release.util.Issues;

diff --git a/src/test/java/io/quarkus/bot/release/StepInjectionTest.java b/src/test/java/io/quarkus/bot/release/StepInjectionTest.java
@@ -0,0 +1,18 @@
+package io.quarkus.bot.release;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.arc.Arc;
+import io.quarkus.bot.release.step.Prerequisites;
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class StepInjectionTest {
+
+    @Test
+    void testStepInjection() {
+        assertThat(Arc.container().instance(Prerequisites.class).get()).isNotNull();
+    }
+}