Merge pull request #71 from sebright/checkstyle-unused-imports

Checks for unused imports with Checkstyle.

Author: sebright2

.travis.yml

@@ -8,10 +8,13 @@ matrix:
     env: BUILD=MVN
 
   - jdk: oraclejdk7
-    env: BUILD=MVN
+    env: BUILD=MVN STYLE_CHECK=google_checks.xml
 
   - jdk: oraclejdk8
-    env: BUILD=MVN
+    env: BUILD=MVN STYLE_CHECK=google_checks.xml
+
+  - jdk: oraclejdk8
+    env: BUILD=MVN STYLE_CHECK=checkstyle_custom_checks.xml
 
   - jdk: oraclejdk8
     env: BUILD=BAZEL
@@ -49,6 +52,6 @@ script:
           "openjdk6")
             mvn verify -P java6 ;;
           *)
-            mvn verify ;;
+            mvn verify -Dcheckstyle.config=$STYLE_CHECK ;;
         esac
     esac

checkstyle_custom_checks.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<module name = "Checker">
+  <property name="charset" value="UTF-8"/>
+  <property name="severity" value="error"/>
+  <module name="TreeWalker">
+    <module name="UnusedImports"/>
+  </module>
+</module>

core/java/com/google/instrumentation/stats/RpcConstants.java

@@ -15,8 +15,6 @@
 
 import com.google.instrumentation.stats.MeasurementDescriptor.BasicUnit;
 import com.google.instrumentation.stats.MeasurementDescriptor.MeasurementUnit;
-import com.google.instrumentation.stats.ViewDescriptor.DistributionViewDescriptor;
-import com.google.instrumentation.stats.ViewDescriptor.IntervalViewDescriptor;
 
 import java.util.Arrays;
 import java.util.List;

core/pom.xml

@@ -15,6 +15,11 @@
     <artifactId>census-parent</artifactId>
     <version>0.1.0-SNAPSHOT</version>
   </parent>
+
+  <properties>
+    <checkstyle.config>google_checks.xml</checkstyle.config>
+  </properties>
+
   <build>
     <sourceDirectory>java</sourceDirectory>
     <plugins>
@@ -73,7 +78,7 @@
                 <id>validate</id>
                 <phase>validate</phase>
                 <configuration>
-                  <configLocation>google_checks.xml</configLocation>
+                  <configLocation>${checkstyle.config}</configLocation>
                   <encoding>UTF-8</encoding>
                   <consoleOutput>true</consoleOutput>
                   <failsOnViolation>true</failsOnViolation>

core_impl/pom.xml

@@ -16,6 +16,10 @@
     <version>0.1.0-SNAPSHOT</version>
   </parent>
 
+  <properties>
+    <checkstyle.config>google_checks.xml</checkstyle.config>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.google.census</groupId>
@@ -89,7 +93,7 @@
                 <id>validate</id>
                 <phase>validate</phase>
                 <configuration>
-                  <configLocation>google_checks.xml</configLocation>
+                  <configLocation>${checkstyle.config}</configLocation>
                   <encoding>UTF-8</encoding>
                   <consoleOutput>true</consoleOutput>
                   <failsOnViolation>true</failsOnViolation>