[hotfix][checkstyle] Remove suppression for runtime/concurrent

spotify · Sep 5, 2018 · e5ff2de · e5ff2de
1 parent b53a333
commit e5ff2de
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 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
@@ -193,7 +193,7 @@ public void testConjunctFutureFailureOnSuccessive() throws Exception {
  }
 
  /**
- * 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
@@ -535,7 +535,7 @@ public void testCompleteAllExceptional() throws Exception {
  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
@@ -44,13 +44,6 @@ under the License.
  <suppress
  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|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[/\\]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|NoWhitespaceBefore|OperatorWrap|ParenPad"/>