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

#1349: Continue of refactoring of ScalarOf #1435

Merged
merged 14 commits into from
Sep 7, 2020
Merged

Conversation

andreoss
Copy link
Contributor

@andreoss andreoss commented Sep 4, 2020

Per #1349:

  • Add ScalarOfSupplier
  • Add ScalarOfCallable
  • Remove ScalarOf

@codecov-commenter
Copy link

codecov-commenter commented Sep 4, 2020

Codecov Report

Merging #1435 into master will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1435      +/-   ##
============================================
+ Coverage     89.81%   89.82%   +0.01%     
- Complexity     1681     1683       +2     
============================================
  Files           279      281       +2     
  Lines          4014     4018       +4     
  Branches        211      211              
============================================
+ Hits           3605     3609       +4     
  Misses          376      376              
  Partials         33       33              
Impacted Files Coverage Δ Complexity Δ
...main/java/org/cactoos/scalar/ScalarOfCallable.java 100.00% <100.00%> (ø) 1.00 <1.00> (?)
...main/java/org/cactoos/scalar/ScalarOfSupplier.java 100.00% <100.00%> (ø) 1.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 b79bca9...5870d73. Read the comment docs.

@andreoss andreoss marked this pull request as ready for review September 4, 2020 20:13
@victornoel
Copy link
Collaborator

@0crat assign @fabriciofx

@0crat
Copy link
Collaborator

0crat commented Sep 5, 2020

@0crat assign @fabriciofx (here)

@victornoel This pull request #1435 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

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 can you look it, please?

@andreoss
Copy link
Contributor Author

andreoss commented Sep 6, 2020

@fabriciofx Please have a look

@fabriciofx
Copy link
Contributor

@andreoss it looks fine to me, but now it has a conflict. Can you fix it?

@andreoss
Copy link
Contributor Author

andreoss commented Sep 6, 2020

@fabriciofx Conflicts fixed.

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 please, can you check it again? Thanks!

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

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

Copy link
Collaborator

@victornoel victornoel left a comment

Choose a reason for hiding this comment

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

@andreoss let's keep ScalarOf anyway (taking a Scalar and extending ScalarEnvelope), even though it seems superfluous. And let's use it in ThreadsTest and TimedTest, there is no reason to rely on the concept of Callable there I believe.

@victornoel
Copy link
Collaborator

@andreoss scratch that, let me think a bit about it, sorry

@victornoel
Copy link
Collaborator

@andreoss ok, so:

  • let's keep ScalarOf
  • but let's use lambdas directly it in ThreadsTest and TimedTest, there is no reason to rely on the concept of Callable or use ScalarOf there I believe.

Btw ScalarOf will be improved as part of #1445 that's why we should keep it.

@andreoss
Copy link
Contributor Author

andreoss commented Sep 7, 2020

@victornoel TimedTest uses CallableOf (not ScalarOfCallable), but it's unnecessary too. Do you want CallableOf removed from this test?

@victornoel
Copy link
Collaborator

@andreoss yes, that's what I meant, let's remove unneeded code :)

@andreoss
Copy link
Contributor Author

andreoss commented Sep 7, 2020

@victornoel Restored ScalarOf, removed CallableOf from tests

@victornoel
Copy link
Collaborator

@andreoss thank you for your patience

@victornoel
Copy link
Collaborator

@rultor merge

@rultor
Copy link
Collaborator

rultor commented Sep 7, 2020

@rultor merge

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

@rultor rultor merged commit 5870d73 into yegor256:master Sep 7, 2020
@rultor
Copy link
Collaborator

rultor commented Sep 7, 2020

@rultor merge

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

@0crat 0crat removed the 0crat/scope label Sep 7, 2020
@andreoss andreoss mentioned this pull request Sep 13, 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.

6 participants