Minor refactorings and code style changes (iluwatar#807)

* Made minor changes in some patterns such as removed throws clause where not needed, changed incorrect order of arguments in assertEquals

* Minor refactorings and code style changes. 1) Removed several use of raw types 2) Removed unnecessary throws clauses 3) Used lambda expressions wherever applicable 4) Used apt assertion methods for readability 5) Use of try with resources wherever applicable 6) Corrected incorrect order of assertXXX arguments

* Removed unused import from Promise

* Addressed review comments

* Addressed checkstyle issue

Author: npathai

abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java

@@ -32,6 +32,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * AbstractDocument test class
@@ -81,8 +82,8 @@ public void shouldIncludePropsInToString() {
     Map<String, Object> props = new HashMap<>();
     props.put(KEY, VALUE);
     DocumentImplementation document = new DocumentImplementation(props);
-    assertNotNull(document.toString().contains(KEY));
-    assertNotNull(document.toString().contains(VALUE));
+    assertTrue(document.toString().contains(KEY));
+    assertTrue(document.toString().contains(VALUE));
   }
 
 }

acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitorTest.java

@@ -25,27 +25,19 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.groups.Tuple.tuple;
 import static uk.org.lidalia.slf4jext.Level.INFO;
-import static org.mockito.Mockito.mock;
 
-import uk.org.lidalia.slf4jtest.TestLogger;
-import uk.org.lidalia.slf4jtest.TestLoggerFactory;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
-import com.iluwatar.acyclicvisitor.ConfigureForUnixVisitor;
-import com.iluwatar.acyclicvisitor.Hayes;
-import com.iluwatar.acyclicvisitor.HayesVisitor;
-import com.iluwatar.acyclicvisitor.Zoom;
-import com.iluwatar.acyclicvisitor.ZoomVisitor;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
+import uk.org.lidalia.slf4jtest.TestLogger;
+import uk.org.lidalia.slf4jtest.TestLoggerFactory;
 
 /**
  * ConfigureForUnixVisitor test class
  */
 public class ConfigureForUnixVisitorTest {
 
-  TestLogger logger = TestLoggerFactory.getTestLogger(ConfigureForUnixVisitor.class);
+  private static final TestLogger LOGGER = TestLoggerFactory.getTestLogger(ConfigureForUnixVisitor.class);
 
   @AfterEach
   public void clearLoggers() {
@@ -59,7 +51,7 @@ public void testVisitForZoom() {
 
     conUnix.visit(zoom);
 
-    assertThat(logger.getLoggingEvents()).extracting("level", "message").contains(
+    assertThat(LOGGER.getLoggingEvents()).extracting("level", "message").contains(
         tuple(INFO, zoom + " used with Unix configurator."));
   }
 }

aggregator-microservices/inventory-microservice/src/test/java/com/iluwatar/inventory/microservice/InventoryControllerTest.java

@@ -31,7 +31,7 @@
  */
 public class InventoryControllerTest {
   @Test
-  public void testGetProductInventories() throws Exception {
+  public void testGetProductInventories() {
     InventoryController inventoryController = new InventoryController();
 
     int numberOfInventories = inventoryController.getProductInventories();

bridge/src/test/java/com/iluwatar/bridge/HammerTest.java

@@ -37,7 +37,7 @@ public class HammerTest extends WeaponTest {
    * underlying weapon implementation.
    */
   @Test
-  public void testHammer() throws Exception {
+  public void testHammer() {
     final Hammer hammer = spy(new Hammer(mock(FlyingEnchantment.class)));
     testBasicWeaponActions(hammer);
   }

bridge/src/test/java/com/iluwatar/bridge/SwordTest.java

@@ -37,7 +37,7 @@ public class SwordTest extends WeaponTest {
    * underlying weapon implementation.
    */
   @Test
-  public void testSword() throws Exception {
+  public void testSword() {
     final Sword sword = spy(new Sword(mock(FlyingEnchantment.class)));
     testBasicWeaponActions(sword);
   }

callback/src/main/java/com/iluwatar/callback/App.java

@@ -41,12 +41,7 @@ public class App {
    */
   public static void main(String[] args) {
     Task task = new SimpleTask();
-    Callback callback = new Callback() {
-      @Override
-      public void call() {
-        LOGGER.info("I'm done now.");
-      }
-    };
+    Callback callback = () -> LOGGER.info("I'm done now.");
     task.executeWith(callback);
   }
 }

callback/src/test/java/com/iluwatar/callback/CallbackTest.java

@@ -38,29 +38,6 @@ public class CallbackTest {
 
   @Test
   public void test() {
-    Callback callback = new Callback() {
-      @Override
-      public void call() {
-        callingCount++;
-      }
-    };
-
-    Task task = new SimpleTask();
-
-    assertEquals(new Integer(0), callingCount, "Initial calling count of 0");
-
-    task.executeWith(callback);
-
-    assertEquals(new Integer(1), callingCount, "Callback called once");
-
-    task.executeWith(callback);
-
-    assertEquals(new Integer(2), callingCount, "Callback called twice");
-
-  }
-
-  @Test
-  public void testWithLambdasExample() {
     Callback callback = () -> callingCount++;
 
     Task task = new SimpleTask();

chain/src/test/java/com/iluwatar/chain/OrcKingTest.java

@@ -43,7 +43,7 @@ public class OrcKingTest {
   };
 
   @Test
-  public void testMakeRequest() throws Exception {
+  public void testMakeRequest() {
     final OrcKing king = new OrcKing();
 
     for (final Request request : REQUESTS) {

collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/Car.java

@@ -26,10 +26,10 @@
  * A Car class that has the properties of make, model, year and category.
  */
 public class Car {
-  private String make;
-  private String model;
-  private int year;
-  private Category category;
+  private final String make;
+  private final String model;
+  private final int year;
+  private final Category category;
 
   /**
    * Constructor to create an instance of car.

converter/src/test/java/com/iluwatar/converter/ConverterTest.java

@@ -71,7 +71,7 @@ public void testCustomConverter() {
         user.getFirstName().toLowerCase() + user.getLastName().toLowerCase() + "@whatever.com"));
     User u1 = new User("John", "Doe", false, "12324");
     UserDto userDto = converter.convertFromEntity(u1);
-    assertEquals(userDto.getEmail(), "johndoe@whatever.com");
+    assertEquals("johndoe@whatever.com", userDto.getEmail());
   }
 
   /**
@@ -83,6 +83,6 @@ public void testCollectionConversion() {
     ArrayList<User> users = Lists.newArrayList(new User("Camile", "Tough", false, "124sad"),
         new User("Marti", "Luther", true, "42309fd"), new User("Kate", "Smith", true, "if0243"));
     List<User> fromDtos = userConverter.createFromDtos(userConverter.createFromEntities(users));
-    assertEquals(fromDtos, users);
+    assertEquals(users, fromDtos);
   }
 }