Repository: flink Updated Branches: refs/heads/master b32b8359e -> 4c3f6075b
[hotfix][checkstyle] only ignore checkstyle in existing packages under runtime.io.network - ignore runtime.io.(async|disk) - ignore runtime.io.network.(api|buffer|netty|partition|serialization|util) -> everything else will be checked against the ruleset - fix checkstyle errors in classes directly under runtime.io.network Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/6cfb7587 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/6cfb7587 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/6cfb7587 Branch: refs/heads/master Commit: 6cfb75874c2b625021eb478b29722d15f4c63f9f Parents: b32b835 Author: Nico Kruber <n...@data-artisans.com> Authored: Wed Dec 13 15:28:08 2017 +0100 Committer: Stefan Richter <s.rich...@data-artisans.com> Committed: Tue Jan 9 15:25:52 2018 +0100 ---------------------------------------------------------------------- .../apache/flink/runtime/io/network/ConnectionID.java | 2 +- .../flink/runtime/io/network/ConnectionManager.java | 2 +- .../flink/runtime/io/network/DataExchangeModeTest.java | 1 + .../runtime/io/network/DefaultChannelSelectorTest.java | 8 ++++---- .../flink/runtime/io/network/MockNetworkEnvironment.java | 4 +++- .../flink/runtime/io/network/NetworkEnvironmentTest.java | 5 ++--- tools/maven/suppressions-runtime.xml | 11 +++++++++-- 7 files changed, 21 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/6cfb7587/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionID.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionID.java index cc2a19d..b96fb57 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionID.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionID.java @@ -32,7 +32,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull; * a connection index. This allows multiple connections to the same task manager to be distinguished * by their connection index. * - * <p> The connection index is assigned by the {@link IntermediateResult} and ensures that it is + * <p>The connection index is assigned by the {@link IntermediateResult} and ensures that it is * safe to multiplex multiple data transfers over the same physical TCP connection. */ public class ConnectionID implements Serializable { http://git-wip-us.apache.org/repos/asf/flink/blob/6cfb7587/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionManager.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionManager.java index 1225230..8e0f36c 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionManager.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/io/network/ConnectionManager.java @@ -38,7 +38,7 @@ public interface ConnectionManager { PartitionRequestClient createPartitionRequestClient(ConnectionID connectionId) throws IOException, InterruptedException; /** - * Closes opened ChannelConnections in case of a resource release + * Closes opened ChannelConnections in case of a resource release. */ void closeOpenChannelConnections(ConnectionID connectionId); http://git-wip-us.apache.org/repos/asf/flink/blob/6cfb7587/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/DataExchangeModeTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/DataExchangeModeTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/DataExchangeModeTest.java index cae80e8..14176c5 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/DataExchangeModeTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/DataExchangeModeTest.java @@ -19,6 +19,7 @@ package org.apache.flink.runtime.io.network; import org.apache.flink.api.common.ExecutionMode; + import org.junit.Test; import static org.junit.Assert.assertNotNull; http://git-wip-us.apache.org/repos/asf/flink/blob/6cfb7587/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/DefaultChannelSelectorTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/DefaultChannelSelectorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/DefaultChannelSelectorTest.java index a54f5d9..e090c7f 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/DefaultChannelSelectorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/DefaultChannelSelectorTest.java @@ -18,20 +18,20 @@ package org.apache.flink.runtime.io.network; -import static org.junit.Assert.assertEquals; - import org.apache.flink.runtime.io.network.api.writer.RoundRobinChannelSelector; import org.apache.flink.types.StringValue; + import org.junit.Test; +import static org.junit.Assert.assertEquals; + /** * This class checks the functionality of the {@link RoundRobinChannelSelector} class. - * */ public class DefaultChannelSelectorTest { /** - * This test checks the channel selection + * This test checks the channel selection. */ @Test public void channelSelect() { http://git-wip-us.apache.org/repos/asf/flink/blob/6cfb7587/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/MockNetworkEnvironment.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/MockNetworkEnvironment.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/MockNetworkEnvironment.java index 3bbe6d5..7551545 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/MockNetworkEnvironment.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/MockNetworkEnvironment.java @@ -21,11 +21,13 @@ package org.apache.flink.runtime.io.network; import org.apache.flink.runtime.io.network.buffer.BufferPool; import org.apache.flink.runtime.io.network.buffer.NetworkBufferPool; -import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +/** + * Wrapper class to get a mocked {@link NetworkEnvironment}. + */ public class MockNetworkEnvironment { private static NetworkEnvironment networkEnvironment = mock(NetworkEnvironment.class); http://git-wip-us.apache.org/repos/asf/flink/blob/6cfb7587/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/NetworkEnvironmentTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/NetworkEnvironmentTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/NetworkEnvironmentTest.java index 4964be7..2a54769 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/NetworkEnvironmentTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/NetworkEnvironmentTest.java @@ -20,7 +20,6 @@ package org.apache.flink.runtime.io.network; import org.apache.flink.api.common.JobID; import org.apache.flink.runtime.io.disk.iomanager.IOManager; -import org.apache.flink.runtime.io.network.api.writer.ResultPartitionWriter; import org.apache.flink.runtime.io.network.buffer.BufferPool; import org.apache.flink.runtime.io.network.buffer.NetworkBufferPool; import org.apache.flink.runtime.io.network.partition.ResultPartition; @@ -49,9 +48,9 @@ import static org.mockito.Mockito.when; * Various tests for the {@link NetworkEnvironment} class. */ public class NetworkEnvironmentTest { - private final static int numBuffers = 1024; + private static final int numBuffers = 1024; - private final static int memorySegmentSize = 128; + private static final int memorySegmentSize = 128; /** * Verifies that {@link NetworkEnvironment#registerTask(Task)} sets up (un)bounded buffer pool http://git-wip-us.apache.org/repos/asf/flink/blob/6cfb7587/tools/maven/suppressions-runtime.xml ---------------------------------------------------------------------- diff --git a/tools/maven/suppressions-runtime.xml b/tools/maven/suppressions-runtime.xml index 8f0162d..16f444c 100644 --- a/tools/maven/suppressions-runtime.xml +++ b/tools/maven/suppressions-runtime.xml @@ -80,11 +80,18 @@ under the License. files="(.*)test[/\\](.*)runtime[/\\]instance[/\\](.*)" checks="AvoidStarImport"/> <suppress - files="(.*)runtime[/\\]io[/\\](.*)" + files="(.*)runtime[/\\]io[/\\](async|disk)[/\\](.*)" checks="NewlineAtEndOfFile|RegexpSingleline|TodoComment|RedundantImport|ImportOrder|RedundantModifier|JavadocMethod|JavadocParagraph|JavadocType|JavadocStyle|PackageName|TypeNameCheck|ConstantNameCheck|StaticVariableNameCheck|MemberNameCheck|MethodNameCheck|ParameterName|LocalFinalVariableName|LocalVariableName|LeftCurly|UpperEll|FallThrough|reliefPattern|SimplifyBooleanExpression|EmptyStatement|ModifierOrder|EmptyLineSeparator|WhitespaceAround|WhitespaceAfter|NoWhitespaceAfter|NoWhitespaceBefore|OperatorWrap|ParenPad"/> <!--Only additional checks for test sources. Those checks were present in the "pre-strict" checkstyle but were not applied to test sources. We do not want to suppress them for sources directory--> <suppress - files="(.*)test[/\\](.*)runtime[/\\]io[/\\](.*)" + files="(.*)test[/\\](.*)runtime[/\\]io[/\\](async|disk)[/\\](.*)" + checks="AvoidStarImport|UnusedImports"/> + <suppress + files="(.*)runtime[/\\]io[/\\]network[/\\](api|buffer|netty|partition|serialization|util)[/\\](.*)" + checks="NewlineAtEndOfFile|RegexpSingleline|TodoComment|RedundantImport|ImportOrder|RedundantModifier|JavadocMethod|JavadocParagraph|JavadocType|JavadocStyle|PackageName|TypeNameCheck|ConstantNameCheck|StaticVariableNameCheck|MemberNameCheck|MethodNameCheck|ParameterName|LocalFinalVariableName|LocalVariableName|LeftCurly|UpperEll|FallThrough|reliefPattern|SimplifyBooleanExpression|EmptyStatement|ModifierOrder|EmptyLineSeparator|WhitespaceAround|WhitespaceAfter|NoWhitespaceAfter|NoWhitespaceBefore|OperatorWrap|ParenPad"/> + <!--Only additional checks for test sources. Those checks were present in the "pre-strict" checkstyle but were not applied to test sources. We do not want to suppress them for sources directory--> + <suppress + files="(.*)test[/\\](.*)runtime[/\\]io[/\\]network[/\\](api|buffer|netty|partition|serialization|util)[/\\](.*)" checks="AvoidStarImport|UnusedImports"/> <suppress files="(.*)runtime[/\\]jobgraph[/\\](.*)"
