Edit project after review

Author: Antojkv

.gitignore

@@ -15,10 +15,6 @@ out/
 bin/
 *.tmp
 
-# OS
-.DS_Store
-Thumbs.db
-
 # Logs
 *.log
 logs/

app/.gitignore

@@ -1,2 +1,17 @@
+.PHONY: build run run-dist clean test check
+
+build:
+	./gradlew build
+
+run:
+	./gradlew run
+
 run-dist:
+	./gradlew installDist
 	./build/install/app/bin/app
+
+clean:
+	./gradlew clean
+
+check:
+	./gradlew checkstyleMain

app/Makefile

@@ -1,5 +1,4 @@
 plugins {
-    id("java")
     id("application")
     id("se.patrikerdes.use-latest-versions") version "0.2.19"
     id("com.github.ben-manes.versions") version "0.53.0"
@@ -33,19 +32,12 @@ repositories {
 }
 
 dependencies {
-    testImplementation(platform("org.junit:junit-bom:6.0.0"))
-    testImplementation("org.junit.jupiter:junit-jupiter")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     implementation("org.apache.commons:commons-lang3:3.19.0")
     implementation("org.hibernate.orm:hibernate-core:6.6.0.Final")
 }
 
 application { mainClass.set("hexlet.code.App") }
 
-tasks.test {
-    useJUnitPlatform()
-    jvmArgs("--enable-preview")
-}
 
 tasks.withType<JavaCompile> {
     options.compilerArgs.add("--enable-preview")
@@ -56,4 +48,4 @@ tasks.withType<JavaExec> {
 }
 tasks.getByName("run", JavaExec::class) {
     standardInput = System.`in`
-}
+}

app/build.gradle.kts

@@ -7,7 +7,8 @@
 import hexlet.code.games.Prime;
 import java.util.Scanner;
 
-class App {
+public class App {
+    public static String userChoice;
     public static void main(String[] args) {
         System.out.println("Please enter the game number and press Enter.");
         System.out.println("1 - Greet");
@@ -20,8 +21,9 @@ public static void main(String[] args) {
 
         Scanner scanner = new Scanner(System.in);
         System.out.print("Your choice: ");
+        userChoice = scanner.next();
 
-        switch (scanner.next()) {
+        switch (userChoice) {
             case "1":
                 System.out.println("Welcome to the Brain Games!");
                 Cli.greetUser();
@@ -45,7 +47,7 @@ public static void main(String[] args) {
                 System.out.println("Goodbye!");
                 break;
             default:
-                System.out.println("Invalid choice");
+                System.out.println("Unknown user choice: " + userChoice);
                 break;
         }
 

app/src/main/java/hexlet/code/App.java

@@ -5,15 +5,14 @@
 public class Engine {
     public static final int ROUNDS = 3;
 
-    public static int getRoundsCount() {
-        return ROUNDS;
-    }
 
     public static void run(String description, String[][] data) {
         System.out.println("Welcome to the Brain Games!");
-        String userName = Cli.greetUser();
-        System.out.println(description);
+        System.out.print("May I have your name? ");
         Scanner scanner = new Scanner(System.in);
+        String userName = scanner.next();
+        System.out.println("Hello, " + userName + "!");
+        System.out.println(description);
 
         for (int i = 0; i < ROUNDS; i++) {
             String question = data[i][0];

app/src/main/java/hexlet/code/Engine.java

@@ -1,12 +1,14 @@
 package hexlet.code.games;
 
+import hexlet.code.App;
 import hexlet.code.Engine;
 import java.security.SecureRandom;
 
 public class Calculator {
     static final int NUMBERS_COUNT = 100;
 
     public static int calculate(int operand1, int operand2, char operator) {
+
         switch (operator) {
             case '+':
                 return operand1 + operand2;
@@ -15,17 +17,17 @@ public static int calculate(int operand1, int operand2, char operator) {
             case '*':
                 return operand1 * operand2;
             default:
-                return 0;
+                throw new RuntimeException("Unknown user choice" +  App.userChoice);
         }
     }
 
     public static void startGame() {
         String description = "What is the result of the expression?";
         char[] operators = {'+', '-', '*'};
-        String[][] data = new String[Engine.getRoundsCount()][2];
+        String[][] data = new String[Engine.ROUNDS][2];
         SecureRandom random = new SecureRandom();
 
-        for (int i = 0; i < Engine.getRoundsCount(); i++) {
+        for (int i = 0; i < Engine.ROUNDS; i++) {
 
             int number1 = random.nextInt(NUMBERS_COUNT) + 1;
             int number2 = random.nextInt(NUMBERS_COUNT) + 1;

app/src/main/java/hexlet/code/games/Calculator.java

@@ -8,11 +8,11 @@ public class Even {
 
     public static void startGame() {
         String description = "Answer 'yes' if the number is even, otherwise answer 'no'.";
-        String[][] data = new String[Engine.getRoundsCount()][2];
+        String[][] data = new String[Engine.ROUNDS][2];
         SecureRandom random = new SecureRandom();
 
 
-        for (int i = 0; i < Engine.getRoundsCount(); i++) {
+        for (int i = 0; i < Engine.ROUNDS; i++) {
 
             int number = random.nextInt(NUMBERS_COUNT) + 1;
             String question = String.valueOf(number);

app/src/main/java/hexlet/code/games/Even.java

@@ -6,7 +6,7 @@
 public class Gcd {
     static final int NUMBERS_COUNT = 100;
 
-    private static int isGCD(int a, int b) {
+    private static int theGCD(int a, int b) {
         while (b != 0) {
             int value = b;
             b = a % b;
@@ -17,15 +17,15 @@ private static int isGCD(int a, int b) {
 
     public static void startGame() {
         String description = "Find the greatest common divisor of given numbers.";
-        String[][] data = new String[Engine.getRoundsCount()][2];
+        String[][] data = new String[Engine.ROUNDS][2];
         SecureRandom random = new SecureRandom();
 
-        for (int i = 0; i < Engine.getRoundsCount(); i++) {
+        for (int i = 0; i < Engine.ROUNDS; i++) {
 
             int number1 = random.nextInt(NUMBERS_COUNT) + 1;
             int number2 = random.nextInt(NUMBERS_COUNT) + 1;
             String question = number1 + " " + number2;
-            String correctAnswer = String.valueOf(isGCD(number1, number2));
+            String correctAnswer = String.valueOf(theGCD(number1, number2));
 
             data[i][0] = question;
             data[i][1] = correctAnswer;

app/src/main/java/hexlet/code/games/Gcd.java

@@ -20,10 +20,10 @@ public static boolean isPrime(int number) {
 
     public static void startGame() {
         String description = "Answer 'yes' if given number is prime. Otherwise answer 'no'.";
-        String[][] data = new String[Engine.getRoundsCount()][2];
+        String[][] data = new String[Engine.ROUNDS][2];
         SecureRandom random = new SecureRandom();
 
-        for (int i = 0; i < Engine.getRoundsCount(); i++) {
+        for (int i = 0; i < Engine.ROUNDS; i++) {
 
             int number = random.nextInt(NUMBERS_COUNT) + 1;
             String question = String.valueOf(number);