From d5f65eaf7fd912d014b56cbc71612e7f70903b1d Mon Sep 17 00:00:00 2001 From: Rodrigo Brito Date: Tue, 25 Feb 2020 22:41:36 -0300 Subject: [PATCH 1/9] refactor: rename method m5 to m6 --- src/p9/A.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p9/A.java b/src/p9/A.java index 9462a7b..4e69037 100644 --- a/src/p9/A.java +++ b/src/p9/A.java @@ -1,7 +1,7 @@ package p9; public class A { - public void m5() { + public void m6() { int value = 5; System.out.println("m" + value); } From df40282ed3f2c9ad524a4a29d23f9845e480e4ba Mon Sep 17 00:00:00 2001 From: Rodrigo Brito Date: Sun, 1 Mar 2020 09:01:09 -0300 Subject: [PATCH 2/9] refactor: extract interface IA from class A --- src/p1/A.java | 2 +- src/p1/IA.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 src/p1/IA.java diff --git a/src/p1/A.java b/src/p1/A.java index 7754461..7cc6721 100644 --- a/src/p1/A.java +++ b/src/p1/A.java @@ -1,6 +1,6 @@ package p1; -public class A { +public class A implements IA { public void m1() { System.out.println("m1"); } diff --git a/src/p1/IA.java b/src/p1/IA.java new file mode 100644 index 0000000..3b06a95 --- /dev/null +++ b/src/p1/IA.java @@ -0,0 +1,7 @@ +package p1; + +public interface IA { + void m1(); + + void m2(); +} \ No newline at end of file From 7fb69f999f1a27fc4425fa62c9ef98bff1557c87 Mon Sep 17 00:00:00 2001 From: Rodrigo Brito Date: Sun, 1 Mar 2020 09:02:12 -0300 Subject: [PATCH 3/9] refactor: extract method isEven from method m1 --- src/p2/A.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/p2/A.java b/src/p2/A.java index e9682f9..32c506d 100644 --- a/src/p2/A.java +++ b/src/p2/A.java @@ -1,8 +1,12 @@ package p2; public class A { + public boolean isEven(int v) { + return v % 2 == 0; + } + public void m1(int v) { - if (v % 2 == 0) { + if (this.isEven(v)) { System.out.println("even"); } else { System.out.println("odd"); From a490c14b9b7283983e95ea5b06fb6a84e167333b Mon Sep 17 00:00:00 2001 From: Rodrigo Brito Date: Sun, 1 Mar 2020 09:07:19 -0300 Subject: [PATCH 4/9] refactor: extract superclass B from class A --- src/p3/A.java | 6 +----- src/p3/B.java | 7 +++++++ 2 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 src/p3/B.java diff --git a/src/p3/A.java b/src/p3/A.java index 8d5f425..0f70ba8 100644 --- a/src/p3/A.java +++ b/src/p3/A.java @@ -1,10 +1,6 @@ package p3; -public class A { - public void m1() { - System.out.println("m1"); - } - +public class A extends B { public void m2() { System.out.println("m2"); } diff --git a/src/p3/B.java b/src/p3/B.java new file mode 100644 index 0000000..35812fc --- /dev/null +++ b/src/p3/B.java @@ -0,0 +1,7 @@ +package p3; + +public class B { + public void m1() { + System.out.println("m1"); + } +} From fa7d2e50f3db2223ac1ff9f0626ac450be0b44aa Mon Sep 17 00:00:00 2001 From: Rodrigo Brito Date: Sun, 1 Mar 2020 09:08:17 -0300 Subject: [PATCH 5/9] refactor: move method m5 from class A to class B --- src/p4/A.java | 5 ----- src/p4/B.java | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/p4/A.java b/src/p4/A.java index ccf2169..22d21e4 100644 --- a/src/p4/A.java +++ b/src/p4/A.java @@ -1,11 +1,6 @@ package p4; public class A { - public void m5() { - int number = 5; - System.out.println("m" + number); - } - public void m2() { System.out.println("m2"); } diff --git a/src/p4/B.java b/src/p4/B.java index 8a6ca45..697baac 100644 --- a/src/p4/B.java +++ b/src/p4/B.java @@ -1,6 +1,11 @@ package p4; public class B { + public void m5() { + float number = 5; + System.out.println("m" + number); + } + public void m3() { System.out.println("m3"); } From 8e71a8c1ae552141b4af85c3c6696b40f628c09b Mon Sep 17 00:00:00 2001 From: Rodrigo Brito Date: Sun, 1 Mar 2020 09:09:19 -0300 Subject: [PATCH 6/9] refactor: move class C from package p5 to package p6 --- src/p5/C.java | 10 ---------- src/p6/C.java | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 src/p6/C.java diff --git a/src/p5/C.java b/src/p5/C.java index b42a009..a778ddf 100644 --- a/src/p5/C.java +++ b/src/p5/C.java @@ -1,11 +1 @@ package p5; - -public class C { - public void m3() { - System.out.println("m3"); - } - - public void m4() { - System.out.println("m4"); - } -} diff --git a/src/p6/C.java b/src/p6/C.java new file mode 100644 index 0000000..3c81d1d --- /dev/null +++ b/src/p6/C.java @@ -0,0 +1,11 @@ +package p6; + +public class C { + public void m3() { + System.out.println("m3"); + } + + public void m4() { + System.out.println("m4"); + } +} \ No newline at end of file From fd80144f92f27c4c6cf69d9a9ea7a4ef73843f28 Mon Sep 17 00:00:00 2001 From: Rodrigo Brito Date: Sun, 1 Mar 2020 09:10:19 -0300 Subject: [PATCH 7/9] refactor: pull up method m2 from class B to class A --- src/p7/A.java | 4 ++++ src/p7/B.java | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/p7/A.java b/src/p7/A.java index 6ed897a..30ff7cb 100644 --- a/src/p7/A.java +++ b/src/p7/A.java @@ -4,4 +4,8 @@ public class A { public void m1() { System.out.println("m1"); } + + public void m2() { + System.out.println("m2"); + } } diff --git a/src/p7/B.java b/src/p7/B.java index 5165389..c04b51b 100644 --- a/src/p7/B.java +++ b/src/p7/B.java @@ -1,10 +1,6 @@ package p7; public class B extends A { - public void m2() { - System.out.println("m2"); - } - public void m3() { System.out.println("m3"); } From 0db982ec3d9e0c384f914075940bee1ede8c92f5 Mon Sep 17 00:00:00 2001 From: Rodrigo Brito Date: Sun, 1 Mar 2020 09:49:30 -0300 Subject: [PATCH 8/9] refactor: push down method m2 from class A to class B --- .github/workflows/actions.yaml | 2 +- src/p8/A.java | 4 ---- src/p8/B.java | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml index 11ce90f..982d84a 100644 --- a/.github/workflows/actions.yaml +++ b/.github/workflows/actions.yaml @@ -15,4 +15,4 @@ jobs: LANGUAGE: Java REV_BEFORE: ${{ github.event.pull_request.base.sha }} REV_AFTER: ${{ github.event.pull_request.head.sha }} - uses: rodrigo-brito/refactoring-aware-review@action + uses: rodrigo-brito/refactoring-aware-diff@action diff --git a/src/p8/A.java b/src/p8/A.java index f9f8e3e..e96040c 100644 --- a/src/p8/A.java +++ b/src/p8/A.java @@ -4,8 +4,4 @@ public class A { public void m1() { System.out.println("m1"); } - - public void m2() { - System.out.println("m2"); - } } diff --git a/src/p8/B.java b/src/p8/B.java index f206fe3..be81aec 100644 --- a/src/p8/B.java +++ b/src/p8/B.java @@ -1,6 +1,10 @@ package p8; public class B extends A { + public void m2() { + System.out.println("m2"); + } + public void m3() { System.out.println("m3"); } From 759714087536237ace85cd9045abe78044b4ad26 Mon Sep 17 00:00:00 2001 From: Rodrigo Brito Date: Sun, 18 Jul 2021 08:55:56 -0300 Subject: [PATCH 9/9] feat(m6): include method m6 --- src/p4/A.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/p4/A.java b/src/p4/A.java index 22d21e4..066cac1 100644 --- a/src/p4/A.java +++ b/src/p4/A.java @@ -1,6 +1,10 @@ package p4; public class A { + public void m6() { + System.out.println("m6"); + } + public void m2() { System.out.println("m2"); }