Skip to content

Commit

Permalink
Implement TriggeredItem from ComputedFolder (#264)
Browse files Browse the repository at this point in the history
* Implement `TriggeredItem` from `ComputedFolder`
  • Loading branch information
jglick authored Oct 7, 2022
1 parent 7f97913 commit 6df9a0e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 145 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<!-- remember to change the io.jenkins.tools.bom artifact when changing this -->
<jenkins.version>2.361.1</jenkins.version>
<jenkins.version>2.372</jenkins.version>
<no-test-jar>false</no-test-jar>
<hpi.compatibleSinceVersion>5.2</hpi.compatibleSinceVersion>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

import com.cloudbees.hudson.plugins.folder.AbstractFolder;
import com.thoughtworks.xstream.XStreamException;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.ExtensionList;
import hudson.Util;
Expand Down Expand Up @@ -80,6 +79,7 @@
import javax.servlet.ServletException;
import jenkins.model.Jenkins;
import jenkins.model.ParameterizedJobMixIn;
import jenkins.triggers.TriggeredItem;
import jenkins.util.TimeDuration;
import net.jcip.annotations.GuardedBy;
import net.sf.json.JSONObject;
Expand All @@ -105,7 +105,7 @@
* @since 4.11-beta-1
*/
@SuppressWarnings({"unchecked", "rawtypes", "deprecation"}) // generics mistakes in various places; BuildableItem defines deprecated methods (and @SW on those overrides does not seem to work)
public abstract class ComputedFolder<I extends TopLevelItem> extends AbstractFolder<I> implements BuildableItem, Queue.FlyweightTask {
public abstract class ComputedFolder<I extends TopLevelItem> extends AbstractFolder<I> implements BuildableItem, TriggeredItem, Queue.FlyweightTask {

/**
* Our logger.
Expand Down Expand Up @@ -494,6 +494,7 @@ protected final String getSuccessfulDestination() {
}
}

@Override
public Map<TriggerDescriptor,Trigger<?>> getTriggers() {
return triggers.toMap();
}
Expand Down

This file was deleted.

0 comments on commit 6df9a0e

Please sign in to comment.