checkstyle-fix

iluwatar · Nov 12, 2023 · ba5b559 · ba5b559
1 parent b3c15b7
commit ba5b559
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 21 deletions.
diff --git a/notification/src/main/java/com/iluwatar/App.java b/notification/src/main/java/com/iluwatar/App.java
@@ -1,8 +1,7 @@
 package com.iluwatar;
 
-import lombok.NoArgsConstructor;
-
 import java.time.LocalDate;
+import lombok.NoArgsConstructor;
 
 /**
  * The notification pattern captures information passed between layers, validates the information, and returns
@@ -19,7 +18,6 @@ public class App {
 
   private static final String NAME = "";
   private static final String OCCUPATION = "";
-//  private static final LocalDate DATE_OF_BIRTH = LocalDate.of(2016, 7, 13);
   private static final LocalDate DATE_OF_BIRTH = LocalDate.of(2016, 7, 13);
 
   public static void main(String[] args) {

diff --git a/notification/src/main/java/com/iluwatar/Notification.java b/notification/src/main/java/com/iluwatar/Notification.java
@@ -17,7 +17,7 @@ public class Notification {
   private final List<NotificationError> errors = new ArrayList<>();
 
   public boolean hasErrors() {
-    return this.errors.size() != 0;
+    return this.errors.isEmpty();
   }
 
   public void addError(NotificationError error) {

diff --git a/notification/src/main/java/com/iluwatar/RegisterWorker.java b/notification/src/main/java/com/iluwatar/RegisterWorker.java
@@ -1,9 +1,8 @@
 package com.iluwatar;
 
-import lombok.extern.slf4j.Slf4j;
-
 import java.time.LocalDate;
 import java.time.Period;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Class which handles actual internal logic and validation for worker registration.
@@ -40,26 +39,28 @@ private void validate() {
     if (isNullOrBlank(ourData.getDateOfBirth())) {
       // If DOB is null or empty
       fail(true, RegisterWorkerDto.MISSING_DOB);
-    }else{
+    } else {
       // Validating age ( should be greater than or equal to 18 )
       Period age = Period.between(ourData.getDateOfBirth(), LocalDate.now());
-      fail(!(age.getYears() >= 18), RegisterWorkerDto.DOB_TOO_SOON);
+      fail(age.getYears() < 18, RegisterWorkerDto.DOB_TOO_SOON);
     }
   }
 
   /**
-   * validates for null/empty value
+   * Validates for null/empty value.
    *
    * @param obj any object
    * @return boolean
    */
   protected boolean isNullOrBlank(Object obj) {
-    if(obj == null){
+    if (obj == null) {
       return true;
     }
-    if( obj instanceof String){
+
+    if (obj instanceof String) {
       return ((String) obj).trim().isEmpty();
     }
+
     return false;
   }
 

diff --git a/notification/src/test/java/com/iluwatar/AppTest.java b/notification/src/test/java/com/iluwatar/AppTest.java
@@ -4,7 +4,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-public class AppTest {
+class AppTest {
 
   @Test
   void shouldExecuteApplicationWithoutException() {

diff --git a/notification/src/test/java/com/iluwatar/DateOfBirthErrorTest.java b/notification/src/test/java/com/iluwatar/DateOfBirthErrorTest.java
@@ -6,9 +6,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class DateOfBirthErrorTest {
+class DateOfBirthErrorTest {
   @Test
-  public void dateOfBirthTest() {
+  void dateOfBirthTest() {
     //Define our variables
     String name = "valid name";
     String occupation = "valid occupation";

diff --git a/notification/src/test/java/com/iluwatar/MultipleErrorsTest.java b/notification/src/test/java/com/iluwatar/MultipleErrorsTest.java
@@ -5,10 +5,10 @@
 import java.time.LocalDate;
 import java.util.Arrays;
 
-public class MultipleErrorsTest {
+class MultipleErrorsTest {
 
   @Test
-  public void multipleMissingTest() {
+  void multipleMissingTest() {
     //Define our variables
     String name = null;
     String occupation = "";

diff --git a/notification/src/test/java/com/iluwatar/NoErrorsTest.java b/notification/src/test/java/com/iluwatar/NoErrorsTest.java
@@ -5,9 +5,9 @@
 import java.time.LocalDate;
 import java.util.Arrays;
 
-public class NoErrorsTest {
+class NoErrorsTest {
   @Test
-  public void validSubmissionTest() {
+  void validSubmissionTest() {
     //Define our variables
     String name = "Valid Name";
     String occupation = "Valid Occupation";

diff --git a/notification/src/test/java/com/iluwatar/NotificationErrorTest.java b/notification/src/test/java/com/iluwatar/NotificationErrorTest.java
@@ -5,7 +5,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class NotificationErrorTest {
+class NotificationErrorTest {
   public static void generalFormSubmissionTest(String name, String occupation, LocalDate dateOfBirth,
                                                List<NotificationError> containsError, List<NotificationError> excludesError) {
     //Assign the variables to a new DTO, equivalent to filling in the form

diff --git a/notification/src/test/java/com/iluwatar/OneErrorTest.java b/notification/src/test/java/com/iluwatar/OneErrorTest.java
@@ -6,9 +6,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class OneErrorTest {
+class OneErrorTest {
   @Test
-  public void missingNameTest() {
+  void missingNameTest() {
     //Define our variables
     String name = "";
     String occupation = "Valid Occupation";