This is an automated email from the ASF dual-hosted git repository. mapohl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit ce5e03750a710417e0ee5fb734d5ac7399a13668 Author: Matthias Pohl <[email protected]> AuthorDate: Thu Jul 13 14:53:24 2023 +0200 [hotfix][api] Adds missing @PublicEvolving to WindowAssigner-related classes to remove ArchUnit exclusions Signed-off-by: Matthias Pohl <[email protected]> --- .../archunit-violations/5b9eed8a-5fb6-4373-98ac-3be2a71941b8 | 11 ----------- .../archunit-violations/7602816f-5c01-4b7a-9e3e-235dfedec245 | 6 ------ .../api/windowing/assigners/EventTimeSessionWindows.java | 1 + .../api/windowing/assigners/MergingWindowAssigner.java | 1 + .../api/windowing/assigners/ProcessingTimeSessionWindows.java | 1 + .../api/windowing/assigners/SlidingProcessingTimeWindows.java | 2 ++ .../windowing/assigners/TumblingProcessingTimeWindows.java | 1 + .../streaming/api/windowing/assigners/WindowAssigner.java | 1 + 8 files changed, 7 insertions(+), 17 deletions(-) diff --git a/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/5b9eed8a-5fb6-4373-98ac-3be2a71941b8 b/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/5b9eed8a-5fb6-4373-98ac-3be2a71941b8 index 7510d7d0190..653c70bef5c 100644 --- a/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/5b9eed8a-5fb6-4373-98ac-3be2a71941b8 +++ b/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/5b9eed8a-5fb6-4373-98ac-3be2a71941b8 @@ -255,16 +255,6 @@ org.apache.flink.streaming.api.operators.TwoInputStreamOperator.processElement1( org.apache.flink.streaming.api.operators.TwoInputStreamOperator.processElement2(org.apache.flink.streaming.runtime.streamrecord.StreamRecord): Argument leaf type org.apache.flink.streaming.runtime.streamrecord.StreamRecord does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated org.apache.flink.streaming.api.operators.TwoInputStreamOperator.processWatermarkStatus1(org.apache.flink.streaming.runtime.watermarkstatus.WatermarkStatus): Argument leaf type org.apache.flink.streaming.runtime.watermarkstatus.WatermarkStatus does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated org.apache.flink.streaming.api.operators.TwoInputStreamOperator.processWatermarkStatus2(org.apache.flink.streaming.runtime.watermarkstatus.WatermarkStatus): Argument leaf type org.apache.flink.streaming.runtime.watermarkstatus.WatermarkStatus does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated -org.apache.flink.streaming.api.windowing.assigners.DynamicEventTimeSessionWindows.assignWindows(java.lang.Object, long, org.apache.flink.streaming.api.windowing.assigners.WindowAssigner$WindowAssignerContext): Argument leaf type org.apache.flink.streaming.api.windowing.assigners.WindowAssigner$WindowAssignerContext does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotat [...] -org.apache.flink.streaming.api.windowing.assigners.DynamicEventTimeSessionWindows.mergeWindows(java.util.Collection, org.apache.flink.streaming.api.windowing.assigners.MergingWindowAssigner$MergeCallback): Argument leaf type org.apache.flink.streaming.api.windowing.assigners.MergingWindowAssigner$MergeCallback does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated wi [...] -org.apache.flink.streaming.api.windowing.assigners.DynamicProcessingTimeSessionWindows.assignWindows(java.lang.Object, long, org.apache.flink.streaming.api.windowing.assigners.WindowAssigner$WindowAssignerContext): Argument leaf type org.apache.flink.streaming.api.windowing.assigners.WindowAssigner$WindowAssignerContext does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or an [...] -org.apache.flink.streaming.api.windowing.assigners.DynamicProcessingTimeSessionWindows.mergeWindows(java.util.Collection, org.apache.flink.streaming.api.windowing.assigners.MergingWindowAssigner$MergeCallback): Argument leaf type org.apache.flink.streaming.api.windowing.assigners.MergingWindowAssigner$MergeCallback does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotat [...] -org.apache.flink.streaming.api.windowing.assigners.GlobalWindows.assignWindows(java.lang.Object, long, org.apache.flink.streaming.api.windowing.assigners.WindowAssigner$WindowAssignerContext): Argument leaf type org.apache.flink.streaming.api.windowing.assigners.WindowAssigner$WindowAssignerContext does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated -org.apache.flink.streaming.api.windowing.assigners.MergingWindowAssigner.mergeWindows(java.util.Collection, org.apache.flink.streaming.api.windowing.assigners.MergingWindowAssigner$MergeCallback): Argument leaf type org.apache.flink.streaming.api.windowing.assigners.MergingWindowAssigner$MergeCallback does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated -org.apache.flink.streaming.api.windowing.assigners.SlidingEventTimeWindows.assignWindows(java.lang.Object, long, org.apache.flink.streaming.api.windowing.assigners.WindowAssigner$WindowAssignerContext): Argument leaf type org.apache.flink.streaming.api.windowing.assigners.WindowAssigner$WindowAssignerContext does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with [...] -org.apache.flink.streaming.api.windowing.assigners.TumblingEventTimeWindows.assignWindows(java.lang.Object, long, org.apache.flink.streaming.api.windowing.assigners.WindowAssigner$WindowAssignerContext): Argument leaf type org.apache.flink.streaming.api.windowing.assigners.WindowAssigner$WindowAssignerContext does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated wit [...] -org.apache.flink.streaming.api.windowing.assigners.TumblingProcessingTimeWindows.of(org.apache.flink.streaming.api.windowing.time.Time, org.apache.flink.streaming.api.windowing.time.Time, org.apache.flink.streaming.api.windowing.assigners.WindowStagger): Returned leaf type org.apache.flink.streaming.api.windowing.assigners.TumblingProcessingTimeWindows does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or ann [...] -org.apache.flink.streaming.api.windowing.assigners.WindowAssigner.assignWindows(java.lang.Object, long, org.apache.flink.streaming.api.windowing.assigners.WindowAssigner$WindowAssignerContext): Argument leaf type org.apache.flink.streaming.api.windowing.assigners.WindowAssigner$WindowAssignerContext does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated org.apache.flink.streaming.api.windowing.evictors.CountEvictor.evictAfter(java.lang.Iterable, int, org.apache.flink.streaming.api.windowing.windows.Window, org.apache.flink.streaming.api.windowing.evictors.Evictor$EvictorContext): Argument leaf type org.apache.flink.streaming.api.windowing.evictors.Evictor$EvictorContext does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or a [...] org.apache.flink.streaming.api.windowing.evictors.CountEvictor.evictBefore(java.lang.Iterable, int, org.apache.flink.streaming.api.windowing.windows.Window, org.apache.flink.streaming.api.windowing.evictors.Evictor$EvictorContext): Argument leaf type org.apache.flink.streaming.api.windowing.evictors.Evictor$EvictorContext does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or [...] org.apache.flink.streaming.api.windowing.evictors.DeltaEvictor.evictAfter(java.lang.Iterable, int, org.apache.flink.streaming.api.windowing.windows.Window, org.apache.flink.streaming.api.windowing.evictors.Evictor$EvictorContext): Argument leaf type org.apache.flink.streaming.api.windowing.evictors.Evictor$EvictorContext does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or a [...] @@ -359,7 +349,6 @@ org.apache.flink.streaming.api.windowing.triggers.Trigger.onEventTime(long, org. org.apache.flink.streaming.api.windowing.triggers.Trigger.onMerge(org.apache.flink.streaming.api.windowing.windows.Window, org.apache.flink.streaming.api.windowing.triggers.Trigger$OnMergeContext): Argument leaf type org.apache.flink.streaming.api.windowing.triggers.Trigger$OnMergeContext does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated org.apache.flink.streaming.api.windowing.triggers.Trigger.onProcessingTime(long, org.apache.flink.streaming.api.windowing.windows.Window, org.apache.flink.streaming.api.windowing.triggers.Trigger$TriggerContext): Argument leaf type org.apache.flink.streaming.api.windowing.triggers.Trigger$TriggerContext does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated org.apache.flink.streaming.api.windowing.triggers.Trigger.onProcessingTime(long, org.apache.flink.streaming.api.windowing.windows.Window, org.apache.flink.streaming.api.windowing.triggers.Trigger$TriggerContext): Returned leaf type org.apache.flink.streaming.api.windowing.triggers.TriggerResult does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated -org.apache.flink.streaming.api.windowing.windows.TimeWindow.mergeWindows(java.util.Collection, org.apache.flink.streaming.api.windowing.assigners.MergingWindowAssigner$MergeCallback): Argument leaf type org.apache.flink.streaming.api.windowing.assigners.MergingWindowAssigner$MergeCallback does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated org.apache.flink.streaming.runtime.operators.windowing.TimestampedValue.from(org.apache.flink.streaming.runtime.streamrecord.StreamRecord): Argument leaf type org.apache.flink.streaming.runtime.streamrecord.StreamRecord does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated org.apache.flink.streaming.runtime.operators.windowing.TimestampedValue.getStreamRecord(): Returned leaf type org.apache.flink.streaming.runtime.streamrecord.StreamRecord does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated org.apache.flink.streaming.runtime.streamrecord.LatencyMarker.getOperatorId(): Returned leaf type org.apache.flink.runtime.jobgraph.OperatorID does not satisfy: reside outside of package 'org.apache.flink..' or reside in any package ['..shaded..'] or annotated with @Public or annotated with @PublicEvolving or annotated with @Deprecated diff --git a/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/7602816f-5c01-4b7a-9e3e-235dfedec245 b/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/7602816f-5c01-4b7a-9e3e-235dfedec245 index 8e83b1dafce..56c7e3af56a 100644 --- a/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/7602816f-5c01-4b7a-9e3e-235dfedec245 +++ b/flink-architecture-tests/flink-architecture-tests-production/archunit-violations/7602816f-5c01-4b7a-9e3e-235dfedec245 @@ -294,12 +294,6 @@ org.apache.flink.streaming.api.operators.sorted.state.BatchExecutionKeyedStateBa org.apache.flink.streaming.api.operators.sorted.state.BatchExecutionStateBackend does not satisfy: annotated with @Internal or annotated with @Experimental or annotated with @PublicEvolving or annotated with @Public or annotated with @Deprecated org.apache.flink.streaming.api.operators.util.SimpleVersionedListState does not satisfy: annotated with @Internal or annotated with @Experimental or annotated with @PublicEvolving or annotated with @Public or annotated with @Deprecated org.apache.flink.streaming.api.transformations.SideOutputTransformation does not satisfy: annotated with @Internal or annotated with @Experimental or annotated with @PublicEvolving or annotated with @Public or annotated with @Deprecated -org.apache.flink.streaming.api.windowing.assigners.EventTimeSessionWindows does not satisfy: annotated with @Internal or annotated with @Experimental or annotated with @PublicEvolving or annotated with @Public or annotated with @Deprecated -org.apache.flink.streaming.api.windowing.assigners.MergingWindowAssigner$MergeCallback does not satisfy: annotated with @Internal or annotated with @Experimental or annotated with @PublicEvolving or annotated with @Public or annotated with @Deprecated -org.apache.flink.streaming.api.windowing.assigners.ProcessingTimeSessionWindows does not satisfy: annotated with @Internal or annotated with @Experimental or annotated with @PublicEvolving or annotated with @Public or annotated with @Deprecated -org.apache.flink.streaming.api.windowing.assigners.SlidingProcessingTimeWindows does not satisfy: annotated with @Internal or annotated with @Experimental or annotated with @PublicEvolving or annotated with @Public or annotated with @Deprecated -org.apache.flink.streaming.api.windowing.assigners.TumblingProcessingTimeWindows does not satisfy: annotated with @Internal or annotated with @Experimental or annotated with @PublicEvolving or annotated with @Public or annotated with @Deprecated -org.apache.flink.streaming.api.windowing.assigners.WindowAssigner$WindowAssignerContext does not satisfy: annotated with @Internal or annotated with @Experimental or annotated with @PublicEvolving or annotated with @Public or annotated with @Deprecated org.apache.flink.streaming.api.windowing.evictors.Evictor$EvictorContext does not satisfy: annotated with @Internal or annotated with @Experimental or annotated with @PublicEvolving or annotated with @Public or annotated with @Deprecated org.apache.flink.streaming.api.windowing.triggers.Trigger$OnMergeContext does not satisfy: annotated with @Internal or annotated with @Experimental or annotated with @PublicEvolving or annotated with @Public or annotated with @Deprecated org.apache.flink.streaming.api.windowing.triggers.Trigger$TriggerContext does not satisfy: annotated with @Internal or annotated with @Experimental or annotated with @PublicEvolving or annotated with @Public or annotated with @Deprecated 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 7ee633b0dbb..4428b622dee 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 @@ -44,6 +44,7 @@ import java.util.Collections; * keyed.window(EventTimeSessionWindows.withGap(Duration.ofMinutes(1))); * }</pre> */ +@PublicEvolving public class EventTimeSessionWindows extends MergingWindowAssigner<Object, TimeWindow> { private static final long serialVersionUID = 1L; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/MergingWindowAssigner.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/MergingWindowAssigner.java index 9080d1dfddd..3ee5db91e43 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/MergingWindowAssigner.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/MergingWindowAssigner.java @@ -45,6 +45,7 @@ public abstract class MergingWindowAssigner<T, W extends Window> extends WindowA * Callback to be used in {@link #mergeWindows(Collection, MergeCallback)} for specifying which * windows should be merged. */ + @PublicEvolving public interface MergeCallback<W> { /** 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 e77aaedd097..a65be4017e2 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 @@ -44,6 +44,7 @@ import java.util.Collections; * keyed.window(ProcessingTimeSessionWindows.withGap(Duration.ofMinutes(1))); * }</pre> */ +@PublicEvolving public class ProcessingTimeSessionWindows extends MergingWindowAssigner<Object, TimeWindow> { private static final long serialVersionUID = 1L; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java index 1ea6de4d53d..be009727ca8 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/SlidingProcessingTimeWindows.java @@ -18,6 +18,7 @@ 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; @@ -44,6 +45,7 @@ import java.util.List; * keyed.window(SlidingProcessingTimeWindows.of(Time.of(1, MINUTES), Time.of(10, SECONDS)); * }</pre> */ +@PublicEvolving public class SlidingProcessingTimeWindows extends WindowAssigner<Object, TimeWindow> { private static final long serialVersionUID = 1L; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java index 2d82a4b1e57..c93e281748d 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/TumblingProcessingTimeWindows.java @@ -44,6 +44,7 @@ import java.util.Collections; * keyed.window(TumblingProcessingTimeWindows.of(Duration.ofMinutes(1), Duration.ofSeconds(10)); * }</pre> */ +@PublicEvolving public class TumblingProcessingTimeWindows extends WindowAssigner<Object, TimeWindow> { private static final long serialVersionUID = 1L; diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java index 0bc1b0a7d36..d0127c4350a 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/windowing/assigners/WindowAssigner.java @@ -104,6 +104,7 @@ public abstract class WindowAssigner<T, W extends Window> implements Serializabl * org.apache.flink.streaming.runtime.operators.windowing.WindowOperator}, which, in turn, gets * it from the containing {@link org.apache.flink.streaming.runtime.tasks.StreamTask}. */ + @PublicEvolving public abstract static class WindowAssignerContext { /** Returns the current processing time. */
