From 6dd9fcb551443f7498b0ea492c9bc35e3a56ca8c Mon Sep 17 00:00:00 2001 From: HadiSharifi Date: Thu, 9 Jul 2026 10:36:57 +0330 Subject: [PATCH 1/4] refactor: renamed multiply to product --- src/main/java/com/ap/BasicCalculator.java | 2 +- src/main/java/com/ap/Calculator.java | 2 +- src/main/java/com/ap/MathHelper.java | 2 +- src/main/java/com/ap/ReportGenerator.java | 2 +- src/test/java/CalculatorTest.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ap/BasicCalculator.java b/src/main/java/com/ap/BasicCalculator.java index 4852598..321d9ff 100644 --- a/src/main/java/com/ap/BasicCalculator.java +++ b/src/main/java/com/ap/BasicCalculator.java @@ -12,7 +12,7 @@ public class BasicCalculator implements Calculator { } @Override - public int multiply(int a, int b) { + public int product(int a, int b) { return a * b; } } \ No newline at end of file diff --git a/src/main/java/com/ap/Calculator.java b/src/main/java/com/ap/Calculator.java index 0220dcb..e9e53df 100644 --- a/src/main/java/com/ap/Calculator.java +++ b/src/main/java/com/ap/Calculator.java @@ -3,5 +3,5 @@ package com.ap; public interface Calculator { int add(int a, int b); int subtract(int a, int b); - int multiply(int a, int b); + int product(int a, int b); } \ No newline at end of file diff --git a/src/main/java/com/ap/MathHelper.java b/src/main/java/com/ap/MathHelper.java index d624768..405afae 100644 --- a/src/main/java/com/ap/MathHelper.java +++ b/src/main/java/com/ap/MathHelper.java @@ -1,7 +1,7 @@ package com.ap; public class MathHelper { - public static int multiply(int a, int b) { + public static int product(int a, int b) { return a * b; } diff --git a/src/main/java/com/ap/ReportGenerator.java b/src/main/java/com/ap/ReportGenerator.java index 2201769..16282d5 100644 --- a/src/main/java/com/ap/ReportGenerator.java +++ b/src/main/java/com/ap/ReportGenerator.java @@ -5,7 +5,7 @@ public class ReportGenerator { Calculator calc = new BasicCalculator(); int sum = calc.add(x, y); int diff = calc.subtract(x, y); - int product = calc.multiply(x, y); + int product = calc.product(x, y); int max = MathHelper.max(x, y); System.out.println("Sum: " + sum + ", Diff: " + diff + ", Product: " + product + ", Max: " + max); diff --git a/src/test/java/CalculatorTest.java b/src/test/java/CalculatorTest.java index 93d2bbf..65c4056 100644 --- a/src/test/java/CalculatorTest.java +++ b/src/test/java/CalculatorTest.java @@ -19,8 +19,8 @@ public class CalculatorTest { } @Test - void testMultiply() { + void testProduct() { Calculator calc = new BasicCalculator(); - assertEquals(6, calc.multiply(2, 3)); + assertEquals(6, calc.product(2, 3)); } } \ No newline at end of file -- 2.54.0 From 5097265ee3e9d2f94e28437d6d994e174bdad0a9 Mon Sep 17 00:00:00 2001 From: HadiSharifi Date: Thu, 9 Jul 2026 10:40:55 +0330 Subject: [PATCH 2/4] multiply method body changed --- src/main/java/com/ap/BasicCalculator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ap/BasicCalculator.java b/src/main/java/com/ap/BasicCalculator.java index 4852598..7e9e91f 100644 --- a/src/main/java/com/ap/BasicCalculator.java +++ b/src/main/java/com/ap/BasicCalculator.java @@ -13,6 +13,7 @@ public class BasicCalculator implements Calculator { @Override public int multiply(int a, int b) { - return a * b; + int m = a * b; + return m; } } \ No newline at end of file -- 2.54.0 From 1fcb015b92792c984d440823a6c9dd18274eefe5 Mon Sep 17 00:00:00 2001 From: HadiSharifi Date: Thu, 9 Jul 2026 10:49:30 +0330 Subject: [PATCH 3/4] remove Calculator interface --- src/main/java/com/ap/Calculator.java | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 src/main/java/com/ap/Calculator.java diff --git a/src/main/java/com/ap/Calculator.java b/src/main/java/com/ap/Calculator.java deleted file mode 100644 index e9e53df..0000000 --- a/src/main/java/com/ap/Calculator.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.ap; - -public interface Calculator { - int add(int a, int b); - int subtract(int a, int b); - int product(int a, int b); -} \ No newline at end of file -- 2.54.0 From 125e476d5192ce95d74a4a991985d0cea3740b44 Mon Sep 17 00:00:00 2001 From: HadiSharifi Date: Thu, 9 Jul 2026 10:52:21 +0330 Subject: [PATCH 4/4] add calculateArea() method --- src/main/java/com/ap/BasicCalculator.java | 5 +++++ src/main/java/com/ap/Calculator.java | 1 + 2 files changed, 6 insertions(+) diff --git a/src/main/java/com/ap/BasicCalculator.java b/src/main/java/com/ap/BasicCalculator.java index 321d9ff..dc7220e 100644 --- a/src/main/java/com/ap/BasicCalculator.java +++ b/src/main/java/com/ap/BasicCalculator.java @@ -15,4 +15,9 @@ public class BasicCalculator implements Calculator { public int product(int a, int b) { return a * b; } + + @Override + public double calculateArea(double a, double b) { + return a * b; + } } \ No newline at end of file diff --git a/src/main/java/com/ap/Calculator.java b/src/main/java/com/ap/Calculator.java index e9e53df..7e75f89 100644 --- a/src/main/java/com/ap/Calculator.java +++ b/src/main/java/com/ap/Calculator.java @@ -4,4 +4,5 @@ public interface Calculator { int add(int a, int b); int subtract(int a, int b); int product(int a, int b); + double calculateArea(double a, double b); } \ No newline at end of file -- 2.54.0