more refactoring

Author: Jonathan-Birkey

.github/linters/java.xml

@@ -105,7 +105,9 @@
     <module name="JavadocType"/>
     <module name="JavadocVariable"/>
     <module name="JavadocStyle"/>
-    <module name="MissingJavadocMethod"/>
+    <module name="MissingJavadocMethod">
+      <property name="ignoreMethodNamesRegex" value="^main.*$"/>
+    </module>
 
     <!-- Checks for Naming Conventions.                  -->
     <!-- See https://checkstyle.org/checks/naming/index.html -->
@@ -175,14 +177,15 @@
     <!-- See https://checkstyle.org/checks/design/index.html -->
     <module name="DesignForExtension"/>
     <module name="FinalClass"/>
-    <module name="HideUtilityClassConstructor"/>
     <module name="InterfaceIsType"/>
     <module name="VisibilityModifier"/>
 
     <!-- Miscellaneous other checks.                   -->
     <!-- See https://checkstyle.org/checks/misc/index.html -->
     <module name="ArrayTypeStyle"/>
-    <module name="FinalParameters"/>
+    <module name="FinalParameters">
+      <property name="tokens" value="CTOR_DEF"/>
+    </module>
     <module name="TodoComment"/>
     <module name="UpperEll"/>
 

src/com/github/jonathanbirkey/chapter01/package-info.java

@@ -0,0 +1 @@
+package com.github.jonathanbirkey.chapter01;

src/com/github/jonathanbirkey/chapter02/Exercise07.java

@@ -20,8 +20,8 @@ public static void main(String[] args) {
     input.close();
 
     long years = minutes / (365 * 24 * 60);
-    long minutes_remaining = minutes % (365 * 24 * 60);
-    long days = minutes_remaining / (24 * 60);
+    long minutesRemaining = minutes % (365 * 24 * 60);
+    long days = minutesRemaining / (24 * 60);
     System.out.printf("%d minutes is approximately %d years and %d days\n", minutes, years, days);
   }
 }

src/com/github/jonathanbirkey/chapter02/Exercise11.java

@@ -18,15 +18,15 @@ public static void main(String[] args) {
     int numOfYears = input.nextInt();
     input.close();
 
-    double current_population = 312032486;
-    long sec_per_year = 365 * 24 * 60 * 60;
-    double births_per_year = sec_per_year / 7.0;
-    double deaths_per_year = sec_per_year / 13.0;
-    double immigrants_per_year = sec_per_year / 45.0;
-    double growth_rate = births_per_year + immigrants_per_year - deaths_per_year;
+    double currentPopulation = 312032486;
+    long secPerYear = 365 * 24 * 60 * 60;
+    double birthsPerYear = secPerYear / 7.0;
+    double deathsPerYear = secPerYear / 13.0;
+    double immigrantsPerYear = secPerYear / 45.0;
+    double growthRate = birthsPerYear + immigrantsPerYear - deathsPerYear;
     for (int i = 0; i < numOfYears; i++) {
-      current_population += growth_rate;
+      currentPopulation += growthRate;
     }
-    System.out.printf("The population in %d years is %d", numOfYears, (int) current_population);
+    System.out.printf("The population in %d years is %d", numOfYears, (int) currentPopulation);
   }
 }

src/com/github/jonathanbirkey/chapter02/package-info.java

@@ -0,0 +1 @@
+package com.github.jonathanbirkey.chapter02;

src/com/github/jonathanbirkey/chapter03/Exercise04.java

@@ -47,6 +47,8 @@ public static void main(String[] args) {
         break;
       case 11:
         System.out.println("December");
+      default:
+        System.out.print("Invalid");
     }
   }
 }

src/com/github/jonathanbirkey/chapter03/Exercise06.java

@@ -32,9 +32,14 @@ public static void main(String[] args) {
     double bmi = weightInKilograms / (heightInMeters * heightInMeters);
     // Display result
     System.out.println("BMI is " + bmi);
-    if (bmi < 18.5) System.out.println("Underweight");
-    else if (bmi < 25) System.out.println("Normal");
-    else if (bmi < 30) System.out.println("Overweight");
-    else System.out.println("Obese");
+    if (bmi < 18.5) {
+      System.out.println("Underweight");
+    } else if (bmi < 25) {
+      System.out.println("Normal");
+    } else if (bmi < 30) {
+      System.out.println("Overweight");
+    } else {
+      System.out.println("Obese");
+    }
   }
 }

src/com/github/jonathanbirkey/chapter03/Exercise11.java

@@ -29,9 +29,12 @@ public static void main(String[] args) {
         System.out.print("January ");
         break;
       case 1:
-        if (isLeapYear) daysPerMonth = 29;
-        else daysPerMonth = 28;
-        System.out.print("February ");
+        if (isLeapYear) {
+          daysPerMonth = 29;
+        } else {
+          daysPerMonth = 28;
+          System.out.print("February ");
+        }
         break;
       case 2:
         daysPerMonth = 31;
@@ -72,6 +75,8 @@ public static void main(String[] args) {
       case 11:
         daysPerMonth = 31;
         System.out.print("December ");
+      default:
+        System.out.print("Invalid Month");
     }
     System.out.printf("%d has %d days.", year, daysPerMonth);
   }

src/com/github/jonathanbirkey/chapter03/Exercise17.java

@@ -31,6 +31,8 @@ public static void main(String[] args) {
         break;
       case 2:
         System.out.print("The computer is paper. ");
+      default:
+        System.out.print("Invalide");
     }
     switch (userPick) {
       case 0:
@@ -41,6 +43,8 @@ public static void main(String[] args) {
         break;
       case 2:
         System.out.print("You are paper");
+      default:
+        System.out.print("Invalide");
     }
     if (computerPick == userPick) {
       System.out.println(" too. It is a draw");

src/com/github/jonathanbirkey/chapter03/Exercise19.java

@@ -20,7 +20,10 @@ public static void main(String[] args) {
     int c = input.nextInt();
     input.close();
 
-    if (a + b < c || b + c < a || c + a < b) System.out.println("Invalid input.");
-    else System.out.printf("perimeter is %d", a + b + c);
+    if (a + b < c || b + c < a || c + a < b) {
+      System.out.println("Invalid input.");
+    } else {
+      System.out.printf("perimeter is %d", a + b + c);
+    }
   }
 }

src/com/github/jonathanbirkey/chapter03/Exercise21.java

@@ -64,6 +64,8 @@ public static void main(String[] args) {
         break;
       case 6:
         System.out.println("Day of the week is Friday");
+      default:
+        System.out.print("Invalid");
     }
   }
 }

src/com/github/jonathanbirkey/chapter03/Exercise22.java

@@ -24,7 +24,10 @@ public static void main(String[] args) {
     input.close();
 
     double distance = Math.pow(Math.pow(x - 0, 2) + Math.pow(y - 0, 2), 0.5);
-    if (distance <= 10) System.out.printf("Point (%.2f, %.2f) is in the circle", x, y);
-    else System.out.printf("Point (%.2f, %.2f) is not in the circle", x, y);
+    if (distance <= 10) {
+      System.out.printf("Point (%.2f, %.2f) is in the circle", x, y);
+    } else {
+      System.out.printf("Point (%.2f, %.2f) is not in the circle", x, y);
+    }
   }
 }

src/com/github/jonathanbirkey/chapter03/Exercise23.java

@@ -24,8 +24,10 @@ public static void main(String[] args) {
     double y = input.nextDouble();
     input.close();
 
-    if (x > 5 || x < -5 || y > 5 || y < -5)
+    if (x > 5 || x < -5 || y > 5 || y < -5) {
       System.out.printf("Point (%.2f, %.2f) is not in the rectangle", x, y);
-    else System.out.printf("Point (%.2f, %.2f) is in the rectangle", x, y);
+    } else {
+      System.out.printf("Point (%.2f, %.2f) is in the rectangle", x, y);
+    }
   }
 }

src/com/github/jonathanbirkey/chapter03/Exercise24.java

@@ -54,6 +54,8 @@ public static void main(String[] args) {
         break;
       case 12:
         System.out.print("King of ");
+      default:
+        System.out.print("Invalid");
     }
     switch (suit) {
       case 0:
@@ -67,6 +69,8 @@ public static void main(String[] args) {
         break;
       case 3:
         System.out.print("Diamonds");
+      default:
+        System.out.print("Invalid");
     }
   }
 }

src/com/github/jonathanbirkey/chapter03/Exercise26.java

@@ -21,16 +21,24 @@ public static void main(String[] args) {
     input.close();
 
     System.out.printf("Is %d divisible by 5 and 6? ", num);
-    if (num % 5 == 0 && num % 6 == 0) System.out.println("true");
-    else System.out.println("false");
+    if (num % 5 == 0 && num % 6 == 0) {
+      System.out.println("true");
+    } else {
+      System.out.println("false");
+    }
 
     System.out.printf("Is %d divisible by 5 or 6? ", num);
-    if (num % 5 == 0 || num % 6 == 0) System.out.println("true");
-    else System.out.println("false");
+    if (num % 5 == 0 || num % 6 == 0) {
+      System.out.println("true");
+    } else {
+      System.out.println("false");
+    }
 
     System.out.printf("Is %d divisible by 5 or 6, but not both? ", num);
-    if ((num % 5 == 0 || num % 6 == 0) && !(num % 5 == 0 && num % 6 == 0))
+    if ((num % 5 == 0 || num % 6 == 0) && !(num % 5 == 0 && num % 6 == 0)) {
       System.out.println("true");
-    else System.out.println("false");
+    } else {
+      System.out.println("false");
+    }
   }
 }

src/com/github/jonathanbirkey/chapter03/Exercise30.java

@@ -38,11 +38,12 @@ public static void main(String[] args) {
     // Compute the current hour
     long currentHour = (totalHours % 24) + offset;
 
-    if (currentHour > 12)
+    if (currentHour > 12) {
       System.out.printf(
           "The current time is %d:%d:%d PM\n", currentHour - 12, currentMinute, currentSecond);
-    else
+    } else {
       System.out.printf(
           "The current time is %d:%d:%d AM\n", currentHour, currentMinute, currentSecond);
+    }
   }
 }

src/com/github/jonathanbirkey/chapter03/package-info.java

@@ -0,0 +1 @@
+package com.github.jonathanbirkey.chapter03;

src/com/github/jonathanbirkey/chapter04/Exercise13.java

@@ -28,8 +28,9 @@ public static void main(String[] args) {
         || letter == 'o'
         || letter == 'O'
         || letter == 'u'
-        || letter == 'U') System.out.printf("%c is a vowel", letter);
-    else if (letter == 'b'
+        || letter == 'U') {
+      System.out.printf("%c is a vowel", letter);
+    } else if (letter == 'b'
         || letter == 'B'
         || letter == 'c'
         || letter == 'C'
@@ -70,7 +71,10 @@ else if (letter == 'b'
         || letter == 'y'
         || letter == 'Y'
         || letter == 'z'
-        || letter == 'Z') System.out.printf("%c is a consonant", letter);
-    else System.out.printf("%c is an invalid input", letter);
+        || letter == 'Z') {
+      System.out.printf("%c is a consonant", letter);
+    } else {
+      System.out.printf("%c is an invalid input", letter);
+    }
   }
 }

src/com/github/jonathanbirkey/chapter04/Exercise26.java

@@ -20,8 +20,11 @@ public static void main(String[] args) {
     input.close();
 
     String numberOfOneDollars;
-    if (amount.length() == 3) numberOfOneDollars = "0";
-    else numberOfOneDollars = amount.substring(0, amount.length() - 3);
+    if (amount.length() == 3) {
+      numberOfOneDollars = "0";
+    } else {
+      numberOfOneDollars = amount.substring(0, amount.length() - 3);
+    }
 
     int remainingAmount = Integer.parseInt(amount.substring(amount.length() - 2));
     int numberOfQuarters = remainingAmount / 25;

src/com/github/jonathanbirkey/chapter04/package-info.java

@@ -0,0 +1 @@
+package com.github.jonathanbirkey.chapter04;

src/com/github/jonathanbirkey/chapter05/Exercise02.java

@@ -12,14 +12,14 @@
 
 public class Exercise02 {
   public static void main(String[] args) {
-    final int NUMBER_OF_QUESTIONS = 10;
+    final int numberOfQuestions = 10;
     int correctCount = 0;
     int count = 0;
     long startTime = System.currentTimeMillis();
     String output = " ";
     Scanner input = new Scanner(System.in);
 
-    while (count < NUMBER_OF_QUESTIONS) {
+    while (count < numberOfQuestions) {
       int number1 = (int) (Math.random() * 15) + 1;
       int number2 = (int) (Math.random() * 15) + 1;
 

src/com/github/jonathanbirkey/chapter05/Exercise18.java

@@ -46,7 +46,9 @@ public static void main(String[] args) {
 
     System.out.println("\nPattern D");
     for (int i = 1; i <= numOfLines; i++) {
-      for (int k = 1; k < numOfLines - (numOfLines - i); k++) System.out.print("  ");
+      for (int k = 1; k < numOfLines - (numOfLines - i); k++) {
+        System.out.print("  ");
+      }
       for (int j = 1; j <= numOfLines; j++) {
         if (j <= numOfLines - i + 1) {
           System.out.printf("%d ", j);

src/com/github/jonathanbirkey/chapter05/package-info.java

@@ -0,0 +1 @@
+package com.github.jonathanbirkey.chapter05;