[FIXED JENKINS-39553] Make GitHub plugin BuildableItem aware #153
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ | |
| import hudson.Util; | ||
| import hudson.model.AbstractProject; | ||
| import hudson.model.EnvironmentContributor; | ||
| import hudson.model.Item; | ||
| import hudson.model.Job; | ||
| import hudson.model.TaskListener; | ||
| import hudson.plugins.git.GitSCM; | ||
|
|
@@ -36,41 +37,57 @@ public abstract class GitHubRepositoryNameContributor implements ExtensionPoint | |
| * Looks at the definition of {@link AbstractProject} and list up the related github repositories, | ||
| * then puts them into the collection. | ||
| * | ||
| * @deprecated Use {@link #parseAssociatedNames(Item, Collection)} | ||
| */ | ||
| @Deprecated | ||
| public void parseAssociatedNames(AbstractProject<?, ?> job, Collection<GitHubRepositoryName> result) { | ||
| parseAssociatedNames((Item) job, result); | ||
| } | ||
|
|
||
| /** | ||
| * Looks at the definition of {@link Job} and list up the related github repositories, | ||
| * then puts them into the collection. | ||
| * @deprecated Use {@link #parseAssociatedNames(Item, Collection)} | ||
| */ | ||
| @Deprecated | ||
| public /*abstract*/ void parseAssociatedNames(Job<?, ?> job, Collection<GitHubRepositoryName> result) { | ||
| parseAssociatedNames((Item) job, result); | ||
| } | ||
|
|
||
| /** | ||
| * Looks at the definition of {@link Item} and list up the related github repositories, | ||
| * then puts them into the collection. | ||
| * @param item the item. | ||
| * @param result the collection to add repository names to | ||
| * @since FIXME | ||
| */ | ||
| @SuppressWarnings("deprecation") | ||
| public /*abstract*/ void parseAssociatedNames(Item item, Collection<GitHubRepositoryName> result) { | ||
| if (Util.isOverridden( | ||
| GitHubRepositoryNameContributor.class, | ||
| getClass(), | ||
| "parseAssociatedNames", | ||
| Job.class, | ||
| Collection.class | ||
| )) { | ||
| // if this impl is legacy, it cannot contribute to non-jobs, so not an error | ||
| if (item instanceof Job) { | ||
| parseAssociatedNames((Job<?, ?>) item, result); | ||
|
Member
There was a problem hiding this comment. Maybe put a warning on the FINE level? Just in case somebody needs to debug the compat issue |
||
| } | ||
| } else if (Util.isOverridden( | ||
| GitHubRepositoryNameContributor.class, | ||
| getClass(), | ||
| "parseAssociatedNames", | ||
| AbstractProject.class, | ||
| Collection.class | ||
| )) { | ||
| // if this impl is legacy, it cannot contribute to non-projects, so not an error | ||
| if (item instanceof AbstractProject) { | ||
| parseAssociatedNames((AbstractProject<?, ?>) item, result); | ||
| } | ||
| } else { | ||
| throw new AbstractMethodError("you must override the new overload of parseAssociatedNames"); | ||
|
Member
There was a problem hiding this comment. 🐛 So it will expose the error when somebody uses Predicates like IMHO there should be one of the following fixes:
Member
Author
There was a problem hiding this comment. Actually this is more a design error in the original API. These methods taking the collection should actually have been If you have an old implementation, then you will have overridden If you have a new implementation, then you are supposed to override If we had these SPI methods as
Member
Author
There was a problem hiding this comment. Also please check the previous implementation of The exception will only be thrown if you have an implementation that does not override any To clarify for @KostyaSha this is not a bug just migration of existing pattern |
||
| } | ||
| } | ||
|
|
||
| public static ExtensionList<GitHubRepositoryNameContributor> all() { | ||
|
|
@@ -82,13 +99,21 @@ public static ExtensionList<GitHubRepositoryNameContributor> all() { | |
| */ | ||
| @Deprecated | ||
| public static Collection<GitHubRepositoryName> parseAssociatedNames(AbstractProject<?, ?> job) { | ||
| return parseAssociatedNames((Item) job); | ||
| } | ||
|
|
||
| /** | ||
| * @deprecated Use {@link #parseAssociatedNames(Item)} | ||
| */ | ||
| @Deprecated | ||
| public static Collection<GitHubRepositoryName> parseAssociatedNames(Job<?, ?> job) { | ||
| return parseAssociatedNames((Item) job); | ||
| } | ||
|
|
||
| public static Collection<GitHubRepositoryName> parseAssociatedNames(Item item) { | ||
| Set<GitHubRepositoryName> names = new HashSet<GitHubRepositoryName>(); | ||
| for (GitHubRepositoryNameContributor c : all()) { | ||
| c.parseAssociatedNames(item, names); | ||
| } | ||
| return names; | ||
| } | ||
|
|
@@ -99,11 +124,11 @@ public static Collection<GitHubRepositoryName> parseAssociatedNames(Job<?, ?> jo | |
| @Extension | ||
| public static class FromSCM extends GitHubRepositoryNameContributor { | ||
| @Override | ||
| public void parseAssociatedNames(Item item, Collection<GitHubRepositoryName> result) { | ||
| SCMTriggerItem triggerItem = SCMTriggerItems.asSCMTriggerItem(item); | ||
| EnvVars envVars = item instanceof Job ? buildEnv((Job) item) : new EnvVars(); | ||
| if (triggerItem != null) { | ||
| for (SCM scm : triggerItem.getSCMs()) { | ||
| addRepositories(scm, envVars, result); | ||
| } | ||
| } | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@since