Skip to content

Remove some no-op overrides #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dwnusbaum merged 1 commit into from
Jan 23, 2019
Merged

Remove some no-op overrides #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions src/main/java/org/jenkinsci/plugins/workflow/job/AfterRestartTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import hudson.model.Node;
import hudson.model.Queue;
import hudson.model.Queue.FlyweightTask;
import hudson.model.queue.CauseOfBlockage;
import java.io.IOException;
import org.kohsuke.stapler.export.ExportedBean;

Expand All @@ -53,18 +52,6 @@ class AfterRestartTask implements Queue.FlyweightTask, Queue.TransientTask {
return getClass().hashCode() ^ run.hashCode();
}

// TODO delete after baseline has https://github.com/jenkinsci/jenkins/pull/3099
@Override public boolean isBuildBlocked() {
return getCauseOfBlockage() != null;
}

// TODO delete after baseline has https://github.com/jenkinsci/jenkins/pull/3099
@Deprecated
@Override public String getWhyBlocked() {
CauseOfBlockage causeOfBlockage = getCauseOfBlockage();
return causeOfBlockage != null ? causeOfBlockage.getShortDescription() : null;
}

@Override public String getName() {
return getDisplayName();
}
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,18 +302,6 @@ public void setQuietPeriod(Integer seconds) throws IOException {
save();
}

// TODO delete after baseline has https://github.com/jenkinsci/jenkins/pull/3099
@Override public boolean isBuildBlocked() {
return getCauseOfBlockage() != null;
}

// TODO delete after baseline has https://github.com/jenkinsci/jenkins/pull/3099
@Deprecated
@Override public String getWhyBlocked() {
CauseOfBlockage c = getCauseOfBlockage();
return c != null ? c.getShortDescription() : null;
}

@Override public CauseOfBlockage getCauseOfBlockage() {
if (isLogUpdated() && !isConcurrentBuild()) {
WorkflowRun lastBuild = getLastBuild();
Expand Down