Skip to content

Fix FindBugs warnings about StashBuildTrigger#job being null#86

Merged
jakub-bochenski merged 1 commit intojenkinsci:masterfrom
proski:job-not-null
Jun 6, 2019
Merged

Fix FindBugs warnings about StashBuildTrigger#job being null#86
jakub-bochenski merged 1 commit intojenkinsci:masterfrom
proski:job-not-null

Conversation

@proski
Copy link

@proski proski commented Apr 22, 2019

Move startJob() and its dependencies from StashBuildTrigger to
StashRepository. StashBuildTrigger objects can have a null job field, but
it's impossible for StashRepository, which is instantiated once a
non-null job is passed to StashBuildTrigger#start().

@proski
Copy link
Author

proski commented Apr 23, 2019

The FindBugs issue causing the failure will be fixed when #67 is merged. This PR will be rebased.

@proski
Copy link
Author

proski commented Apr 24, 2019

Rebased, no FindBugs issues anymore.

@jakub-bochenski jakub-bochenski requested a review from jimklimov May 31, 2019 14:50
@jakub-bochenski
Copy link

Tried to resolve conflicts but I broke it. Can you take a look @proski ?

@proski
Copy link
Author

proski commented Jun 3, 2019

Tried to resolve conflicts but I broke it. Can you take a look @proski ?

No problem, PRs that move code don't play well with others.

I've rebased the PR. All the tests from StashBuildTriggerTest.java have been moved to StashRepositoryTest.java, so StashBuildTriggerTest.java is gone. No need to worry, #93 will add that file again.

@jakub-bochenski
Copy link

... and there are conflicts again because I merged #98 :)

Move startJob() and its dependencies from StashBuildTrigger to
StashRepository. StashBuildTrigger objects can have a null job field, but
it's impossible for StashRepository, which is instantiated once a
non-null job is passed to StashBuildTrigger#start().

Move corresponding unit tests from StashBuildTriggerTest to
StashRepositoryTest.
@proski
Copy link
Author

proski commented Jun 4, 2019

... and there are conflicts again because I merged #98 :)

No problem, resolved.

@jakub-bochenski jakub-bochenski merged commit 14c630d into jenkinsci:master Jun 6, 2019
@proski proski deleted the job-not-null branch June 6, 2019 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants