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 2018/09/05 14:48:40 UTC
[flink] 07/07: [hotfix][checkstyle] Remove suppression for
runtime/concurrent
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit e5ff2de8b81243739dde82969ede9bcd71cd773b
Author: zentol <ch...@apache.org>
AuthorDate: Wed Sep 5 16:40:11 2018 +0200
[hotfix][checkstyle] Remove suppression for runtime/concurrent
---
.../org/apache/flink/runtime/concurrent/ConjunctFutureTest.java | 2 +-
.../java/org/apache/flink/runtime/concurrent/FutureUtilsTest.java | 2 +-
tools/maven/suppressions-runtime.xml | 7 -------
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/concurrent/ConjunctFutureTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/concurrent/ConjunctFutureTest.java
index f92504e..9f33866 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/concurrent/ConjunctFutureTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/concurrent/ConjunctFutureTest.java
@@ -193,7 +193,7 @@ public class ConjunctFutureTest extends TestLogger {
}
/**
- * Tests that the conjunct future returns upon completion the collection of all future values
+ * Tests that the conjunct future returns upon completion the collection of all future values.
*/
@Test
public void testConjunctFutureValue() throws ExecutionException, InterruptedException {
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/concurrent/FutureUtilsTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/concurrent/FutureUtilsTest.java
index 1639c91..c386952 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/concurrent/FutureUtilsTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/concurrent/FutureUtilsTest.java
@@ -535,7 +535,7 @@ public class FutureUtilsTest extends TestLogger {
final FlinkException suppressedException;
if (actual.equals(testException1)) {
- suppressedException = testException2;
+ suppressedException = testException2;
} else {
suppressedException = testException1;
}
diff --git a/tools/maven/suppressions-runtime.xml b/tools/maven/suppressions-runtime.xml
index c145d9b..5efc974 100644
--- a/tools/maven/suppressions-runtime.xml
+++ b/tools/maven/suppressions-runtime.xml
@@ -45,13 +45,6 @@ under the License.
files="(.*)test[/\\](.*)runtime[/\\]clusterframework[/\\](.*)"
checks="AvoidStarImport"/>
<suppress
- files="(.*)runtime[/\\]concurrent[/\\](.*)"
- 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|NoWhite [...]
- <!--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[/\\]concurrent[/\\](.*)"
- checks="AvoidStarImport"/>
- <suppress
files="(.*)runtime[/\\]execution[/\\](.*)"
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|NoWhite [...]
<!--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-->