This is an automated email from the ASF dual-hosted git repository. guoweijie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit e54bbc0a5176edd68fd26c5834571f874e392657 Author: yunfengzhou-hub <[email protected]> AuthorDate: Wed Sep 25 09:06:32 2024 +0800 [FLINK-36355][runtime] Remove deprecated WindowAssigner#getDefaultTrigger --- .../api/windowing/assigners/GlobalWindows.java | 7 ------- .../assigners/SlidingEventTimeWindows.java | 7 ------- .../assigners/SlidingProcessingTimeWindows.java | 7 ------- .../assigners/TumblingEventTimeWindows.java | 7 ------- .../assigners/TumblingProcessingTimeWindows.java | 7 ------- .../api/windowing/assigners/WindowAssigner.java | 22 +--------------------- .../assigners/DynamicEventTimeSessionWindows.java | 8 -------- .../DynamicProcessingTimeSessionWindows.java | 8 -------- .../assigners/EventTimeSessionWindows.java | 7 ------- .../assigners/ProcessingTimeSessionWindows.java | 7 ------- .../operators/windowing/MergingWindowSetTest.java | 7 ------- 11 files changed, 1 insertion(+), 93 deletions(-) diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/GlobalWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/GlobalWindows.java index 9d09ded8023..879e884f933 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/GlobalWindows.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/GlobalWindows.java @@ -22,7 +22,6 @@ import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.triggers.TriggerResult; import org.apache.flink.streaming.api.windowing.windows.GlobalWindow; @@ -53,12 +52,6 @@ public class GlobalWindows extends WindowAssigner<Object, GlobalWindow> { return Collections.singletonList(GlobalWindow.get()); } - @Override - public Trigger<Object, GlobalWindow> getDefaultTrigger(StreamExecutionEnvironment env) { - throw new UnsupportedOperationException( - "This method is deprecated and shouldn't be invoked. Please use getDefaultTrigger() instead."); - } - @Override public Trigger<Object, GlobalWindow> getDefaultTrigger() { return defaultTrigger == null ? new NeverTrigger() : defaultTrigger; diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingEventTimeWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingEventTimeWindows.java index f338738bbb6..0191ad928eb 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingEventTimeWindows.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingEventTimeWindows.java @@ -21,7 +21,6 @@ package org.apache.flink.streaming.api.windowing.assigners; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.windowing.triggers.EventTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; @@ -91,12 +90,6 @@ public class SlidingEventTimeWindows extends WindowAssigner<Object, TimeWindow> return slide; } - @Override - public Trigger<Object, TimeWindow> getDefaultTrigger(StreamExecutionEnvironment env) { - throw new UnsupportedOperationException( - "This method is deprecated and shouldn't be invoked. Please use getDefaultTrigger() instead."); - } - @Override public Trigger<Object, TimeWindow> getDefaultTrigger() { return EventTimeTrigger.create(); diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java index 6bac51aa51e..3bae280e03f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java @@ -21,7 +21,6 @@ package org.apache.flink.streaming.api.windowing.assigners; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.windowing.triggers.ProcessingTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; @@ -86,12 +85,6 @@ public class SlidingProcessingTimeWindows extends WindowAssigner<Object, TimeWin return slide; } - @Override - public Trigger<Object, TimeWindow> getDefaultTrigger(StreamExecutionEnvironment env) { - throw new UnsupportedOperationException( - "This method is deprecated and shouldn't be invoked. Please use getDefaultTrigger() instead."); - } - @Override public Trigger<Object, TimeWindow> getDefaultTrigger() { return ProcessingTimeTrigger.create(); diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingEventTimeWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingEventTimeWindows.java index 5f4eccae041..498a948bce8 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingEventTimeWindows.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingEventTimeWindows.java @@ -21,7 +21,6 @@ package org.apache.flink.streaming.api.windowing.assigners; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.windowing.triggers.EventTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; @@ -86,12 +85,6 @@ public class TumblingEventTimeWindows extends WindowAssigner<Object, TimeWindow> } } - @Override - public Trigger<Object, TimeWindow> getDefaultTrigger(StreamExecutionEnvironment env) { - throw new UnsupportedOperationException( - "This method is deprecated and shouldn't be invoked. Please use getDefaultTrigger() instead."); - } - @Override public Trigger<Object, TimeWindow> getDefaultTrigger() { return EventTimeTrigger.create(); diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java index 30e763b036e..4c620816d23 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java @@ -21,7 +21,6 @@ package org.apache.flink.streaming.api.windowing.assigners; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.windowing.triggers.ProcessingTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; @@ -84,12 +83,6 @@ public class TumblingProcessingTimeWindows extends WindowAssigner<Object, TimeWi return size; } - @Override - public Trigger<Object, TimeWindow> getDefaultTrigger(StreamExecutionEnvironment env) { - throw new UnsupportedOperationException( - "This method is deprecated and shouldn't be invoked. Please use getDefaultTrigger() instead."); - } - @Override public Trigger<Object, TimeWindow> getDefaultTrigger() { return ProcessingTimeTrigger.create(); diff --git a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java index d0127c4350a..4206797173f 100644 --- a/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java +++ b/flink-runtime/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java @@ -21,7 +21,6 @@ package org.apache.flink.streaming.api.windowing.assigners; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.Window; @@ -63,26 +62,7 @@ public abstract class WindowAssigner<T, W extends Window> implements Serializabl * getDefaultTrigger(StreamExecutionEnvironment env)} will be invoked in the default * implementation of the {@code getDefaultTrigger()}. */ - public Trigger<T, W> getDefaultTrigger() { - return getDefaultTrigger(new StreamExecutionEnvironment()); - } - - /** - * Returns the default trigger associated with this {@code WindowAssigner}. - * - * @deprecated the method is deprecated since Flink 1.19 because {@code - * StreamExecutionEnvironment} is unused. Please use {@code getDefaultTrigger} and override - * this method with an empty body instead. 1. If you override {@code getDefaultTrigger()}, - * the {@code getDefaultTrigger()} will be invoked and the {@code - * getDefaultTrigger(StreamExecutionEnvironment env)} won't be invoked. 2. If you don't - * override {@code getDefaultTrigger()}, the {@code - * getDefaultTrigger(StreamExecutionEnvironment env)} will be invoked in the default - * implementation of the {@code getDefaultTrigger()}. - * @see <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=263425229";> - * FLIP-343: Remove parameter in WindowAssigner#getDefaultTrigger() </a> - */ - @Deprecated - public abstract Trigger<T, W> getDefaultTrigger(StreamExecutionEnvironment env); + public abstract Trigger<T, W> getDefaultTrigger(); /** * Returns a {@link TypeSerializer} for serializing windows that are assigned by this {@code diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicEventTimeSessionWindows.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicEventTimeSessionWindows.java index c7c70681243..c11d1911754 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicEventTimeSessionWindows.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicEventTimeSessionWindows.java @@ -21,7 +21,6 @@ package org.apache.flink.streaming.api.windowing.assigners; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.windowing.triggers.EventTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; @@ -65,13 +64,6 @@ public class DynamicEventTimeSessionWindows<T> extends MergingWindowAssigner<T, return Collections.singletonList(new TimeWindow(timestamp, timestamp + sessionTimeout)); } - @SuppressWarnings("unchecked") - @Override - public Trigger<T, TimeWindow> getDefaultTrigger(StreamExecutionEnvironment env) { - throw new UnsupportedOperationException( - "This method is deprecated and shouldn't be invoked. Please use getDefaultTrigger() instead."); - } - @SuppressWarnings("unchecked") @Override public Trigger<T, TimeWindow> getDefaultTrigger() { diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicProcessingTimeSessionWindows.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicProcessingTimeSessionWindows.java index 58e7aac6598..72bbfb9580c 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicProcessingTimeSessionWindows.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/DynamicProcessingTimeSessionWindows.java @@ -21,7 +21,6 @@ package org.apache.flink.streaming.api.windowing.assigners; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.windowing.triggers.ProcessingTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; @@ -67,13 +66,6 @@ public class DynamicProcessingTimeSessionWindows<T> extends MergingWindowAssigne new TimeWindow(currentProcessingTime, currentProcessingTime + sessionTimeout)); } - @SuppressWarnings("unchecked") - @Override - public Trigger<T, TimeWindow> getDefaultTrigger(StreamExecutionEnvironment env) { - throw new UnsupportedOperationException( - "This method is deprecated and shouldn't be invoked. Please use getDefaultTrigger() instead."); - } - @SuppressWarnings("unchecked") @Override public Trigger<T, TimeWindow> getDefaultTrigger() { diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/EventTimeSessionWindows.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/EventTimeSessionWindows.java index 23fdc274a7a..c03f5b589fb 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/EventTimeSessionWindows.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/EventTimeSessionWindows.java @@ -21,7 +21,6 @@ package org.apache.flink.streaming.api.windowing.assigners; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.windowing.triggers.EventTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; @@ -64,12 +63,6 @@ public class EventTimeSessionWindows extends MergingWindowAssigner<Object, TimeW return Collections.singletonList(new TimeWindow(timestamp, timestamp + sessionTimeout)); } - @Override - public Trigger<Object, TimeWindow> getDefaultTrigger(StreamExecutionEnvironment env) { - throw new UnsupportedOperationException( - "This method is deprecated and shouldn't be invoked. Please use getDefaultTrigger() instead."); - } - @Override public Trigger<Object, TimeWindow> getDefaultTrigger() { return EventTimeTrigger.create(); diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/ProcessingTimeSessionWindows.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/ProcessingTimeSessionWindows.java index f840d0760f2..57588b44ecd 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/ProcessingTimeSessionWindows.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/ProcessingTimeSessionWindows.java @@ -21,7 +21,6 @@ package org.apache.flink.streaming.api.windowing.assigners; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.windowing.triggers.ProcessingTimeTrigger; import org.apache.flink.streaming.api.windowing.triggers.Trigger; import org.apache.flink.streaming.api.windowing.windows.TimeWindow; @@ -66,12 +65,6 @@ public class ProcessingTimeSessionWindows extends MergingWindowAssigner<Object, new TimeWindow(currentProcessingTime, currentProcessingTime + sessionTimeout)); } - @Override - public Trigger<Object, TimeWindow> getDefaultTrigger(StreamExecutionEnvironment env) { - throw new UnsupportedOperationException( - "This method is deprecated and shouldn't be invoked. Please use getDefaultTrigger() instead."); - } - @Override public Trigger<Object, TimeWindow> getDefaultTrigger() { return ProcessingTimeTrigger.create(); diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java index 2a481596568..a47043aafd5 100644 --- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java +++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java @@ -22,7 +22,6 @@ import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.state.ListState; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.api.windowing.assigners.EventTimeSessionWindows; import org.apache.flink.streaming.api.windowing.assigners.MergingWindowAssigner; import org.apache.flink.streaming.api.windowing.triggers.EventTimeTrigger; @@ -566,12 +565,6 @@ class MergingWindowSetTest { return Collections.singletonList(new TimeWindow(timestamp, timestamp + sessionTimeout)); } - @Override - public Trigger<Object, TimeWindow> getDefaultTrigger(StreamExecutionEnvironment env) { - throw new UnsupportedOperationException( - "This method is deprecated and shouldn't be invoked. Please use getDefaultTrigger() instead."); - } - @Override public Trigger<Object, TimeWindow> getDefaultTrigger() { return EventTimeTrigger.create();
