From ccbf9a5892584ac0df8d30f703ead2b3a92eb2e7 Mon Sep 17 00:00:00 2001 From: The-Huginn Date: Fri, 1 Dec 2023 15:29:56 +0100 Subject: [PATCH] Add LotteryConfig as parameter to Executable#execute method, resolves #26 --- src/main/java/org/jboss/JiraIssueLotteryCommand.java | 5 ++--- src/main/java/org/jboss/processing/Executable.java | 6 ++++-- src/main/java/org/jboss/processing/NewIssueCollector.java | 7 +++---- .../java/org/jboss/processing/StaleIssueCollector.java | 7 ++++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/jboss/JiraIssueLotteryCommand.java b/src/main/java/org/jboss/JiraIssueLotteryCommand.java index 4d7138b..1484a97 100644 --- a/src/main/java/org/jboss/JiraIssueLotteryCommand.java +++ b/src/main/java/org/jboss/JiraIssueLotteryCommand.java @@ -1,6 +1,5 @@ package org.jboss; -import io.quarkus.logging.Log; import jakarta.annotation.PostConstruct; import jakarta.inject.Inject; import org.apache.camel.CamelContext; @@ -9,8 +8,8 @@ import org.apache.camel.component.jira.JiraConfiguration; import org.apache.camel.component.jira.JiraEndpoint; import org.jboss.config.JiraLotteryAppConfig; -import org.jboss.processing.NewIssueCollector; import org.jboss.processing.IssueProcessor; +import org.jboss.processing.NewIssueCollector; import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; @@ -54,7 +53,7 @@ public void run() { NewIssueCollector newIssueCollector = NewIssueCollector.getInstance(jiraEndpoint); Exchange exchange = jiraEndpoint.createExchange(); try { - newIssueCollector.execute().getIssueStates().forEach(Log::info); + newIssueCollector.execute(null); new IssueProcessor(jiraEndpoint, "JBEAP-25900").process(exchange); } catch (Exception e) { throw new RuntimeException(e); diff --git a/src/main/java/org/jboss/processing/Executable.java b/src/main/java/org/jboss/processing/Executable.java index fe48847..ec78012 100644 --- a/src/main/java/org/jboss/processing/Executable.java +++ b/src/main/java/org/jboss/processing/Executable.java @@ -1,9 +1,11 @@ package org.jboss.processing; +import org.jboss.config.LotteryConfig; + /** * Even if it is basically the same as {@code java.lang.Runnable} interface, * due to interference we need a separate interface mimicking it. */ -public interface Executable { - T execute() throws Exception; +public interface Executable { + void execute(LotteryConfig lotteryConfig) throws Exception; } diff --git a/src/main/java/org/jboss/processing/NewIssueCollector.java b/src/main/java/org/jboss/processing/NewIssueCollector.java index e009458..8a1afbd 100644 --- a/src/main/java/org/jboss/processing/NewIssueCollector.java +++ b/src/main/java/org/jboss/processing/NewIssueCollector.java @@ -4,8 +4,8 @@ import io.quarkus.logging.Log; import org.apache.camel.component.jira.JiraEndpoint; import org.apache.camel.component.jira.consumer.NewIssuesConsumer; +import org.jboss.config.LotteryConfig; import org.jboss.jql.JqlBuilder; -import org.jboss.processing.state.EveryIssueState; import org.jboss.processing.state.SingleIssueState; import org.jboss.query.IssueStatus; import org.jboss.query.SearchQuery; @@ -13,7 +13,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -public class NewIssueCollector extends NewIssuesConsumer implements Executable { +public class NewIssueCollector extends NewIssuesConsumer implements Executable { private static final State state = new State(); @@ -38,9 +38,8 @@ public static NewIssueCollector getInstance(JiraEndpoint jiraEndpoint) { } @Override - public EveryIssueState execute() throws Exception { + public void execute(LotteryConfig lotteryConfig) throws Exception { int issuesCount = doPoll(); Log.infof("Found number of issues %d", issuesCount); - return new EveryIssueState(state.issueStates); } } diff --git a/src/main/java/org/jboss/processing/StaleIssueCollector.java b/src/main/java/org/jboss/processing/StaleIssueCollector.java index d2a1186..c2662a6 100644 --- a/src/main/java/org/jboss/processing/StaleIssueCollector.java +++ b/src/main/java/org/jboss/processing/StaleIssueCollector.java @@ -4,6 +4,7 @@ import io.quarkus.logging.Log; import org.apache.camel.component.jira.JiraEndpoint; import org.apache.camel.component.jira.consumer.NewIssuesConsumer; +import org.jboss.config.LotteryConfig; import org.jboss.jql.JqlBuilder; import org.jboss.processing.state.EveryIssueState; import org.jboss.processing.state.SingleIssueState; @@ -13,7 +14,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -public class StaleIssueCollector extends NewIssuesConsumer implements Executable { +public class StaleIssueCollector extends NewIssuesConsumer implements Executable { private static final State state = new State(); @@ -39,9 +40,9 @@ public static StaleIssueCollector getInstance(JiraEndpoint jiraEndpoint) { } @Override - public EveryIssueState execute() throws Exception { + public void execute(LotteryConfig lotteryConfig) throws Exception { int issuesCount = doPoll(); Log.infof("Found number of issues %d", issuesCount); - return new EveryIssueState(state.issueStates); + new EveryIssueState(state.issueStates); } }