From a223cd139ea5f946b612c7195d29d7e292f1a275 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 17 Jan 2024 19:04:47 -0500 Subject: [PATCH] Gratuitous use of Guice --- .../plugins/github_branch_source/GitHubSCMNavigator.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java index 48e36db8e..7c135b679 100644 --- a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java +++ b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java @@ -38,6 +38,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.AbortException; import hudson.Extension; +import hudson.ExtensionList; import hudson.RestrictedSince; import hudson.Util; import hudson.console.HyperlinkNote; @@ -48,7 +49,6 @@ import hudson.model.TaskListener; import hudson.util.FormValidation; import hudson.util.ListBoxModel; -import jakarta.inject.Inject; import java.io.FileNotFoundException; import java.io.IOException; import java.net.MalformedURLException; @@ -1716,9 +1716,6 @@ public static class DescriptorImpl extends SCMNavigatorDescriptor implements Ico @RestrictedSince("2.2.0") public static final boolean defaultBuildForkPRHead = false; - @Inject - private GitHubSCMSource.DescriptorImpl delegate; - /** {@inheritDoc} */ @Override public String getPronoun() { @@ -1894,7 +1891,8 @@ public boolean test(SCMTraitDescriptor scmTraitDescriptor) { @SuppressWarnings("unused") // jelly @NonNull public List>> getTraitsDefaults() { - return new ArrayList<>(delegate.getTraitsDefaults()); + return new ArrayList<>(ExtensionList.lookupSingleton(GitHubSCMSource.DescriptorImpl.class) + .getTraitsDefaults()); } static {