You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/07/13 09:53:10 UTC
[3/3] flink git commit: [FLINK-6901] Make strict-checkstyle the
default
[FLINK-6901] Make strict-checkstyle the default
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/bf0846fc
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/bf0846fc
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/bf0846fc
Branch: refs/heads/master
Commit: bf0846fc61d38d56a6d0bd690dff64f8ac0a7082
Parents: 69c8b44
Author: zentol <ch...@apache.org>
Authored: Mon Jun 12 17:44:51 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Thu Jul 13 11:52:35 2017 +0200
----------------------------------------------------------------------
flink-annotations/pom.xml | 38 --
flink-connectors/pom.xml | 39 --
flink-contrib/flink-connector-wikiedits/pom.xml | 39 --
.../flink-statebackend-rocksdb/pom.xml | 39 --
flink-contrib/flink-storm-examples/pom.xml | 35 -
flink-contrib/flink-storm/pom.xml | 39 --
flink-contrib/flink-streaming-contrib/pom.xml | 35 -
flink-core/pom.xml | 29 +
.../org/apache/flink/util/StringValueUtils.java | 6 +-
flink-dist/pom.xml | 40 --
flink-examples/pom.xml | 39 --
flink-fs-tests/pom.xml | 35 -
flink-java/pom.xml | 29 +
flink-java8/pom.xml | 34 -
flink-libraries/pom.xml | 39 --
flink-mesos/pom.xml | 35 -
flink-metrics/pom.xml | 39 --
flink-optimizer/pom.xml | 29 +
flink-quickstart/pom.xml | 35 -
flink-runtime-web/pom.xml | 35 -
flink-runtime/pom.xml | 90 +--
.../org/apache/flink/runtime/blob/BlobView.java | 2 -
.../checkpoint/CheckpointCoordinator.java | 3 +-
.../executiongraph/ExecutionGraphBuilder.java | 7 +-
.../io/network/netty/NettyBufferPool.java | 5 -
.../AbstractCachedBuildSideJoinDriver.java | 3 +-
.../operators/AbstractOuterJoinDriver.java | 3 +-
.../flink/runtime/operators/JoinDriver.java | 3 +-
.../sort/AbstractMergeInnerJoinIterator.java | 6 +-
.../sort/AbstractMergeOuterJoinIterator.java | 6 +-
flink-scala-shell/pom.xml | 36 -
flink-scala/pom.xml | 36 -
flink-streaming-java/pom.xml | 36 -
flink-test-utils-parent/pom.xml | 40 --
flink-tests/pom.xml | 38 +-
flink-yarn-tests/pom.xml | 35 -
.../main/java/org/apache/flink/yarn/Utils.java | 2 +-
pom.xml | 10 +-
tools/maven/checkstyle.xml | 675 +++++++++++++++----
tools/maven/strict-checkstyle.xml | 566 ----------------
tools/maven/suppressions-core.xml | 29 +
tools/maven/suppressions-java.xml | 29 +
tools/maven/suppressions-optimizer.xml | 29 +
tools/maven/suppressions-runtime.xml | 101 +++
44 files changed, 879 insertions(+), 1599 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/flink-annotations/pom.xml b/flink-annotations/pom.xml
index 08e10f5..b375611 100644
--- a/flink-annotations/pom.xml
+++ b/flink-annotations/pom.xml
@@ -34,42 +34,4 @@ under the License.
<packaging>jar</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-connectors/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/pom.xml b/flink-connectors/pom.xml
index cbb48e0..5af85b8 100644
--- a/flink-connectors/pom.xml
+++ b/flink-connectors/pom.xml
@@ -101,44 +101,5 @@ under the License.
</modules>
</profile>
</profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-contrib/flink-connector-wikiedits/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-connector-wikiedits/pom.xml b/flink-contrib/flink-connector-wikiedits/pom.xml
index 1e5fbfd..20b6db4 100644
--- a/flink-contrib/flink-connector-wikiedits/pom.xml
+++ b/flink-contrib/flink-connector-wikiedits/pom.xml
@@ -47,43 +47,4 @@ under the License.
<version>1.10</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-contrib/flink-statebackend-rocksdb/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-statebackend-rocksdb/pom.xml b/flink-contrib/flink-statebackend-rocksdb/pom.xml
index f3d9da5..527ca18 100644
--- a/flink-contrib/flink-statebackend-rocksdb/pom.xml
+++ b/flink-contrib/flink-statebackend-rocksdb/pom.xml
@@ -92,43 +92,4 @@ under the License.
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-contrib/flink-storm-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-storm-examples/pom.xml b/flink-contrib/flink-storm-examples/pom.xml
index 2133eef..cddb6ef 100644
--- a/flink-contrib/flink-storm-examples/pom.xml
+++ b/flink-contrib/flink-storm-examples/pom.xml
@@ -377,41 +377,6 @@ under the License.
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
<pluginManagement>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-contrib/flink-storm/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-storm/pom.xml b/flink-contrib/flink-storm/pom.xml
index 1baf26b..a10ff68 100644
--- a/flink-contrib/flink-storm/pom.xml
+++ b/flink-contrib/flink-storm/pom.xml
@@ -181,44 +181,5 @@ under the License.
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-contrib/flink-streaming-contrib/pom.xml
----------------------------------------------------------------------
diff --git a/flink-contrib/flink-streaming-contrib/pom.xml b/flink-contrib/flink-streaming-contrib/pom.xml
index 812043c..2381d70 100644
--- a/flink-contrib/flink-streaming-contrib/pom.xml
+++ b/flink-contrib/flink-streaming-contrib/pom.xml
@@ -182,41 +182,6 @@ under the License.
<configLocation>${project.basedir}/../../tools/maven/scalastyle-config.xml</configLocation>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-core/pom.xml
----------------------------------------------------------------------
diff --git a/flink-core/pom.xml b/flink-core/pom.xml
index c6ba680..7239d33 100644
--- a/flink-core/pom.xml
+++ b/flink-core/pom.xml
@@ -158,6 +158,35 @@ under the License.
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>6.19</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+ <configLocation>/tools/maven/checkstyle.xml</configLocation>
+ <suppressionsLocation>/tools/maven/suppressions-core.xml</suppressionsLocation>
+ <includeTestSourceDirectory>false</includeTestSourceDirectory>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
+ </plugin>
<!-- activate API compatibility checks -->
<plugin>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-core/src/main/java/org/apache/flink/util/StringValueUtils.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/util/StringValueUtils.java b/flink-core/src/main/java/org/apache/flink/util/StringValueUtils.java
index cffe8b3..03d955f 100644
--- a/flink-core/src/main/java/org/apache/flink/util/StringValueUtils.java
+++ b/flink-core/src/main/java/org/apache/flink/util/StringValueUtils.java
@@ -114,7 +114,8 @@ public final class StringValueUtils {
int pos = this.pos;
// skip the delimiter
- for (; pos < limit && Character.isWhitespace(data[pos]); pos++);
+ for (; pos < limit && Character.isWhitespace(data[pos]); pos++) {
+ }
if (pos >= limit) {
this.pos = pos;
@@ -122,7 +123,8 @@ public final class StringValueUtils {
}
final int start = pos;
- for (; pos < limit && !Character.isWhitespace(data[pos]); pos++);
+ for (; pos < limit && !Character.isWhitespace(data[pos]); pos++) {
+ }
this.pos = pos;
target.setValue(this.toTokenize, start, pos - start);
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 06a656d..7f2ee87 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -410,46 +410,6 @@ under the License.
</configuration>
</plugin>
- <!-- IMPORTANT: Moving the plugin definition after the shade and assembly plugin definition somehow
- changes the order in which the assembly and shade plugins are executed in the package phase.
- Therefore, we have to define the checkstyle-plugin before the shade-plugin. See FLINK-6792 for more
- details. -->
- <!-- Java Code Style -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!--Build uber jar-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-examples/pom.xml b/flink-examples/pom.xml
index 76bfbc1..21db590 100644
--- a/flink-examples/pom.xml
+++ b/flink-examples/pom.xml
@@ -71,43 +71,4 @@ under the License.
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-fs-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml
index 972a452..446d167 100644
--- a/flink-fs-tests/pom.xml
+++ b/flink-fs-tests/pom.xml
@@ -110,41 +110,6 @@ under the License.
</environmentVariables>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java/pom.xml b/flink-java/pom.xml
index 24fc0f6..75de0bc 100644
--- a/flink-java/pom.xml
+++ b/flink-java/pom.xml
@@ -85,6 +85,35 @@ under the License.
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>6.19</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+ <configLocation>/tools/maven/checkstyle.xml</configLocation>
+ <suppressionsLocation>/tools/maven/suppressions-java.xml</suppressionsLocation>
+ <includeTestSourceDirectory>false</includeTestSourceDirectory>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
+ </plugin>
<!-- activate API compatibility checks -->
<plugin>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-java8/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java8/pom.xml b/flink-java8/pom.xml
index bfc9cdd..fb7da02 100644
--- a/flink-java8/pom.xml
+++ b/flink-java8/pom.xml
@@ -230,40 +230,6 @@ under the License.
</lifecycleMappingMetadata>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</pluginManagement>
</build>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-libraries/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/pom.xml b/flink-libraries/pom.xml
index 2fde26e..5b4cf79 100644
--- a/flink-libraries/pom.xml
+++ b/flink-libraries/pom.xml
@@ -61,43 +61,4 @@ under the License.
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-mesos/pom.xml
----------------------------------------------------------------------
diff --git a/flink-mesos/pom.xml b/flink-mesos/pom.xml
index 94187ee..4dae731 100644
--- a/flink-mesos/pom.xml
+++ b/flink-mesos/pom.xml
@@ -300,41 +300,6 @@ under the License.
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/flink-metrics/pom.xml b/flink-metrics/pom.xml
index 3b655c4..5313498 100644
--- a/flink-metrics/pom.xml
+++ b/flink-metrics/pom.xml
@@ -61,43 +61,4 @@ under the License.
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-optimizer/pom.xml
----------------------------------------------------------------------
diff --git a/flink-optimizer/pom.xml b/flink-optimizer/pom.xml
index 499487b..25c39c0 100644
--- a/flink-optimizer/pom.xml
+++ b/flink-optimizer/pom.xml
@@ -77,6 +77,35 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>6.19</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+ <configLocation>/tools/maven/checkstyle.xml</configLocation>
+ <suppressionsLocation>/tools/maven/suppressions-optimizer.xml</suppressionsLocation>
+ <includeTestSourceDirectory>false</includeTestSourceDirectory>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/flink-quickstart/pom.xml b/flink-quickstart/pom.xml
index 29befc8..ea669cd 100644
--- a/flink-quickstart/pom.xml
+++ b/flink-quickstart/pom.xml
@@ -92,41 +92,6 @@ under the License.
</delimiters>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
<resources>
<resource>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-runtime-web/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime-web/pom.xml b/flink-runtime-web/pom.xml
index 988cd76..9a3c29f 100644
--- a/flink-runtime-web/pom.xml
+++ b/flink-runtime-web/pom.xml
@@ -135,41 +135,6 @@ under the License.
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 5644cfd..f0c21f4 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -212,6 +212,35 @@ under the License.
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>6.19</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <configuration>
+ <configLocation>/tools/maven/checkstyle.xml</configLocation>
+ <suppressionsLocation>/tools/maven/suppressions-runtime.xml</suppressionsLocation>
+ <includeTestSourceDirectory>false</includeTestSourceDirectory>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
+ </plugin>
<!-- Scala Compiler -->
<plugin>
<groupId>net.alchim31.maven</groupId>
@@ -408,67 +437,6 @@ under the License.
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- <excludes>
- **/runtime/blob/**,
- **/runtime/checkpoint/**,
- **/runtime/client/**,
- **/runtime/clusterframework/**,
- **/runtime/concurrent/**,
- **/runtime/execution/**,
- **/runtime/executiongraph/**,
- **/runtime/highavailability/**,
- **/runtime/instance/**,
- **/runtime/io/**,
- **/runtime/jobgraph/**,
- **/runtime/jobmanager/**,
- **/runtime/jobmaster/**,
- **/runtime/leaderelection/**,
- **/runtime/messages/**,
- **/runtime/minicluster/**,
- **/runtime/operators/**,
- **/runtime/resourcemanager/**,
- **/runtime/rpc/**,
- **/runtime/state/**,
- **/runtime/taskexecutor/**,
- **/runtime/taskmanager/**,
- **/runtime/testutils/**,
- **/runtime/util/**,
- **/runtime/zookeeper/**,
- </excludes>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobView.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobView.java b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobView.java
index d174cf0..2e2e4a7 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobView.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/blob/BlobView.java
@@ -18,8 +18,6 @@
package org.apache.flink.runtime.blob;
-import org.apache.flink.api.common.JobID;
-
import java.io.File;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java
index 4236216..905d132 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinator.java
@@ -21,7 +21,6 @@ package org.apache.flink.runtime.checkpoint;
import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.JobID;
import org.apache.flink.api.common.time.Time;
-import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.CoreOptions;
import org.apache.flink.runtime.checkpoint.hooks.MasterHooks;
import org.apache.flink.runtime.checkpoint.savepoint.SavepointLoader;
@@ -46,10 +45,12 @@ import org.apache.flink.runtime.state.TaskStateHandles;
import org.apache.flink.runtime.taskmanager.DispatcherThreadFactory;
import org.apache.flink.util.Preconditions;
import org.apache.flink.util.StringUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
+
import java.util.ArrayDeque;
import java.util.HashMap;
import java.util.Iterator;
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphBuilder.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphBuilder.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphBuilder.java
index 01ac8a8..3885e8d 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphBuilder.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphBuilder.java
@@ -21,17 +21,16 @@ package org.apache.flink.runtime.executiongraph;
import org.apache.flink.api.common.ExecutionConfig;
import org.apache.flink.api.common.JobID;
import org.apache.flink.api.common.time.Time;
-import org.apache.flink.configuration.CoreOptions;
-import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
+import org.apache.flink.configuration.CoreOptions;
import org.apache.flink.configuration.IllegalConfigurationException;
import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.metrics.MetricGroup;
import org.apache.flink.runtime.JobException;
import org.apache.flink.runtime.checkpoint.CheckpointIDCounter;
import org.apache.flink.runtime.checkpoint.CheckpointRecoveryFactory;
-import org.apache.flink.runtime.checkpoint.CompletedCheckpointStore;
import org.apache.flink.runtime.checkpoint.CheckpointStatsTracker;
+import org.apache.flink.runtime.checkpoint.CompletedCheckpointStore;
import org.apache.flink.runtime.checkpoint.MasterTriggerRestoreHook;
import org.apache.flink.runtime.checkpoint.hooks.MasterHooks;
import org.apache.flink.runtime.client.JobExecutionException;
@@ -53,9 +52,11 @@ import org.apache.flink.runtime.state.AbstractStateBackend;
import org.apache.flink.runtime.state.StateBackend;
import org.apache.flink.util.DynamicCodeLoadingException;
import org.apache.flink.util.SerializedValue;
+
import org.slf4j.Logger;
import javax.annotation.Nullable;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyBufferPool.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyBufferPool.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyBufferPool.java
index 4a88b34..175726b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyBufferPool.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/netty/NettyBufferPool.java
@@ -22,7 +22,6 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.CompositeByteBuf;
import io.netty.buffer.PooledByteBufAllocator;
-import io.netty.util.internal.PlatformDependent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import scala.Option;
@@ -61,10 +60,6 @@ public class NettyBufferPool implements ByteBufAllocator {
checkArgument(numberOfArenas >= 1, "Number of arenas");
this.numberOfArenas = numberOfArenas;
- if (!PlatformDependent.hasUnsafe()) {
- LOG.warn("Using direct buffers, but sun.misc.Unsafe not available.");
- }
-
// We strictly prefer direct buffers and disallow heap allocations.
boolean preferDirect = true;
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractCachedBuildSideJoinDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractCachedBuildSideJoinDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractCachedBuildSideJoinDriver.java
index 3a69642..712018b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractCachedBuildSideJoinDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractCachedBuildSideJoinDriver.java
@@ -173,7 +173,8 @@ public abstract class AbstractCachedBuildSideJoinDriver<IT1, IT2, OT> extends Jo
final FlatJoinFunction<IT1, IT2, OT> matchStub = this.taskContext.getStub();
final Collector<OT> collector = new CountingCollector<>(this.taskContext.getOutputCollector(), numRecordsOut);
- while (this.running && matchIterator != null && matchIterator.callWithNextKey(matchStub, collector));
+ while (this.running && matchIterator != null && matchIterator.callWithNextKey(matchStub, collector)) {
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractOuterJoinDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractOuterJoinDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractOuterJoinDriver.java
index 3987ba0..53ce968 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractOuterJoinDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/AbstractOuterJoinDriver.java
@@ -157,7 +157,8 @@ public abstract class AbstractOuterJoinDriver<IT1, IT2, OT> implements Driver<Fl
final Collector<OT> collector = new CountingCollector<>(this.taskContext.getOutputCollector(), numRecordsOut);
final JoinTaskIterator<IT1, IT2, OT> outerJoinIterator = this.outerJoinIterator;
- while (this.running && outerJoinIterator.callWithNextKey(joinStub, collector)) ;
+ while (this.running && outerJoinIterator.callWithNextKey(joinStub, collector)) {
+ }
}
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinDriver.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinDriver.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinDriver.java
index 551bbff..b8cb545 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinDriver.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/JoinDriver.java
@@ -219,7 +219,8 @@ public class JoinDriver<IT1, IT2, OT> implements Driver<FlatJoinFunction<IT1, IT
final Collector<OT> collector = new CountingCollector<>(this.taskContext.getOutputCollector(), numRecordsOut);
final JoinTaskIterator<IT1, IT2, OT> joinIterator = this.joinIterator;
- while (this.running && joinIterator.callWithNextKey(joinStub, collector));
+ while (this.running && joinIterator.callWithNextKey(joinStub, collector)) {
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeInnerJoinIterator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeInnerJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeInnerJoinIterator.java
index 1b54f20..23d5889 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeInnerJoinIterator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeInnerJoinIterator.java
@@ -65,8 +65,10 @@ public abstract class AbstractMergeInnerJoinIterator<T1, T2, O> extends Abstract
throws Exception {
if (!this.iterator1.nextKey() || !this.iterator2.nextKey()) {
// consume all remaining keys (hack to prevent remaining inputs during iterations, lets get rid of this soon)
- while (this.iterator1.nextKey()) ;
- while (this.iterator2.nextKey()) ;
+ while (this.iterator1.nextKey()) {
+ }
+ while (this.iterator2.nextKey()) {
+ }
return false;
}
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeOuterJoinIterator.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeOuterJoinIterator.java b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeOuterJoinIterator.java
index 74faeb3..d714c2c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeOuterJoinIterator.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/operators/sort/AbstractMergeOuterJoinIterator.java
@@ -89,7 +89,8 @@ public abstract class AbstractMergeOuterJoinIterator<T1, T2, O> extends Abstract
return true;
} else {
//consume rest of left side
- while (iterator1.nextKey()) ;
+ while (iterator1.nextKey()) {
+ }
it1Empty = true;
return false;
}
@@ -100,7 +101,8 @@ public abstract class AbstractMergeOuterJoinIterator<T1, T2, O> extends Abstract
return true;
} else {
//consume rest of right side
- while (iterator2.nextKey()) ;
+ while (iterator2.nextKey()) {
+ }
it2Empty = true;
return false;
}
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-scala-shell/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml
index 6f490e4..c9acbec 100644
--- a/flink-scala-shell/pom.xml
+++ b/flink-scala-shell/pom.xml
@@ -206,42 +206,6 @@ under the License.
</configuration>
</plugin>
- <!-- Java Code Style -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index 2df526e..32581a6 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -243,42 +243,6 @@ under the License.
</executions>
</plugin>
- <!-- Java check style -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-streaming-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-streaming-java/pom.xml b/flink-streaming-java/pom.xml
index 6976519..aefee5d 100644
--- a/flink-streaming-java/pom.xml
+++ b/flink-streaming-java/pom.xml
@@ -122,42 +122,6 @@ under the License.
</execution>
</executions>
</plugin>
-
- <!-- We have more strict checkstyle rules than the rest of the project -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-test-utils-parent/pom.xml
----------------------------------------------------------------------
diff --git a/flink-test-utils-parent/pom.xml b/flink-test-utils-parent/pom.xml
index e85573f..48e4550 100644
--- a/flink-test-utils-parent/pom.xml
+++ b/flink-test-utils-parent/pom.xml
@@ -39,45 +39,5 @@ under the License.
<module>flink-test-utils-junit</module>
<module>flink-test-utils</module>
</modules>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
index 3f67a88..215adc0 100644
--- a/flink-tests/pom.xml
+++ b/flink-tests/pom.xml
@@ -239,8 +239,7 @@ under the License.
</dependencies>
<build>
- <plugins>
-
+ <plugins>
<!-- Scala Compiler -->
<plugin>
<groupId>net.alchim31.maven</groupId>
@@ -338,41 +337,6 @@ under the License.
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- Scala Code Style, most of the configuration done via plugin management -->
<plugin>
<groupId>org.scalastyle</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-yarn-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml
index 349283a..b5e4025 100644
--- a/flink-yarn-tests/pom.xml
+++ b/flink-yarn-tests/pom.xml
@@ -335,41 +335,6 @@ under the License.
<extensions>true</extensions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
- <version>6.19</version>
- </dependency>
- </dependencies>
- <configuration>
- <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
- <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- </configuration>
- <executions>
- <!--
- Execute checkstyle after compilation but before tests.
-
- This ensures that any parsing or type checking errors are from
- javac, so they look as expected. Beyond that, we want to
- fail as early as possible.
- -->
- <execution>
- <phase>test-compile</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!--
Copy batch and streaming examples programs in to the flink-yarn-tests/target/programs
directory to be run during YARN integration tests.
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java b/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
index 788239b..662617f 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
@@ -21,8 +21,8 @@ package org.apache.flink.yarn;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.runtime.clusterframework.BootstrapTools;
import org.apache.flink.runtime.clusterframework.ContaineredTaskManagerParameters;
-
import org.apache.flink.runtime.security.SecurityUtils;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
http://git-wip-us.apache.org/repos/asf/flink/blob/bf0846fc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cbdc978..2f14765 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1014,6 +1014,13 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>6.19</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>validate</id>
@@ -1025,9 +1032,10 @@ under the License.
</executions>
<configuration>
<suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
- <suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
<configLocation>/tools/maven/checkstyle.xml</configLocation>
<logViolationsToConsole>true</logViolationsToConsole>
+ <failOnViolation>true</failOnViolation>
</configuration>
</plugin>
<plugin>