Refactored ProtectedMethod pattern #548

Vitaly-Protasov · 2020-07-20T15:06:28Z

Solved in case of #528

acheshkov · 2020-07-21T09:15:47Z

@rultor merge

rultor · 2020-07-21T09:28:42Z

@rultor merge

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

rultor · 2020-07-21T09:30:25Z

@rultor merge

@Vitaly-Protasov @acheshkov Oops, I failed. You can see the full log here (spent 2min)

+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'export '\''head=git@github.com:cqfn/aibolit.git'\''' ';' 'export '\''pull_id=548'\''' ';' 'export '\''fork=git@github.com:cqfn/aibolit.git'\''' ';' 'export '\''fork_branch=issue_528_11'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_title=Refactored ProtectedMethod pattern'\''' ';' 'export '\''author=acheshkov'\''' ';' 'python3 -m pip install twine' ';' make ';'
+ sensitive=()
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:cqfn/aibolit.git
+ git remote update
Fetching origin
Fetching fork
From github.com:cqfn/aibolit
 * [new branch]      acheshkov-patch-1 -> fork/acheshkov-patch-1
 * [new branch]      acheshkov-scope-update -> fork/acheshkov-scope-update
 * [new branch]      issue-295  -> fork/issue-295
 * [new branch]      issue-310  -> fork/issue-310
 * [new branch]      issue-404  -> fork/issue-404
 * [new branch]      issue-418  -> fork/issue-418
 * [new branch]      issue-419  -> fork/issue-419
 * [new branch]      issue-533  -> fork/issue-533
 * [new branch]      issue-550  -> fork/issue-550
 * [new branch]      issue_528_1 -> fork/issue_528_1
 * [new branch]      issue_528_10 -> fork/issue_528_10
 * [new branch]      issue_528_11 -> fork/issue_528_11
 * [new branch]      issue_528_12 -> fork/issue_528_12
 * [new branch]      issue_528_18 -> fork/issue_528_18
 * [new branch]      issue_528_3 -> fork/issue_528_3
 * [new branch]      issue_528_7 -> fork/issue_528_7
 * [new branch]      java_files_custom_dir -> fork/java_files_custom_dir
 * [new branch]      master     -> fork/master
 * [new branch]      taks-258   -> fork/taks-258
 * [new branch]      task-258   -> fork/task-258
 * [new branch]      upstream/java_files_custom_dir -> fork/upstream/java_files_custom_dir
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ wc -l
++ git show-branch __rultor
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/issue_528_11
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch issue_528_11 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 aibolit/patterns/protected_method/protected_method.py
CONFLICT (content): Merge conflict in aibolit/patterns/protected_method/protected_method.py
Automatic merge failed; fix conflicts and then commit the result.
'cid' file is absent, container wasn't started correctly

aravij · 2020-07-21T10:30:39Z

aibolit/patterns/protected_method/protected_method.py

+    Once we find a protected method in a class, it's a pattern.
+    '''
+    def _check_protected(self, node: ASTNode) -> bool:
+        if all(type in node.modifiers for type in ['protected']):


You can simply return result of all.

It seams like you simply looking if 'protected' is in modifiers. You may check it directly.

@aravij What do you mean by checking it directly?

something like this

return 'protected' in node.modifiers

acheshkov · 2020-07-21T15:32:47Z

@rultor merge

rultor · 2020-07-21T15:34:22Z

@rultor merge

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

rultor · 2020-07-21T15:36:16Z

@rultor merge

@Vitaly-Protasov @acheshkov Oops, I failed. You can see the full log here (spent 2min)

+ '[' -z 'export '\''head=git@github.com:cqfn/aibolit.git'\''' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'export '\''head=git@github.com:cqfn/aibolit.git'\''' ';' 'export '\''pull_id=548'\''' ';' 'export '\''fork=git@github.com:cqfn/aibolit.git'\''' ';' 'export '\''fork_branch=issue_528_11'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_title=Refactored ProtectedMethod pattern'\''' ';' 'export '\''author=acheshkov'\''' ';' 'python3 -m pip install twine' ';' make ';'
+ sensitive=()
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:cqfn/aibolit.git
+ git remote update
Fetching origin
Fetching fork
From github.com:cqfn/aibolit
 * [new branch]      acheshkov-patch-1 -> fork/acheshkov-patch-1
 * [new branch]      acheshkov-scope-update -> fork/acheshkov-scope-update
 * [new branch]      issue-295  -> fork/issue-295
 * [new branch]      issue-310  -> fork/issue-310
 * [new branch]      issue-404  -> fork/issue-404
 * [new branch]      issue-418  -> fork/issue-418
 * [new branch]      issue-419  -> fork/issue-419
 * [new branch]      issue-533  -> fork/issue-533
 * [new branch]      issue-550  -> fork/issue-550
 * [new branch]      issue_528_1 -> fork/issue_528_1
 * [new branch]      issue_528_10 -> fork/issue_528_10
 * [new branch]      issue_528_11 -> fork/issue_528_11
 * [new branch]      issue_528_18 -> fork/issue_528_18
 * [new branch]      issue_528_3 -> fork/issue_528_3
 * [new branch]      issue_528_7 -> fork/issue_528_7
 * [new branch]      java_files_custom_dir -> fork/java_files_custom_dir
 * [new branch]      master     -> fork/master
 * [new branch]      taks-258   -> fork/taks-258
 * [new branch]      task-258   -> fork/task-258
 * [new branch]      upstream/java_files_custom_dir -> fork/upstream/java_files_custom_dir
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ wc -l
++ git show-branch __rultor
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/issue_528_11
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch issue_528_11 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 aibolit/patterns/protected_method/protected_method.py
CONFLICT (content): Merge conflict in aibolit/patterns/protected_method/protected_method.py
Automatic merge failed; fix conflicts and then commit the result.
'cid' file is absent, container wasn't started correctly

acheshkov · 2020-07-22T07:20:13Z

@rultor merge

rultor · 2020-07-22T07:45:07Z

@rultor merge

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

rultor · 2020-07-22T07:46:52Z

@rultor merge

@Vitaly-Protasov @acheshkov Oops, I failed. You can see the full log here (spent 2min)

+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'export '\''head=git@github.com:cqfn/aibolit.git'\''' ';' 'export '\''pull_id=548'\''' ';' 'export '\''fork=git@github.com:cqfn/aibolit.git'\''' ';' 'export '\''fork_branch=issue_528_11'\''' ';' 'export '\''head_branch=master'\''' ';' 'export '\''pull_title=Refactored ProtectedMethod pattern'\''' ';' 'export '\''author=acheshkov'\''' ';' 'python3 -m pip install twine' ';' make ';'
+ sensitive=()
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:cqfn/aibolit.git
+ git remote update
Fetching origin
Fetching fork
From github.com:cqfn/aibolit
 * [new branch]      acheshkov-patch-1 -> fork/acheshkov-patch-1
 * [new branch]      acheshkov-scope-update -> fork/acheshkov-scope-update
 * [new branch]      issue-295  -> fork/issue-295
 * [new branch]      issue-310  -> fork/issue-310
 * [new branch]      issue-404  -> fork/issue-404
 * [new branch]      issue-418  -> fork/issue-418
 * [new branch]      issue-419  -> fork/issue-419
 * [new branch]      issue-533  -> fork/issue-533
 * [new branch]      issue-550  -> fork/issue-550
 * [new branch]      issue_528_1 -> fork/issue_528_1
 * [new branch]      issue_528_10 -> fork/issue_528_10
 * [new branch]      issue_528_11 -> fork/issue_528_11
 * [new branch]      issue_528_18 -> fork/issue_528_18
 * [new branch]      issue_528_3 -> fork/issue_528_3
 * [new branch]      issue_528_7 -> fork/issue_528_7
 * [new branch]      issue_528_8 -> fork/issue_528_8
 * [new branch]      java_files_custom_dir -> fork/java_files_custom_dir
 * [new branch]      master     -> fork/master
 * [new branch]      taks-258   -> fork/taks-258
 * [new branch]      task-258   -> fork/task-258
 * [new branch]      upstream/java_files_custom_dir -> fork/upstream/java_files_custom_dir
+ 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_528_11
Switched to a new branch '__rultor'
Branch __rultor set up to track remote branch issue_528_11 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 aibolit/patterns/protected_method/protected_method.py
CONFLICT (content): Merge conflict in aibolit/patterns/protected_method/protected_method.py
Automatic merge failed; fix conflicts and then commit the result.
'cid' file is absent, container wasn't started correctly

acheshkov · 2020-07-22T08:09:03Z

@rultor merge

rultor · 2020-07-22T08:09:48Z

@rultor merge

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

rultor · 2020-07-22T08:25:06Z

@rultor merge

@acheshkov Done! FYI, the full log is here (took me 15min)

Vitaly-Protasov added 4 commits July 20, 2020 18:08

refactored

c194f25

fixed

4afdb57

fixed extra print

66cb462

Merge branch 'master' of https://github.com/cqfn/aibolit

9d3129c

acheshkov previously approved these changes Jul 21, 2020

View reviewed changes

aravij reviewed Jul 21, 2020

View reviewed changes

Vitaly-Protasov added 2 commits July 21, 2020 13:33

Merge branch 'master' into issue_528_11

e0d4347

fixed

5fe301c

Vitaly-Protasov dismissed acheshkov’s stale review via 5fe301c July 21, 2020 10:37

Vitaly-Protasov added 2 commits July 21, 2020 13:40

fixed

00a6366

fixed with comment

247e3d5

Vitaly-Protasov added 2 commits July 21, 2020 22:33

Merge branch 'master' of https://github.com/cqfn/aibolit

151f2c2

fixed

4abd33f

aravij previously approved these changes Jul 22, 2020

View reviewed changes

Vitaly-Protasov added 2 commits July 22, 2020 10:46

Merge branch 'master' of https://github.com/cqfn/aibolit

9bdeea0

resolved conflict

8a7a039

Vitaly-Protasov dismissed aravij’s stale review via 8a7a039 July 22, 2020 07:52

aravij self-requested a review July 22, 2020 07:54

aravij approved these changes Jul 22, 2020

View reviewed changes

rultor merged commit 8a7a039 into master Jul 22, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactored ProtectedMethod pattern #548

Refactored ProtectedMethod pattern #548

Vitaly-Protasov commented Jul 20, 2020

acheshkov commented Jul 21, 2020

rultor commented Jul 21, 2020

rultor commented Jul 21, 2020

aravij Jul 21, 2020

aravij Jul 21, 2020

Vitaly-Protasov Jul 21, 2020

aravij Jul 21, 2020

Vitaly-Protasov Jul 21, 2020

acheshkov commented Jul 21, 2020

rultor commented Jul 21, 2020

rultor commented Jul 21, 2020

acheshkov commented Jul 22, 2020

rultor commented Jul 22, 2020

rultor commented Jul 22, 2020

acheshkov commented Jul 22, 2020

rultor commented Jul 22, 2020

rultor commented Jul 22, 2020

Refactored ProtectedMethod pattern #548

Refactored ProtectedMethod pattern #548

Conversation

Vitaly-Protasov commented Jul 20, 2020

acheshkov commented Jul 21, 2020

rultor commented Jul 21, 2020

rultor commented Jul 21, 2020

aravij Jul 21, 2020

Choose a reason for hiding this comment

aravij Jul 21, 2020

Choose a reason for hiding this comment

Vitaly-Protasov Jul 21, 2020

Choose a reason for hiding this comment

aravij Jul 21, 2020

Choose a reason for hiding this comment

Vitaly-Protasov Jul 21, 2020

Choose a reason for hiding this comment

acheshkov commented Jul 21, 2020

rultor commented Jul 21, 2020

rultor commented Jul 21, 2020

acheshkov commented Jul 22, 2020

rultor commented Jul 22, 2020

rultor commented Jul 22, 2020

acheshkov commented Jul 22, 2020

rultor commented Jul 22, 2020

rultor commented Jul 22, 2020