Merge pull request #331 from spotify/rculbertson/checkstyle

Updated checkstyle version and configuration
spotify · Dec 22, 2014 · 7802583 · 7802583
2 parents 2205d79 + e00949e
commit 7802583
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 22 deletions.
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -53,6 +53,9 @@ page at http://checkstyle.sourceforge.net/config.html -->
       <property name="severity" value="error"/>
     </module>
 
+    <module name="AvoidStarImport"/>
+    <module name="NoLineWrap"/>
+
     <!--
 
     NAMING CHECKS
@@ -211,6 +214,7 @@ page at http://checkstyle.sourceforge.net/config.html -->
       <property name="severity" value="error"/>
     </module>
 
+    <module name="ArrayTypeStyle"/>
 
     <!--
 
@@ -234,18 +238,25 @@ page at http://checkstyle.sourceforge.net/config.html -->
     -->
 
     <module name="WhitespaceAround">
-      <!-- Checks that various tokens are surrounded by whitespace.
-           This includes most binary operators and keywords followed
-           by regular or curly braces.
-      -->
-      <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR,
-        BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN,
-        EQUAL, GE, GT, LAND, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
-        LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
-        LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS,
-        MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION,
-        SL, SL_ASSIGN, SR_ASSIGN, STAR, STAR_ASSIGN"/>
-      <property name="severity" value="error"/>
+      <property name="allowEmptyConstructors" value="true"/>
+      <property name="allowEmptyMethods" value="true"/>
+      <property name="allowEmptyTypes" value="true"/>
+      <property name="allowEmptyLoops" value="true"/>
+      <message key="ws.notFollowed"
+               value="WhitespaceAround: ''{0}'' is not followed by whitespace."/>
+      <message key="ws.notPreceded"
+               value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+    </module>
+
+    <module name="GenericWhitespace">
+      <message key="ws.followed"
+               value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+      <message key="ws.preceded"
+               value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+      <message key="ws.illegalFollow"
+               value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+      <message key="ws.notPreceded"
+               value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
     </module>
 
     <module name="WhitespaceAfter">

diff --git a/helios-client/src/main/java/com/spotify/helios/common/Json.java b/helios-client/src/main/java/com/spotify/helios/common/Json.java
@@ -257,7 +257,7 @@ public static JsonNode readTree(final byte[] bytes) throws IOException {
     return OBJECT_MAPPER.readTree(bytes);
   }
 
-  public static JsonNode readTreeUnchecked(final byte[] bytes){
+  public static JsonNode readTreeUnchecked(final byte[] bytes) {
     try {
       return readTree(bytes);
     } catch (IOException e) {
@@ -269,7 +269,7 @@ public static JsonNode readTree(final String content) throws IOException {
     return OBJECT_MAPPER.readTree(content);
   }
 
-  public static JsonNode readTreeUnchecked(final String content){
+  public static JsonNode readTreeUnchecked(final String content) {
     try {
       return readTree(content);
     } catch (IOException e) {
@@ -281,7 +281,7 @@ public static JsonNode readTree(final File file) throws IOException {
     return OBJECT_MAPPER.readTree(file);
   }
 
-  public static JsonNode readTreeUnchecked(final File file){
+  public static JsonNode readTreeUnchecked(final File file) {
     try {
       return readTree(file);
     } catch (IOException e) {

diff --git a/helios-services/src/main/java/com/spotify/helios/agent/Agent.java b/helios-services/src/main/java/com/spotify/helios/agent/Agent.java
@@ -29,7 +29,11 @@
 import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.AbstractIdleService;
 
-import com.spotify.helios.common.descriptors.*;
+import com.spotify.helios.common.descriptors.Goal;
+import com.spotify.helios.common.descriptors.Job;
+import com.spotify.helios.common.descriptors.JobId;
+import com.spotify.helios.common.descriptors.Task;
+import com.spotify.helios.common.descriptors.TaskStatus;
 import com.spotify.helios.servicescommon.PersistentAtomicReference;
 import com.spotify.helios.servicescommon.Reactor;
 import com.spotify.helios.servicescommon.ReactorFactory;

diff --git a/helios-system-tests/src/main/java/com/spotify/helios/system/JobListTest.java b/helios-system-tests/src/main/java/com/spotify/helios/system/JobListTest.java
@@ -70,13 +70,15 @@ public void test() throws Exception {
       final Map<String, Object> resultObj2 = OBJECT_MAPPER.readValue(result2, MAP_TYPE);
       // It might conceivably get here at some point, but better be empty if it does
       assertTrue(resultObj2.isEmpty());
-    } catch (JsonParseException e) {}
+    } catch (JsonParseException ignored) {
+    }
 
     final String result3 = cli("jobs", "-y", "--json");
     try {
       final Map<String, Object> resultObj3 = OBJECT_MAPPER.readValue(result3, MAP_TYPE);
       assertTrue(result3, resultObj3.isEmpty());
-    } catch (JsonParseException e) {}
+    } catch (JsonParseException ignored) {
+    }
 
     HeliosClient client = defaultClient();
     client.deploy(Deployment.of(jobId, Goal.START), testHost());
@@ -86,6 +88,7 @@ public void test() throws Exception {
     try {
       final Map<String, Object> resultObj4 = OBJECT_MAPPER.readValue(result4, MAP_TYPE);
       assertFalse(resultObj4.isEmpty());
-    } catch (JsonParseException e) {}
+    } catch (JsonParseException ignored) {
+    }
   }
 }
diff --git a/helios-system-tests/src/main/java/com/spotify/helios/system/MasterRespondsWithNoZKTest.java b/helios-system-tests/src/main/java/com/spotify/helios/system/MasterRespondsWithNoZKTest.java
@@ -62,7 +62,8 @@ protected ZooKeeperTestManager zooKeeperTestManager() {
   }
 
   @Override
-  protected void tearDownJobs() {}
+  protected void tearDownJobs() {
+  }
 
   @Test
   public void test() throws Exception {
@@ -112,7 +113,9 @@ public CuratorFramework newClient(String connectString,
       try {
         when(builder.forPath(anyString())).thenThrow(
             new KeeperException.ConnectionLossException());
-      } catch (Exception e) {} // never throws
+      } catch (Exception ignored) {
+        // never throws
+      }
       when(curator.newNamespaceAwareEnsurePath(anyString())).thenReturn(mock(EnsurePath.class));
 
       return curator;

diff --git a/pom.xml b/pom.xml
@@ -439,7 +439,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.12.1</version>
+        <version>2.13</version>
         <executions>
           <execution>
             <id>validate</id>
@@ -456,6 +456,13 @@
             </goals>
           </execution>
         </executions>
+        <dependencies>
+          <dependency>
+            <groupId>com.puppycrawl.tools</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>6.1.1</version>
+          </dependency>
+        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>