Removing uses of Guice #28
Conversation
|
|
||
| /** Placeholder for getRequiredContext. */ | ||
| @StepContextParameter private transient Run<?,?> run; | ||
| @StepContextParameter private transient TaskListener listener; |
There was a problem hiding this comment.
One of the evil tricks that is no longer necessary.
|
|
||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| @Inject(optional=true) private transient SleepStep step; | ||
| @StepContextParameter private transient TaskListener listener; | ||
| private transient final SleepStep step; |
There was a problem hiding this comment.
Alternately could have kept just the result of step.unit.toMillis(step.time).
|
This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation. |
| return getContext().get(TaskListener.class); | ||
| } catch (Exception x) { | ||
| LOGGER.log(Level.WARNING, null, x); | ||
| return TaskListener.NULL; |
There was a problem hiding this comment.
When using injection, there were two ways StepContext.get errors were handled: AbstractStepImpl.start would throw up the exception, which we could still do in a StepExecution constructor; and AbstractStepExecutionImpl.onResume would send the exception to StepContext.onFailure (but presumably leave the field null, without preventing the rest of an onResume override from running—perhaps the root cause of JENKINS-34021 and the still-open JENKINS-37486).
This idiom is more verbose but clearer—the step gets to decide what to do.
Alternately, we could change onResume to throw Exception. (Would still be binary-compatible.) FlowExecutionList.ItemListenerImpl.onLoaded would then need to catch exceptions and call StepContext.onFailure. Like AbstractStepExecutionImpl, this would rely on transient fields holding the contextual object; the improvement would be that a failure in StepContext.get would stop anything else in onResume (such as setupTimer here) from running.
There was a problem hiding this comment.
Filed JENKINS-40161 to track the latter proposal.
| @StepContextParameter private transient Launcher launcher; | ||
| @StepContextParameter private transient TaskListener listener; | ||
| @SuppressFBWarnings(value="SE_TRANSIENT_FIELD_NOT_RESTORED", justification="Only used when starting.") | ||
| private transient final SimpleBuildStep delegate; |
There was a problem hiding this comment.
Have the option of simplifying StepExecution state, especially in cases where the Step had only one field.
|
🐝 |
|
|
||
| public static class Execution extends AbstractStepExecutionImpl { | ||
| public static class Execution extends StepExecution { |
There was a problem hiding this comment.
Likely to cause JENKINS-40909.
Downstream of jenkinsci/workflow-step-api-plugin#15.
@reviewbybees