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

#1183: Add Paged #1448

Merged
merged 7 commits into from
Sep 15, 2020
Merged

#1183: Add Paged #1448

merged 7 commits into from
Sep 15, 2020

Conversation

andreoss
Copy link
Contributor

@andreoss andreoss commented Sep 8, 2020

Per #1183

  • Extract ctor as a separate class

@andreoss andreoss marked this pull request as ready for review September 8, 2020 21:13
@codecov-commenter
Copy link

codecov-commenter commented Sep 8, 2020

Codecov Report

Merging #1448 into master will decrease coverage by 0.02%.
The diff coverage is 86.66%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1448      +/-   ##
============================================
- Coverage     89.28%   89.25%   -0.03%     
+ Complexity     1661     1660       -1     
============================================
  Files           277      278       +1     
  Lines          3965     3965              
  Branches        209      209              
============================================
- Hits           3540     3539       -1     
  Misses          392      392              
- Partials         33       34       +1     
Impacted Files Coverage Δ Complexity Δ
src/main/java/org/cactoos/iterable/Paged.java 85.71% <85.71%> (ø) 2.00 <2.00> (?)
src/main/java/org/cactoos/iterable/IterableOf.java 96.29% <100.00%> (+3.61%) 17.00 <0.00> (-2.00) ⬆️
src/main/java/org/cactoos/scalar/Solid.java 90.00% <0.00%> (-10.00%) 3.00% <0.00%> (-1.00%)

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 609333a...af979de. Read the comment docs.

@0crat
Copy link
Collaborator

0crat commented Sep 8, 2020

This pull request #1448 is assigned to @fabriciofx/z, here is why; the budget is 15 minutes, see §4; please, read §27 and when you decide to accept the changes, inform @victornoel/z (the architect) right in this ticket; if you decide that this PR should not be accepted ever, also inform the architect; this blog post will help you understand what is expected from a code reviewer; there will be no monetary reward for this job

@andreoss andreoss requested a review from victornoel September 10, 2020 14:04
@victornoel
Copy link
Collaborator

@fabriciofx can you review?

Copy link
Contributor

@fabriciofx fabriciofx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andreoss I finished my review. Can you take a look, please?

super(
new IterableOf<>(
() -> new Iterator<X>() {
private Unchecked<I> current = new Unchecked<>(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andreoss I prefer all object's attributes declared as final. As this attribute needs change, you can use AtomicReference to achieve it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@victornoel Done.

src/test/java/org/cactoos/iterable/PagedTest.java Outdated Show resolved Hide resolved
@fabriciofx
Copy link
Contributor

@andreoss it seems fine to me. @victornoel can you merge it, please?

@andreoss andreoss requested a review from victornoel September 12, 2020 18:39
@victornoel
Copy link
Collaborator

@rultor merge

@rultor
Copy link
Collaborator

rultor commented Sep 13, 2020

@rultor merge

@victornoel OK, I'll try to merge now. You can check the progress of the merge here

@rultor
Copy link
Collaborator

rultor commented Sep 13, 2020

@rultor merge

@andreoss @victornoel Oops, I failed. You can see the full log here (spent 2min)

+ git clone [email protected]:yegor256/cactoos.git repo
Cloning into 'repo'...
+ cd repo
+ git config user.email [email protected]
+ git config user.name rultor
+ '[' -z 'export '\''[email protected]:yegor256/cactoos.git'\''' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'export '\''[email protected]:yegor256/cactoos.git'\''' ';' 'export '\''pull_id=1448'\''' ';' 'export '\''[email protected]:andreoss/cactoos.git'\''' ';' 'export '\''fork_branch=issue-1183'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_title=#1183:  Add Paged'\''' ';' 'export '\''author=victornoel'\''' ';' 'pdd -f /dev/null' ';' 'mvn clean install -Pqulice --errors --settings ../settings.xml' ';' 'mvn clean site -Psite --errors --settings ../settings.xml' ';'
+ sensitive=('settings.xml')
+ rm -rf .gpg
+ cd repo
+ git remote add fork [email protected]:andreoss/cactoos.git
+ git remote update
Fetching origin
Fetching fork
From github.com:andreoss/cactoos
 * [new branch]      gh-pages   -> fork/gh-pages
 * [new branch]      issue-1183 -> fork/issue-1183
 * [new branch]      issue-1217 -> fork/issue-1217
 * [new branch]      issue-1220 -> fork/issue-1220
 * [new branch]      issue-1223 -> fork/issue-1223
 * [new branch]      issue-1261 -> fork/issue-1261
 * [new branch]      issue-1277 -> fork/issue-1277
 * [new branch]      issue-1313 -> fork/issue-1313
 * [new branch]      issue-1349 -> fork/issue-1349
 * [new branch]      issue-1349++ -> fork/issue-1349++
 * [new branch]      issue-1396 -> fork/issue-1396
 * [new branch]      issue-1406 -> fork/issue-1406
 * [new branch]      issue-1416 -> fork/issue-1416
 * [new branch]      issue-1423 -> fork/issue-1423
 * [new branch]      master     -> fork/master
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/issue-1183
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch issue-1183 from fork.
+ git checkout -B master origin/master
Switched to and reset branch 'master'
Branch master set up to track remote branch master from origin.
Your branch is up-to-date with 'origin/master'.
+ '[' false == true ']'
+ '[' false == true ']'
+ git merge --ff __rultor
Auto-merging src/test/java/org/cactoos/iterable/IterableOfTest.java
CONFLICT (content): Merge conflict in src/test/java/org/cactoos/iterable/IterableOfTest.java
Automatic merge failed; fix conflicts and then commit the result.
'cid' file is absent, container wasn't started correctly

@victornoel
Copy link
Collaborator

@andreoss there are now merge conflicts sure to other PRs being merged

@andreoss
Copy link
Contributor Author

@victornoel Fixed conflicts

@victornoel
Copy link
Collaborator

@rultor merge

@rultor
Copy link
Collaborator

rultor commented Sep 15, 2020

@rultor merge

@victornoel OK, I'll try to merge now. You can check the progress of the merge here

@rultor rultor merged commit af979de into yegor256:master Sep 15, 2020
@rultor
Copy link
Collaborator

rultor commented Sep 15, 2020

@rultor merge

@victornoel Done! FYI, the full log is here (took me 8min)

@0crat 0crat removed the 0crat/scope label Sep 15, 2020
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.

7 participants