You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2016/08/23 17:14:02 UTC
[2/2] flink git commit: [FLINK-4435] Replace Guava's
VisibleForTesting annotation with Flink's annotation
[FLINK-4435] Replace Guava's VisibleForTesting annotation with Flink's annotation
This closes #2404
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/863dc180
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/863dc180
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/863dc180
Branch: refs/heads/master
Commit: 863dc180546ee782d30d8f24a7e488f28c4a91a9
Parents: 1619e01
Author: Jark Wu <wu...@alibaba-inc.com>
Authored: Tue Aug 23 14:38:15 2016 +0800
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Aug 23 18:51:06 2016 +0200
----------------------------------------------------------------------
.../flink/streaming/api/windowing/evictors/TimeEvictor.java | 2 +-
.../api/windowing/triggers/ContinuousEventTimeTrigger.java | 3 +--
.../windowing/triggers/ContinuousProcessingTimeTrigger.java | 3 +--
.../flink/streaming/api/windowing/triggers/PurgingTrigger.java | 2 +-
.../runtime/operators/windowing/EvictingWindowOperator.java | 2 +-
.../streaming/runtime/operators/windowing/WindowOperator.java | 2 +-
tools/maven/checkstyle.xml | 6 ++++++
7 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/863dc180/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/evictors/TimeEvictor.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/evictors/TimeEvictor.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/evictors/TimeEvictor.java
index defadab..369a7ae 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/evictors/TimeEvictor.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/evictors/TimeEvictor.java
@@ -17,9 +17,9 @@
*/
package org.apache.flink.streaming.api.windowing.evictors;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Iterables;
import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.streaming.api.windowing.time.Time;
import org.apache.flink.streaming.api.windowing.windows.Window;
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
http://git-wip-us.apache.org/repos/asf/flink/blob/863dc180/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousEventTimeTrigger.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousEventTimeTrigger.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousEventTimeTrigger.java
index 02613f6..46080ff 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousEventTimeTrigger.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousEventTimeTrigger.java
@@ -18,9 +18,8 @@
package org.apache.flink.streaming.api.windowing.triggers;
-import com.google.common.annotations.VisibleForTesting;
-
import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.functions.ReduceFunction;
import org.apache.flink.api.common.state.ReducingState;
import org.apache.flink.api.common.state.ReducingStateDescriptor;
http://git-wip-us.apache.org/repos/asf/flink/blob/863dc180/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousProcessingTimeTrigger.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousProcessingTimeTrigger.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousProcessingTimeTrigger.java
index b224cf3..287d3df 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousProcessingTimeTrigger.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousProcessingTimeTrigger.java
@@ -18,9 +18,8 @@
package org.apache.flink.streaming.api.windowing.triggers;
-import com.google.common.annotations.VisibleForTesting;
-
import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.functions.ReduceFunction;
import org.apache.flink.api.common.state.ReducingState;
import org.apache.flink.api.common.state.ReducingStateDescriptor;
http://git-wip-us.apache.org/repos/asf/flink/blob/863dc180/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/PurgingTrigger.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/PurgingTrigger.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/PurgingTrigger.java
index 8b30130..f02d1db 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/PurgingTrigger.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/PurgingTrigger.java
@@ -17,8 +17,8 @@
*/
package org.apache.flink.streaming.api.windowing.triggers;
-import com.google.common.annotations.VisibleForTesting;
import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.streaming.api.windowing.windows.Window;
/**
http://git-wip-us.apache.org/repos/asf/flink/blob/863dc180/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java
index 15f716c..4de7729 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java
@@ -17,11 +17,11 @@
*/
package org.apache.flink.streaming.runtime.operators.windowing;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.Iterables;
import org.apache.flink.annotation.Internal;
+import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.state.ListState;
import org.apache.flink.api.common.state.AppendingState;
import org.apache.flink.api.common.state.MergingState;
http://git-wip-us.apache.org/repos/asf/flink/blob/863dc180/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java
index 98bb303..12ed60e 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java
@@ -18,10 +18,10 @@
package org.apache.flink.streaming.runtime.operators.windowing;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Multiset;
import org.apache.flink.annotation.Internal;
+import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.common.ExecutionConfig;
import org.apache.flink.api.common.state.AppendingState;
import org.apache.flink.api.common.state.ListState;
http://git-wip-us.apache.org/repos/asf/flink/blob/863dc180/tools/maven/checkstyle.xml
----------------------------------------------------------------------
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
index 190e3a5..b8f1b1a 100644
--- a/tools/maven/checkstyle.xml
+++ b/tools/maven/checkstyle.xml
@@ -66,6 +66,12 @@ under the License.
<property name="illegalPattern" value="true"/>
<property name="message" value="Use Flink's Preconditions instead of Guava's Preconditions"/>
</module>
+ <!-- forbid the use of com.google.common.annotations.VisibleForTesting -->
+ <module name="Regexp">
+ <property name="format" value="import com\.google\.common\.annotations\.VisibleForTesting"/>
+ <property name="illegalPattern" value="true"/>
+ <property name="message" value="Use Flink's VisibleForTesting instead of Guava's VisibleForTesting"/>
+ </module>
<module name="Regexp">
<property name="format" value="import static com\.google\.common\.base\.Preconditions"/>
<property name="illegalPattern" value="true"/>