From 338066e42ddcaad478e388e4309397eb9b267d34 Mon Sep 17 00:00:00 2001 From: Mustafiz Date: Thu, 21 Aug 2025 19:17:55 +0600 Subject: [PATCH 1/8] Add Student.java withgetters, setters, and constructors --- src/main/java/com/thealgorithms/student.java | 37 ++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/main/java/com/thealgorithms/student.java diff --git a/src/main/java/com/thealgorithms/student.java b/src/main/java/com/thealgorithms/student.java new file mode 100644 index 000000000000..410c4e19190f --- /dev/null +++ b/src/main/java/com/thealgorithms/student.java @@ -0,0 +1,37 @@ +package com.thealgorithms; + +public class student { + private String name; + private int age; + private String grade; + + public student(String name, int age, String grade) { + this.name = name; + this.age = age; + this.grade = grade; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } +} From 8cee71ab54014aec4ce1a380f24faff3da554e0e Mon Sep 17 00:00:00 2001 From: Mustafiz Date: Thu, 21 Aug 2025 19:22:12 +0600 Subject: [PATCH 2/8] Add Calculator.java with arithmetic methods --- .../java/com/thealgorithms/calculator.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/main/java/com/thealgorithms/calculator.java diff --git a/src/main/java/com/thealgorithms/calculator.java b/src/main/java/com/thealgorithms/calculator.java new file mode 100644 index 000000000000..bcbd809837c4 --- /dev/null +++ b/src/main/java/com/thealgorithms/calculator.java @@ -0,0 +1,23 @@ +package com.thealgorithms; + +public class calculator { + public int add(int a, int b) { + return a + b; + } + + public int subtract(int a, int b) { + return a - b; + } + + public int multiply(int a, int b) { + return a * b; + } + + public double divide(double a, double b) { + if (b == 0) { + throw new IllegalArgumentException("Division by zero is not allowed"); + } + return a / b; + } + +} From a0bc0a4db853f578393ecad1660f573dae3f099e Mon Sep 17 00:00:00 2001 From: Mustafiz Date: Thu, 21 Aug 2025 19:37:38 +0600 Subject: [PATCH 3/8] change in Calculator.java on main --- src/main/java/com/thealgorithms/calculator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/thealgorithms/calculator.java b/src/main/java/com/thealgorithms/calculator.java index bcbd809837c4..bcc0acb2331b 100644 --- a/src/main/java/com/thealgorithms/calculator.java +++ b/src/main/java/com/thealgorithms/calculator.java @@ -1,9 +1,9 @@ package com.thealgorithms; public class calculator { - public int add(int a, int b) { - return a + b; - } +public int add(int a, int b) { + return a + b + 1; // change on the main branch. +} public int subtract(int a, int b) { return a - b; From 674b4290cd1c7b96f9dddf4b26c73293d468d48d Mon Sep 17 00:00:00 2001 From: Mustafiz Date: Thu, 21 Aug 2025 19:57:11 +0600 Subject: [PATCH 4/8] Modified calc --- src/main/java/com/thealgorithms/calculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/thealgorithms/calculator.java b/src/main/java/com/thealgorithms/calculator.java index bcc0acb2331b..e3deb52bf0f8 100644 --- a/src/main/java/com/thealgorithms/calculator.java +++ b/src/main/java/com/thealgorithms/calculator.java @@ -2,7 +2,7 @@ public class calculator { public int add(int a, int b) { - return a + b + 1; // change on the main branch. + return a + b + 1; } public int subtract(int a, int b) { From 1286ca025258df60b6e4ce6baaf3d77fcabc2758 Mon Sep 17 00:00:00 2001 From: Mustafiz Date: Thu, 21 Aug 2025 19:58:47 +0600 Subject: [PATCH 5/8] Modified add method in feature/calculator --- src/main/java/com/thealgorithms/calculator.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/thealgorithms/calculator.java b/src/main/java/com/thealgorithms/calculator.java index bcbd809837c4..c15b764df6e9 100644 --- a/src/main/java/com/thealgorithms/calculator.java +++ b/src/main/java/com/thealgorithms/calculator.java @@ -2,8 +2,10 @@ public class calculator { public int add(int a, int b) { - return a + b; - } + System.out.println("Adding numbers"); + return a + b; // different change +} + public int subtract(int a, int b) { return a - b; From 58597ec5afeb2995229d4d32d2e4fbd09a949d12 Mon Sep 17 00:00:00 2001 From: Mustafiz Date: Thu, 21 Aug 2025 20:03:45 +0600 Subject: [PATCH 6/8] fix(calculator): correct add method --- src/main/java/com/thealgorithms/calculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/thealgorithms/calculator.java b/src/main/java/com/thealgorithms/calculator.java index c15b764df6e9..d1da4ecba498 100644 --- a/src/main/java/com/thealgorithms/calculator.java +++ b/src/main/java/com/thealgorithms/calculator.java @@ -3,7 +3,7 @@ public class calculator { public int add(int a, int b) { System.out.println("Adding numbers"); - return a + b; // different change + return a + b+1; // different change } From 6546248500e4a46ed0f523490ddb6c068923830a Mon Sep 17 00:00:00 2001 From: Mustafiz Date: Thu, 21 Aug 2025 20:16:11 +0600 Subject: [PATCH 7/8] Add Grade.java --- src/main/java/com/thealgorithms/Grade.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/main/java/com/thealgorithms/Grade.java diff --git a/src/main/java/com/thealgorithms/Grade.java b/src/main/java/com/thealgorithms/Grade.java new file mode 100644 index 000000000000..4bf972aea5de --- /dev/null +++ b/src/main/java/com/thealgorithms/Grade.java @@ -0,0 +1,13 @@ +package com.thealgorithms; + +public class Grade { + public String getLetterGrade(int score) { + if (score >= 90) { + return "A"; + } else if (score >= 80) { + return "B"; + } else { + return "C"; + } + } +} From 625737d4612a67de10ea530a5b89fe8d6a1ae198 Mon Sep 17 00:00:00 2001 From: Mustafiz Date: Thu, 21 Aug 2025 20:31:00 +0600 Subject: [PATCH 8/8] GitHub Actions (CI/CD) --- .github/workflows/build.yml | 40 ++++++++----------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c21d1a09eb5..df4965800303 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,40 +1,16 @@ -name: Build -on: [push, pull_request] +name: Java CI -permissions: - contents: read +on: [push] jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v2 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v2 with: - java-version: 21 - distribution: 'temurin' - - name: Build with Maven - run: mvn --batch-mode --update-snapshots verify - - name: Upload coverage to codecov (tokenless) - if: >- - github.event_name == 'pull_request' && - github.event.pull_request.head.repo.full_name != github.repository - uses: codecov/codecov-action@v5 - with: - fail_ci_if_error: true - - name: Upload coverage to codecov (with token) - if: > - github.repository == 'TheAlgorithms/Java' && - (github.event_name != 'pull_request' || - github.event.pull_request.head.repo.full_name == github.repository) - uses: codecov/codecov-action@v5 - with: - token: ${{ secrets.CODECOV_TOKEN }} - fail_ci_if_error: true - - name: Checkstyle - run: mvn checkstyle:check - - name: SpotBugs - run: mvn spotbugs:check - - name: PMD - run: mvn pmd:check + java-version: "17" + distribution: "temurin" + - name: Build with javac + run: javac *.java