diff --git a/src/main/java/com/carolynvs/gitallthethings/webhook/PlanTrigger.java b/src/main/java/com/carolynvs/gitallthethings/webhook/PlanTrigger.java index 3b77a6e..5e5f037 100644 --- a/src/main/java/com/carolynvs/gitallthethings/webhook/PlanTrigger.java +++ b/src/main/java/com/carolynvs/gitallthethings/webhook/PlanTrigger.java @@ -34,13 +34,11 @@ public class PlanTrigger this.bambooLinkBuilder = bambooLinkBuilder; } - public String execute(PlanKey planKey, User user, Map variables) + public String execute(PlanKey planKey, User user) { ImmutableChain plan = (ImmutableChain)cachedPlanManager.getPlanByKey(planKey); - Map params = new HashMap(); - - ExecutionRequestResult result = planExecutionManager.startManualExecution(plan, user, params, variables); + ExecutionRequestResult result = planExecutionManager.startManualExecution(plan, user, Collections.EMPTY_MAP, Collections.EMPTY_MAP); return bambooLinkBuilder.getBuildUrl(result.getPlanResultKey().toString()); } diff --git a/src/main/java/com/carolynvs/gitallthethings/webhook/PullRequestBuilder.java b/src/main/java/com/carolynvs/gitallthethings/webhook/PullRequestBuilder.java index dd9d18d..1c30838 100644 --- a/src/main/java/com/carolynvs/gitallthethings/webhook/PullRequestBuilder.java +++ b/src/main/java/com/carolynvs/gitallthethings/webhook/PullRequestBuilder.java @@ -49,12 +49,9 @@ public class PullRequestBuilder private String triggerPlan(PlanKey planKey, PullRequestEvent pullRequestEvent) { - PullRequestBuildContext buildContext = new PullRequestBuildContext(); - Map variables = buildContext.createPullRequestVariables(pullRequestEvent.PullRequest); - User triggerUser = pluginData.getAssociatedUser(planKey.toString(), pullRequestEvent); - return planTrigger.execute(planKey, triggerUser, variables); + return planTrigger.execute(planKey, triggerUser); } public PlanKey ensureBranchPlanExists(PlanKey planKey, PullRequest pullRequest)