Repository: bahir Updated Branches: refs/heads/master 335f605e7 -> d6770f833
[BAHIR-23] Build should fail on Checkstyle violations Currently the maven build is configured to: - fail for code style violations in Scala files - succeed despite code style violations in Java files - exclude Scala test sources (and examples) from code style checks - include Java test sources (and examples) in code style checks This changes the maven build configuration to - fail for code style violations in both Scala and Java sources - include test sources (and examples) in style checks for both Scala and Java sources Additionally cleaning up unsupported checkstyle configuration elements (apparently copy-and-pasted from scalastyle configuration) Project: http://git-wip-us.apache.org/repos/asf/bahir/repo Commit: http://git-wip-us.apache.org/repos/asf/bahir/commit/d6770f83 Tree: http://git-wip-us.apache.org/repos/asf/bahir/tree/d6770f83 Diff: http://git-wip-us.apache.org/repos/asf/bahir/diff/d6770f83 Branch: refs/heads/master Commit: d6770f833ec723f24ea452c11fd102624d12c3f2 Parents: 335f605 Author: Christian Kadner <[email protected]> Authored: Fri Jul 8 23:26:51 2016 -0700 Committer: Luciano Resende <[email protected]> Committed: Mon Jul 11 17:16:47 2016 -0700 ---------------------------------------------------------------------- dev/checkstyle-suppressions.xml | 16 ++-------------- pom.xml | 11 +++++------ .../apache/spark/streaming/mqtt/package-info.java | 2 +- .../twitter/JavaTwitterHashTagJoinSentiments.java | 7 ++++--- .../spark/streaming/twitter/package-info.java | 2 +- .../apache/spark/streaming/zeromq/package-info.java | 2 +- .../streaming/zeromq/JavaZeroMQStreamSuite.java | 4 ++-- 7 files changed, 16 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bahir/blob/d6770f83/dev/checkstyle-suppressions.xml ---------------------------------------------------------------------- diff --git a/dev/checkstyle-suppressions.xml b/dev/checkstyle-suppressions.xml index bfc2e73..002fb3a 100644 --- a/dev/checkstyle-suppressions.xml +++ b/dev/checkstyle-suppressions.xml @@ -28,18 +28,6 @@ --> <suppressions> - <suppress checks=".*" - files="core/src/main/java/org/apache/spark/util/collection/TimSort.java"/> - <suppress checks=".*" - files="sql/core/src/main/java/org/apache/spark/sql/api.java/*"/> - <suppress checks="LineLength" - files="src/test/java/org/apache/spark/sql/hive/test/Complex.java"/> - <suppress checks="LineLength" - files="src/main/java/org/apache/spark/examples/JavaLogQuery.java"/> - <suppress checks="LineLength" - files="src/main/java/org/apache/hive/service/*"/> - <suppress checks="MethodName" - files="src/main/java/org/apache/hive/service/auth/PasswdAuthenticationProvider.java"/> - <suppress checks="NoFinalizer" - files="src/main/java/org/apache/hive/service/server/ThreadWithGarbageCleanup.java"/> + <suppress checks="RedundantModifier" + files="streaming-akka/examples/src/main/java/org/apache/spark/examples/streaming/akka/JavaActorWordCount.java"/> </suppressions> http://git-wip-us.apache.org/repos/asf/bahir/blob/d6770f83/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8b3e7af..bbfa340 100644 --- a/pom.xml +++ b/pom.xml @@ -847,7 +847,7 @@ <configuration> <verbose>false</verbose> <failOnViolation>true</failOnViolation> - <includeTestSourceDirectory>false</includeTestSourceDirectory> + <includeTestSourceDirectory>true</includeTestSourceDirectory> <failOnWarning>false</failOnWarning> <sourceDirectory>${basedir}/src/main/scala</sourceDirectory> <testSourceDirectories>${basedir}/src/test/scala,${basedir}/examples/src/main/scala</testSourceDirectories> @@ -869,16 +869,15 @@ <artifactId>maven-checkstyle-plugin</artifactId> <version>2.17</version> <configuration> - <verbose>false</verbose> - <failOnViolation>false</failOnViolation> + <consoleOutput>false</consoleOutput> + <failOnViolation>true</failOnViolation> <includeTestSourceDirectory>true</includeTestSourceDirectory> - <failOnWarning>false</failOnWarning> + <failsOnError>false</failsOnError> <sourceDirectories>${basedir}/src/main/java,${basedir}/src/main/scala</sourceDirectories> <testSourceDirectories>${basedir}/src/test/java,${basedir}/examples/src/main/java,${basedir}/examples/src/main/scala</testSourceDirectories> <configLocation>dev/checkstyle.xml</configLocation> <outputFile>${basedir}/target/checkstyle-output.xml</outputFile> - <inputEncoding>${project.build.sourceEncoding}</inputEncoding> - <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> + <encoding>${project.build.sourceEncoding}</encoding> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/bahir/blob/d6770f83/streaming-mqtt/src/main/scala/org/apache/spark/streaming/mqtt/package-info.java ---------------------------------------------------------------------- diff --git a/streaming-mqtt/src/main/scala/org/apache/spark/streaming/mqtt/package-info.java b/streaming-mqtt/src/main/scala/org/apache/spark/streaming/mqtt/package-info.java index 728e0d8..290fb09 100644 --- a/streaming-mqtt/src/main/scala/org/apache/spark/streaming/mqtt/package-info.java +++ b/streaming-mqtt/src/main/scala/org/apache/spark/streaming/mqtt/package-info.java @@ -18,4 +18,4 @@ /** * MQTT receiver for Spark Streaming. */ -package org.apache.spark.streaming.mqtt; \ No newline at end of file +package org.apache.spark.streaming.mqtt; http://git-wip-us.apache.org/repos/asf/bahir/blob/d6770f83/streaming-twitter/examples/src/main/java/org/apache/spark/examples/streaming/twitter/JavaTwitterHashTagJoinSentiments.java ---------------------------------------------------------------------- diff --git a/streaming-twitter/examples/src/main/java/org/apache/spark/examples/streaming/twitter/JavaTwitterHashTagJoinSentiments.java b/streaming-twitter/examples/src/main/java/org/apache/spark/examples/streaming/twitter/JavaTwitterHashTagJoinSentiments.java index 8a14192..38749d1 100644 --- a/streaming-twitter/examples/src/main/java/org/apache/spark/examples/streaming/twitter/JavaTwitterHashTagJoinSentiments.java +++ b/streaming-twitter/examples/src/main/java/org/apache/spark/examples/streaming/twitter/JavaTwitterHashTagJoinSentiments.java @@ -47,8 +47,8 @@ public class JavaTwitterHashTagJoinSentiments { public static void main(String[] args) { if (args.length < 4) { - System.err.println("Usage: JavaTwitterHashTagJoinSentiments <consumer key> <consumer secret>" + - " <access token> <access token secret> [<filters>]"); + System.err.println("Usage: JavaTwitterHashTagJoinSentiments <consumer key>" + + " <consumer secret> <access token> <access token secret> [<filters>]"); System.exit(1); } @@ -97,7 +97,8 @@ public class JavaTwitterHashTagJoinSentiments { // Read in the word-sentiment list and create a static RDD from it String wordSentimentFilePath = "streaming-twitter/examples/data/AFINN-111.txt"; - final JavaPairRDD<String, Double> wordSentiments = jssc.sparkContext().textFile(wordSentimentFilePath) + final JavaPairRDD<String, Double> wordSentiments = jssc.sparkContext() + .textFile(wordSentimentFilePath) .mapToPair(new PairFunction<String, String, Double>(){ @Override public Tuple2<String, Double> call(String line) { http://git-wip-us.apache.org/repos/asf/bahir/blob/d6770f83/streaming-twitter/src/main/scala/org/apache/spark/streaming/twitter/package-info.java ---------------------------------------------------------------------- diff --git a/streaming-twitter/src/main/scala/org/apache/spark/streaming/twitter/package-info.java b/streaming-twitter/src/main/scala/org/apache/spark/streaming/twitter/package-info.java index 258c095..115dd7f 100644 --- a/streaming-twitter/src/main/scala/org/apache/spark/streaming/twitter/package-info.java +++ b/streaming-twitter/src/main/scala/org/apache/spark/streaming/twitter/package-info.java @@ -18,4 +18,4 @@ /** * Twitter feed receiver for spark streaming. */ -package org.apache.spark.streaming.twitter; \ No newline at end of file +package org.apache.spark.streaming.twitter; http://git-wip-us.apache.org/repos/asf/bahir/blob/d6770f83/streaming-zeromq/src/main/scala/org/apache/spark/streaming/zeromq/package-info.java ---------------------------------------------------------------------- diff --git a/streaming-zeromq/src/main/scala/org/apache/spark/streaming/zeromq/package-info.java b/streaming-zeromq/src/main/scala/org/apache/spark/streaming/zeromq/package-info.java index 587c524..0401b3f 100644 --- a/streaming-zeromq/src/main/scala/org/apache/spark/streaming/zeromq/package-info.java +++ b/streaming-zeromq/src/main/scala/org/apache/spark/streaming/zeromq/package-info.java @@ -18,4 +18,4 @@ /** * Zeromq receiver for spark streaming. */ -package org.apache.spark.streaming.zeromq; \ No newline at end of file +package org.apache.spark.streaming.zeromq; http://git-wip-us.apache.org/repos/asf/bahir/blob/d6770f83/streaming-zeromq/src/test/java/org/apache/spark/streaming/zeromq/JavaZeroMQStreamSuite.java ---------------------------------------------------------------------- diff --git a/streaming-zeromq/src/test/java/org/apache/spark/streaming/zeromq/JavaZeroMQStreamSuite.java b/streaming-zeromq/src/test/java/org/apache/spark/streaming/zeromq/JavaZeroMQStreamSuite.java index 9ff4b41..9fd0424 100644 --- a/streaming-zeromq/src/test/java/org/apache/spark/streaming/zeromq/JavaZeroMQStreamSuite.java +++ b/streaming-zeromq/src/test/java/org/apache/spark/streaming/zeromq/JavaZeroMQStreamSuite.java @@ -43,8 +43,8 @@ public class JavaZeroMQStreamSuite extends LocalJavaStreamingContext { JavaReceiverInputDStream<String> test2 = ZeroMQUtils.<String>createStream( ssc, publishUrl, subscribe, bytesToObjects, StorageLevel.MEMORY_AND_DISK_SER_2()); JavaReceiverInputDStream<String> test3 = ZeroMQUtils.<String>createStream( - ssc, publishUrl, subscribe, bytesToObjects, StorageLevel.MEMORY_AND_DISK_SER_2(), actorSystemCreator, - SupervisorStrategy.defaultStrategy()); + ssc, publishUrl, subscribe, bytesToObjects, StorageLevel.MEMORY_AND_DISK_SER_2(), + actorSystemCreator, SupervisorStrategy.defaultStrategy()); } }
