[FLINK-4435] Replace Guava's VisibleForTesting annotation with Flink'…

…s annotation This closes apache#2404
PangZhi · Aug 23, 2016 · 863dc18 · 863dc18
1 parent 1619e01
commit 863dc18
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/...ing-java/src/main/java/org/apache/flink/streaming/api/windowing/evictors/TimeEvictor.java b/...ing-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;

diff --git a/...in/java/org/apache/flink/streaming/api/windowing/triggers/ContinuousEventTimeTrigger.java b/...in/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;

diff --git a/...va/org/apache/flink/streaming/api/windowing/triggers/ContinuousProcessingTimeTrigger.java b/...va/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;

diff --git a/...-java/src/main/java/org/apache/flink/streaming/api/windowing/triggers/PurgingTrigger.java b/...-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;
 
 /**

diff --git a/...n/java/org/apache/flink/streaming/runtime/operators/windowing/EvictingWindowOperator.java b/...n/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;

diff --git a/.../src/main/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperator.java b/.../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;

diff --git 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"/>