вынесение констант из Utils.java, замена if на тернарный оператор в Prime.java

Author: alexeichuprikov

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

@@ -1,15 +1,9 @@
 package hexlet.code;
 
 public class Utils {
-    //границы случайных чисел не были обозначены сделал от 1 до 100. требуется уточнение у аналитика
-    public static final int MIN_NUMBER = 1;
-    public static final int MAX_NUMBER = 100;
 
     public static int generateNumber(int min, int max) {
         return (int) Math.floor(Math.random() * (max - min + 1)) + min;
     }
 
-    public static int generateNumber() {
-        return generateNumber(MIN_NUMBER, MAX_NUMBER);
-    }
 }

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

@@ -4,13 +4,16 @@
 import hexlet.code.Utils;
 
 public class Calc {
+    public static final int MIN_NUMBER = 1;
+    public static final int MAX_NUMBER = 100;
+
     public static void play() {
         String optionDescription = "What is the result of the expression?";
         String[][] questionsAndCorrectAnswers = new String[Engine.ROUNDS][2];
 
         for (int i = 0; i < Engine.ROUNDS; i++) {
-            int firstValue = Utils.generateNumber();
-            int secondValue = Utils.generateNumber();
+            int firstValue = Utils.generateNumber(MIN_NUMBER, MAX_NUMBER);
+            int secondValue = Utils.generateNumber(MIN_NUMBER, MAX_NUMBER);
             char[] signs = {'+', '-', '*'};
             char randomSign = signs[Utils.generateNumber(0, signs.length - 1)];
 

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

@@ -4,12 +4,15 @@
 import hexlet.code.Utils;
 
 public class Even {
+    public static final int MIN_NUMBER = 1;
+    public static final int MAX_NUMBER = 100;
+
     public static void play() {
         String optionDescription = "Answer 'yes' if the number is even, otherwise answer 'no'.";
         String[][] questionsAndCorrectAnswers = new String[Engine.ROUNDS][2];
 
         for (int i = 0; i < Engine.ROUNDS; i++) {
-            int random = Utils.generateNumber();
+            int random = Utils.generateNumber(MIN_NUMBER, MAX_NUMBER);
             String question = String.valueOf(random);
             boolean isEven = random % 2 == 0;
             String correctAnswer = isEven ? "yes" : "no";

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

@@ -4,13 +4,16 @@
 import hexlet.code.Utils;
 
 public class Gcd {
+    public static final int MIN_NUMBER = 1;
+    public static final int MAX_NUMBER = 100;
+
     public static void play() {
         String optionDescription = "Find the greatest common divisor of given numbers.";
         String[][] questionsAndCorrectAnswers = new String[Engine.ROUNDS][2];
 
         for (int i = 0; i < Engine.ROUNDS; i++) {
-            int firstValue = Utils.generateNumber();
-            int secondValue = Utils.generateNumber();
+            int firstValue = Utils.generateNumber(MIN_NUMBER, MAX_NUMBER);
+            int secondValue = Utils.generateNumber(MIN_NUMBER, MAX_NUMBER);
 
             String question = firstValue + " " + secondValue;
             String correctAnswer = String.valueOf(gcd(firstValue, secondValue));

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

@@ -4,20 +4,18 @@
 import hexlet.code.Utils;
 
 public class Prime {
+    public static final int MIN_NUMBER = 1;
+    public static final int MAX_NUMBER = 100;
+
     public static void play() {
         String optionDescription = "Answer 'yes' if given number is prime. Otherwise answer 'no'.";
         String[][] questionsAndCorrectAnswers = new String[Engine.ROUNDS][2];
 
         for (int i = 0; i < Engine.ROUNDS; i++) {
-            int random = Utils.generateNumber();
+            int random = Utils.generateNumber(MIN_NUMBER, MAX_NUMBER);
 
             String question = String.valueOf(random);
-            String correctAnswer;
-            if (isPrime(random)) {
-                correctAnswer = "yes";
-            } else {
-                correctAnswer = "no";
-            }
+            String correctAnswer = isPrime(random) ? "yes" : "no";
 
             questionsAndCorrectAnswers[i][0] = question;
             questionsAndCorrectAnswers[i][1] = correctAnswer;

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

@@ -4,6 +4,8 @@
 import hexlet.code.Utils;
 
 public class Progression {
+    public static final int MIN_NUMBER = 1;
+    public static final int MAX_NUMBER = 100;
     private static final int STEP_COUNT = 10;
     private static final int VALUE_COUNT = 10;
 
@@ -12,8 +14,8 @@ public static void play() {
         String[][] questionsAndCorrectAnswers = new String[Engine.ROUNDS][2];
 
         for (int i = 0; i < Engine.ROUNDS; i++) {
-            int start = Utils.generateNumber();
-            int step = Utils.generateNumber(Utils.MIN_NUMBER, STEP_COUNT);
+            int start = Utils.generateNumber(MIN_NUMBER, MAX_NUMBER);
+            int step = Utils.generateNumber(MIN_NUMBER, STEP_COUNT);
             int hideIndex = Utils.generateNumber(0, VALUE_COUNT - 1);
 
             String[] sequence = addSequence(start, step, VALUE_COUNT);