Checkstyle corrections

iluwatar · iluwatar · commit 8b020837eaac · 2015-12-29T21:34:27.000+02:00
diff --git a/async-method-invocation/src/test/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutorTest.java b/async-method-invocation/src/test/java/com/iluwatar/async/method/invocation/ThreadAsyncExecutorTest.java
@@ -89,9 +89,9 @@ public void testLongRunningTaskWithoutCallback() throws Exception {
     final Object result = new Object();
     final Callable<Object> task = mock(Callable.class);
     when(task.call()).thenAnswer(i -> {
-        Thread.sleep(1500);
-        return result;
-      });
+      Thread.sleep(1500);
+      return result;
+    });
 
     final AsyncResult<Object> asyncResult = executor.startProcess(task);
     assertNotNull(asyncResult);
@@ -128,9 +128,9 @@ public void testLongRunningTaskWithCallback() throws Exception {
     final Object result = new Object();
     final Callable<Object> task = mock(Callable.class);
     when(task.call()).thenAnswer(i -> {
-        Thread.sleep(1500);
-        return result;
-      });
+      Thread.sleep(1500);
+      return result;
+    });
 
     final AsyncCallback<Object> callback = mock(AsyncCallback.class);
     final AsyncResult<Object> asyncResult = executor.startProcess(task, callback);
@@ -177,9 +177,9 @@ public void testEndProcess() throws Exception {
     final Object result = new Object();
     final Callable<Object> task = mock(Callable.class);
     when(task.call()).thenAnswer(i -> {
-        Thread.sleep(1500);
-        return result;
-      });
+      Thread.sleep(1500);
+      return result;
+    });
 
     final AsyncResult<Object> asyncResult = executor.startProcess(task);
     assertNotNull(asyncResult);
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+<suppressions>
+   <suppress checks="AvoidStarImport" files="[\\/]src[\\/]test[\\/]java[\\/]"/>
+   <suppress checks="[a-zA-Z0-9]*" files="[\\/]src[\\/]test[\\/]resources[\\/]"/>
+   <suppress checks="[a-zA-Z0-9]*" files="[\\/]build[\\/]generated-sources[\\/]"/>
+   <suppress checks="[a-zA-Z0-9]*" files="[\\/]src[\\/]main[\\/]resources[\\/]"/>
+</suppressions>
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -158,7 +158,7 @@
             <property name="allowMissingThrowsTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
             <property name="minLineCount" value="2"/>
-            <property name="allowedAnnotations" value="Override, Test, Before, After, Parameters, Given, When, BeforeClass, AfterClass"/>
+            <property name="allowedAnnotations" value="Override, Test, Before, After, Parameters, Given, When, BeforeClass, AfterClass, Parameterized"/>
             <property name="allowThrowsTagsForSubclasses" value="true"/>
         </module>
         <module name="MethodName">
@@ -168,4 +168,9 @@
         </module>
         <module name="SingleLineJavadoc"/>
     </module>
+	
+    <module name="SuppressionFilter">
+        <property name="file" value="${config_loc}/checkstyle-suppressions.xml" default="checkstyle-suppressions.xml"/>
+    </module>
+	
 </module>
diff --git a/double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/InventoryTest.java b/double-checked-locking/src/test/java/com/iluwatar/doublechecked/locking/InventoryTest.java
@@ -14,7 +14,10 @@
 import static junit.framework.Assert.assertTrue;
 import static junit.framework.TestCase.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * Date: 12/10/15 - 9:34 PM
@@ -74,8 +77,8 @@ public void testAddItem() throws Exception {
     final ExecutorService executorService = Executors.newFixedThreadPool(THREAD_COUNT);
     for (int i = 0; i < THREAD_COUNT; i++) {
       executorService.execute(() -> {
-          while (inventory.addItem(new Item())) {};
-        });
+        while (inventory.addItem(new Item())) {};
+      });
     }
 
     // Wait until all threads have finished
diff --git a/double-dispatch/src/test/java/com/iluwatar/doubledispatch/CollisionTest.java b/double-dispatch/src/test/java/com/iluwatar/doubledispatch/CollisionTest.java
@@ -7,7 +7,10 @@
 import java.util.Objects;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * Date: 12/10/15 - 8:37 PM
diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventEmitterTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/EventEmitterTest.java
@@ -7,7 +7,11 @@
 import java.util.function.Supplier;
 
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * Date: 12/12/15 - 10:58 PM
diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingJoffreyTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingJoffreyTest.java
@@ -6,7 +6,11 @@
 
 import java.io.PrintStream;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * Date: 12/12/15 - 3:04 PM
diff --git a/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingsHandTest.java b/event-aggregator/src/test/java/com/iluwatar/event/aggregator/KingsHandTest.java
@@ -3,7 +3,11 @@
 import org.junit.Test;
 
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * Date: 12/12/15 - 10:57 AM
diff --git a/execute-around/src/test/java/com/iluwatar/execute/around/SimpleFileWriterTest.java b/execute-around/src/test/java/com/iluwatar/execute/around/SimpleFileWriterTest.java
@@ -67,8 +67,8 @@ public void testActualWrite() throws Exception {
   public void testIoException() throws Exception {
     final File temporaryFile = this.testFolder.newFile();
     new SimpleFileWriter(temporaryFile.getPath(), writer -> {
-        throw new IOException("");
-      });
+      throw new IOException("");
+    });
   }
 
 }
diff --git a/facade/src/test/java/com/iluwatar/facade/DwarvenGoldmineFacadeTest.java b/facade/src/test/java/com/iluwatar/facade/DwarvenGoldmineFacadeTest.java
@@ -7,7 +7,9 @@
 import java.io.PrintStream;
 
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.internal.verification.VerificationModeFactory.times;
 
 /**
diff --git a/flux/src/test/java/com/iluwatar/flux/dispatcher/DispatcherTest.java b/flux/src/test/java/com/iluwatar/flux/dispatcher/DispatcherTest.java
@@ -1,6 +1,11 @@
 package com.iluwatar.flux.dispatcher;
 
-import com.iluwatar.flux.action.*;
+import com.iluwatar.flux.action.Action;
+import com.iluwatar.flux.action.ActionType;
+import com.iluwatar.flux.action.Content;
+import com.iluwatar.flux.action.ContentAction;
+import com.iluwatar.flux.action.MenuAction;
+import com.iluwatar.flux.action.MenuItem;
 import com.iluwatar.flux.store.Store;
 import org.junit.Before;
 import org.junit.Test;
@@ -11,8 +16,13 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * Date: 12/12/15 - 8:22 PM
diff --git a/flux/src/test/java/com/iluwatar/flux/store/ContentStoreTest.java b/flux/src/test/java/com/iluwatar/flux/store/ContentStoreTest.java
@@ -9,7 +9,11 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * Date: 12/12/15 - 10:18 PM
diff --git a/flux/src/test/java/com/iluwatar/flux/store/MenuStoreTest.java b/flux/src/test/java/com/iluwatar/flux/store/MenuStoreTest.java
@@ -9,7 +9,11 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * Date: 12/12/15 - 10:18 PM
diff --git a/flux/src/test/java/com/iluwatar/flux/view/ContentViewTest.java b/flux/src/test/java/com/iluwatar/flux/view/ContentViewTest.java
@@ -4,7 +4,11 @@
 import com.iluwatar.flux.store.ContentStore;
 import org.junit.Test;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
  * Date: 12/12/15 - 10:31 PM
diff --git a/flux/src/test/java/com/iluwatar/flux/view/MenuViewTest.java b/flux/src/test/java/com/iluwatar/flux/view/MenuViewTest.java
@@ -8,7 +8,11 @@
 import org.junit.Test;
 
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
 
 /**
  * Date: 12/12/15 - 10:31 PM
diff --git a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/FilterManagerTest.java
@@ -4,7 +4,11 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
 
 /**
  * Date: 12/13/15 - 3:01 PM
diff --git a/layers/src/test/java/com/iluwatar/layers/CakeTest.java b/layers/src/test/java/com/iluwatar/layers/CakeTest.java
@@ -88,8 +88,8 @@ public void testToString() {
     cake.setTopping(topping);
     cake.addLayer(layer);
 
-    final String expected = "id=1234 topping=id=2345 name=topping calories=20 " +
-            "layers=[id=3456 name=layer calories=100]";
+    final String expected = "id=1234 topping=id=2345 name=topping calories=20 " 
+            + "layers=[id=3456 name=layer calories=100]";
     assertEquals(expected, cake.toString());
 
   }
diff --git a/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java b/mediator/src/test/java/com/iluwatar/mediator/PartyMemberTest.java
@@ -12,7 +12,10 @@
 import java.util.function.Supplier;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 /**
  * Date: 12/19/15 - 10:13 PM
diff --git a/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java b/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java
@@ -90,8 +90,8 @@ public void testFindAllByAgeBetweenSpec() {
 
     assertEquals(3, persons.size());
     assertTrue(persons.stream().allMatch((item) -> {
-        return item.getAge() > 20 && item.getAge() < 40;
-      }));
+      return item.getAge() > 20 && item.getAge() < 40;
+    }));
   }
 
   @Test
diff --git a/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java b/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java
@@ -88,8 +88,8 @@ public void testFindAllByAgeBetweenSpec() {
 
     assertEquals(3, persons.size());
     assertTrue(persons.stream().allMatch((item) -> {
-        return item.getAge() > 20 && item.getAge() < 40;
-      }));
+      return item.getAge() > 20 && item.getAge() < 40;
+    }));
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,8 @@ public void testActualWrite() throws Exception {`
`67`	`67`	`public void testIoException() throws Exception {`
`68`	`68`	`final File temporaryFile = this.testFolder.newFile();`
`69`	`69`	`new SimpleFileWriter(temporaryFile.getPath(), writer -> {`
`70`		`- throw new IOException("");`
`71`		`- });`
	`70`	`+ throw new IOException("");`
	`71`	`+ });`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`}`