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 5bbf973df19783d1dd9fde616cba1638b050b11d
Author: Matthias Pohl <matthias.p...@aiven.io>
AuthorDate: Thu Jul 13 14:36:22 2023 +0200
[hotfix][api] Adds @PublicEvolving to RestartStrategies' inner classes to
remove ArchUnit exclusions
Signed-off-by: Matthias Pohl <matthias.p...@aiven.io>
---
.../archunit-violations/5b9eed8a-5fb6-4373-98ac-3be2a71941b8 | 9 ---------
.../archunit-violations/7602816f-5c01-4b7a-9e3e-235dfedec245 | 6 ------
.../flink/api/common/restartstrategy/RestartStrategies.java | 6 ++++++
3 files changed, 6 insertions(+), 15 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 653c70bef5c..6079bb488a7 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
@@ -4,13 +4,6 @@
org.apache.flink.api.common.operators.Operator.getMinResources(): Returned leaf
org.apache.flink.api.common.operators.Operator.getPreferredResources():
Returned leaf type org.apache.flink.api.common.operators.ResourceSpec 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.api.common.operators.Operator.setResources(org.apache.flink.api.common.operators.ResourceSpec,
org.apache.flink.api.common.operators.ResourceSpec): Argument leaf type
org.apache.flink.api.common.operators.ResourceSpec 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.api.common.operators.SlotSharingGroup.newBuilder(java.lang.String):
Returned leaf type
org.apache.flink.api.common.operators.SlotSharingGroup$Builder 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.api.common.restartstrategy.RestartStrategies.exponentialDelayRestart(org.apache.flink.api.common.time.Time,
org.apache.flink.api.common.time.Time, double,
org.apache.flink.api.common.time.Time, double): Returned leaf type
org.apache.flink.api.common.restartstrategy.RestartStrategies$ExponentialDelayRestartStrategyConfiguration
does not satisfy: reside outside of package 'org.apache.flink..' or reside in
any package ['..shaded..'] or annotated with @Public or annotated wi [...]
-org.apache.flink.api.common.restartstrategy.RestartStrategies.failureRateRestart(int,
org.apache.flink.api.common.time.Time, org.apache.flink.api.common.time.Time):
Returned leaf type
org.apache.flink.api.common.restartstrategy.RestartStrategies$FailureRateRestartStrategyConfiguration
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.api.common.restartstrategy.RestartStrategies.fallBackRestart():
Returned leaf type
org.apache.flink.api.common.restartstrategy.RestartStrategies$RestartStrategyConfiguration
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.api.common.restartstrategy.RestartStrategies.fixedDelayRestart(int,
long): Returned leaf type
org.apache.flink.api.common.restartstrategy.RestartStrategies$RestartStrategyConfiguration
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.api.common.restartstrategy.RestartStrategies.fixedDelayRestart(int,
org.apache.flink.api.common.time.Time): Returned leaf type
org.apache.flink.api.common.restartstrategy.RestartStrategies$RestartStrategyConfiguration
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.api.common.restartstrategy.RestartStrategies.fromConfiguration(org.apache.flink.configuration.ReadableConfig):
Returned leaf type
org.apache.flink.api.common.restartstrategy.RestartStrategies$RestartStrategyConfiguration
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.api.common.restartstrategy.RestartStrategies.noRestart():
Returned leaf type
org.apache.flink.api.common.restartstrategy.RestartStrategies$RestartStrategyConfiguration
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.api.common.state.AggregatingStateDescriptor.getType():
Returned leaf type org.apache.flink.api.common.state.StateDescriptor$Type 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.api.common.state.ListStateDescriptor.getType(): Returned leaf
type org.apache.flink.api.common.state.StateDescriptor$Type 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.api.common.state.MapStateDescriptor.getType(): Returned leaf
type org.apache.flink.api.common.state.StateDescriptor$Type 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
@@ -24,8 +17,6 @@
org.apache.flink.api.common.state.StateTtlConfig.newBuilder(org.apache.flink.api
org.apache.flink.api.common.state.ValueStateDescriptor.getType(): Returned
leaf type org.apache.flink.api.common.state.StateDescriptor$Type 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.api.common.typeinfo.PrimitiveArrayTypeInfo.createComparator(boolean,
org.apache.flink.api.common.ExecutionConfig): Returned leaf type
org.apache.flink.api.common.typeutils.base.array.PrimitiveArrayComparator 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.api.common.typeutils.TypeComparator.putNormalizedKey(java.lang.Object,
org.apache.flink.core.memory.MemorySegment, int, int): Argument leaf type
org.apache.flink.core.memory.MemorySegment 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.api.java.ExecutionEnvironment.getRestartStrategy(): Returned
leaf type
org.apache.flink.api.common.restartstrategy.RestartStrategies$RestartStrategyConfiguration
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.api.java.ExecutionEnvironment.setRestartStrategy(org.apache.flink.api.common.restartstrategy.RestartStrategies$RestartStrategyConfiguration):
Argument leaf type
org.apache.flink.api.common.restartstrategy.RestartStrategies$RestartStrategyConfiguration
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.api.java.io.SplitDataProperties.getSplitOrder(): Returned
leaf type org.apache.flink.api.common.operators.Ordering 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.api.java.operators.DataSink.getMinResources(): Returned leaf
type org.apache.flink.api.common.operators.ResourceSpec 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.api.java.operators.DataSink.getPreferredResources(): Returned
leaf type org.apache.flink.api.common.operators.ResourceSpec 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 56c7e3af56a..99cb8f444e3 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
@@ -35,12 +35,6 @@
org.apache.flink.api.common.operators.util.JoinHashMap$Prober does not satisfy:
org.apache.flink.api.common.operators.util.ListKeyGroupedIterator$ValuesIterator
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.api.common.operators.util.OperatorValidationUtils 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.api.common.operators.util.SlotSharingGroupUtils 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.api.common.restartstrategy.RestartStrategies$ExponentialDelayRestartStrategyConfiguration
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.api.common.restartstrategy.RestartStrategies$FailureRateRestartStrategyConfiguration
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.api.common.restartstrategy.RestartStrategies$FallbackRestartStrategyConfiguration
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.api.common.restartstrategy.RestartStrategies$FixedDelayRestartStrategyConfiguration
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.api.common.restartstrategy.RestartStrategies$NoRestartStrategyConfiguration
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.api.common.restartstrategy.RestartStrategies$RestartStrategyConfiguration
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.api.common.serialization.BulkWriter$Factory 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.api.common.state.StateDescriptor$Type 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.api.common.state.StateTtlConfig$Builder 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-core/src/main/java/org/apache/flink/api/common/restartstrategy/RestartStrategies.java
b/flink-core/src/main/java/org/apache/flink/api/common/restartstrategy/RestartStrategies.java
index 9745e9ad1c1..86d39d32217 100644
---
a/flink-core/src/main/java/org/apache/flink/api/common/restartstrategy/RestartStrategies.java
+++
b/flink-core/src/main/java/org/apache/flink/api/common/restartstrategy/RestartStrategies.java
@@ -186,6 +186,7 @@ public class RestartStrategies {
}
/** Abstract configuration for restart strategies. */
+ @PublicEvolving
public abstract static class RestartStrategyConfiguration implements
Serializable {
private static final long serialVersionUID = 6285853591578313960L;
@@ -205,6 +206,7 @@ public class RestartStrategies {
}
/** Configuration representing no restart strategy. */
+ @PublicEvolving
public static final class NoRestartStrategyConfiguration extends
RestartStrategyConfiguration {
private static final long serialVersionUID = -5894362702943349962L;
@@ -228,6 +230,7 @@ public class RestartStrategies {
}
/** Configuration representing a fixed delay restart strategy. */
+ @PublicEvolving
public static final class FixedDelayRestartStrategyConfiguration
extends RestartStrategyConfiguration {
private static final long serialVersionUID = 4149870149673363190L;
@@ -288,6 +291,7 @@ public class RestartStrategies {
}
/** Configuration representing an exponential delay restart strategy. */
+ @PublicEvolving
public static final class ExponentialDelayRestartStrategyConfiguration
extends RestartStrategyConfiguration {
private static final long serialVersionUID = 1467941615941965194L;
@@ -410,6 +414,7 @@ public class RestartStrategies {
}
/** Configuration representing a failure rate restart strategy. */
+ @PublicEvolving
public static final class FailureRateRestartStrategyConfiguration
extends RestartStrategyConfiguration {
private static final long serialVersionUID = 1195028697539661739L;
@@ -499,6 +504,7 @@ public class RestartStrategies {
* strategy. Useful especially when one has a custom implementation of
restart strategy set via
* flink-conf.yaml.
*/
+ @PublicEvolving
public static final class FallbackRestartStrategyConfiguration
extends RestartStrategyConfiguration {
private static final long serialVersionUID = -4441787204284085544L;
