[FLINK-7348] [checkstyle] Allow redundant modifiers on methods / revert removal of final modifier
This closes #4458. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/614c18dc Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/614c18dc Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/614c18dc Branch: refs/heads/master Commit: 614c18dcd9b6424d87ea836e08ddf5a84cc53894 Parents: a164407 Author: zentol <ches...@apache.org> Authored: Wed Aug 2 11:08:20 2017 +0200 Committer: zentol <ches...@apache.org> Committed: Mon Aug 7 15:16:56 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/flink/storm/wrappers/SpoutWrapper.java | 2 +- .../api/java/operators/translation/PlanFilterOperator.java | 2 +- .../java/org/apache/flink/graph/pregel/MessageIterator.java | 6 +++--- .../java/org/apache/flink/graph/spargel/MessageIterator.java | 6 +++--- tools/maven/checkstyle.xml | 4 +++- 5 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/614c18dc/flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/SpoutWrapper.java ---------------------------------------------------------------------- diff --git a/flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/SpoutWrapper.java b/flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/SpoutWrapper.java index 458fffb..6d37b29 100644 --- a/flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/SpoutWrapper.java +++ b/flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/SpoutWrapper.java @@ -240,7 +240,7 @@ public final class SpoutWrapper<OUT> extends RichParallelSourceFunction<OUT> imp } @Override - public void run(final SourceContext<OUT> ctx) throws Exception { + public final void run(final SourceContext<OUT> ctx) throws Exception { final GlobalJobParameters config = super.getRuntimeContext().getExecutionConfig() .getGlobalJobParameters(); StormConfig stormConfig = new StormConfig(); http://git-wip-us.apache.org/repos/asf/flink/blob/614c18dc/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java ---------------------------------------------------------------------- diff --git a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java index ecf1aac..07287b8 100644 --- a/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java +++ b/flink-java/src/main/java/org/apache/flink/api/java/operators/translation/PlanFilterOperator.java @@ -53,7 +53,7 @@ public class PlanFilterOperator<T> extends FilterOperatorBase<T, FlatMapFunction } @Override - public void flatMap(T value, Collector<T> out) throws Exception { + public final void flatMap(T value, Collector<T> out) throws Exception { if (this.wrappedFunction.filter(value)) { out.collect(value); } http://git-wip-us.apache.org/repos/asf/flink/blob/614c18dc/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/pregel/MessageIterator.java ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/pregel/MessageIterator.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/pregel/MessageIterator.java index f8dd926..8f9cf81 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/pregel/MessageIterator.java +++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/pregel/MessageIterator.java @@ -43,7 +43,7 @@ public final class MessageIterator<Message> implements Iterator<Message>, Iterab } @Override - public boolean hasNext() { + public final boolean hasNext() { if (first != null) { return true; } @@ -53,7 +53,7 @@ public final class MessageIterator<Message> implements Iterator<Message>, Iterab } @Override - public Message next() { + public final Message next() { if (first != null) { Message toReturn = first; first = null; @@ -63,7 +63,7 @@ public final class MessageIterator<Message> implements Iterator<Message>, Iterab } @Override - public void remove() { + public final void remove() { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/flink/blob/614c18dc/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/spargel/MessageIterator.java ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/spargel/MessageIterator.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/spargel/MessageIterator.java index be36954..071a617 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/spargel/MessageIterator.java +++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/spargel/MessageIterator.java @@ -36,17 +36,17 @@ public final class MessageIterator<Message> implements Iterator<Message>, Iterab } @Override - public boolean hasNext() { + public final boolean hasNext() { return this.source.hasNext(); } @Override - public Message next() { + public final Message next() { return this.source.next().f1; } @Override - public void remove() { + public final void remove() { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/flink/blob/614c18dc/tools/maven/checkstyle.xml ---------------------------------------------------------------------- diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml index 897802b..6139a44 100644 --- a/tools/maven/checkstyle.xml +++ b/tools/maven/checkstyle.xml @@ -217,8 +217,10 @@ This file is based on the checkstyle file of Apache Beam. <module name="RedundantModifier"> <!-- Checks for redundant modifiers on various symbol definitions. See: http://checkstyle.sourceforge.net/config_modifier.html#RedundantModifier + + We exclude METHOD_DEF to allow final methods in final classes to make them more future-proof. --> - <property name="tokens" value="METHOD_DEF, VARIABLE_DEF, ANNOTATION_FIELD_DEF, INTERFACE_DEF, CLASS_DEF, ENUM_DEF"/> + <property name="tokens" value="VARIABLE_DEF, ANNOTATION_FIELD_DEF, INTERFACE_DEF, CLASS_DEF, ENUM_DEF"/> </module> <!--
