Skip to content
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.

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

2.x: cleanup newline separation, some field namings #6150

Merged
merged 2 commits into from
Aug 9, 2018

Conversation

akarnokd
Copy link
Member

@akarnokd akarnokd commented Aug 9, 2018

This PR cleans up some source code style inconsistencies:

  • Rename some atomic-subscription fields to upstream (left out from 2.x: Cleaunp - rename fields to upstream and downstream #6129).
  • Make sure @Test methods are separated by at most one empty newline
  • Make sure a closing curly brace and an annotation is only followed by one empty newline.
  • Add a test that checks for the above.

@akarnokd akarnokd added this to the 2.2 backlog milestone Aug 9, 2018
@codecov
Copy link

codecov bot commented Aug 9, 2018

Codecov Report

Merging #6150 into 2.x will increase coverage by 0.02%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##               2.x    #6150      +/-   ##
===========================================
+ Coverage     98.2%   98.23%   +0.02%     
- Complexity    6197     6199       +2     
===========================================
  Files          667      667              
  Lines        44857    44857              
  Branches      6213     6213              
===========================================
+ Hits         44054    44064      +10     
+ Misses         260      253       -7     
+ Partials       543      540       -3
Impacted Files Coverage Δ Complexity Δ
...nternal/operators/observable/ObservableReplay.java 98.63% <ø> (ø) 23 <0> (ø) ⬇️
.../operators/observable/ObservableOnErrorReturn.java 100% <ø> (ø) 2 <0> (ø) ⬇️
...nternal/operators/single/SingleInternalHelper.java 100% <ø> (ø) 5 <0> (ø) ⬇️
...internal/operators/observable/ObservableCount.java 100% <ø> (ø) 2 <0> (ø) ⬇️
...rnal/operators/flowable/FlowableDematerialize.java 100% <ø> (ø) 2 <0> (ø) ⬇️
...ernal/operators/observable/ObservableSkipLast.java 100% <ø> (ø) 2 <0> (ø) ⬇️
...internal/operators/flowable/FlowableConcatMap.java 97.74% <ø> (-0.38%) 6 <0> (ø)
.../operators/mixed/CompletableAndThenObservable.java 100% <ø> (ø) 2 <0> (ø) ⬇️
...al/operators/observable/ObservableSampleTimed.java 100% <ø> (ø) 3 <0> (ø) ⬇️
...rnal/operators/observable/ObservableSkipWhile.java 100% <ø> (ø) 2 <0> (ø) ⬇️
... and 121 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 10f8c67...12f1a6b. Read the comment docs.

@akarnokd akarnokd merged commit 0e7b8ea into ReactiveX:2.x Aug 9, 2018
@akarnokd akarnokd deleted the Cleanup0809 branch August 9, 2018 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants