Use builder pattern for ChuckerInterceptor in a backwards compatible way#491
Merged
Conversation
vbuberen
approved these changes
Nov 3, 2020
vbuberen
left a comment
Collaborator
There was a problem hiding this comment.
You are right, we still need to merge other commits into 3.x as well as a part of 3.4.0 update. As to the strategy I believe that you should use Rebase and merge here to save the history.
With different PRs we will make branches develop and 3.x different anyway and it will add complexity with next merges into 3.x in future. I assume we will have to do 2 PRs (into develop and into 3.x) in future or play around with cherry-picking if something needs to land in both branches.
Contributor
Author
|
Changed branch target in order to make |
vbuberen
approved these changes
Nov 5, 2020
vbuberen
left a comment
Collaborator
There was a problem hiding this comment.
Tested - ReplaceWith works fine.
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📄 Context
It is a follow up to the discussion in #483. It also addresses #462 and #466.
📝 Changes
I added a builder pattern in a
3.xcompatible way. This way users will be informed of changes and have more time to adjust their code. Unfortunately,ReplaceWithis not ideal.importsdo no work properly with default arguments but IMHO it is a minor inconvenience (basically, onlyChuckerCollectorneeds to be manually imported). Also, it will create builder with all fields. I've tried to split constructor into different ones with differentReplaceWithstrategies but it is not possible due to named arguments and source compatibility in Kotlin.📎 Related PR
#462
🚫 Breaking
No.
🛠️ How to test
You can check if
ReplaceWithworks correctly.⏱️ Next steps
Prepare
3.4.0release and3.xbranch.