This is an automated email from the ASF dual-hosted git repository.
wanglijie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
commit 6397c637e8d2b5c5223b769b453692b8f03ae927
Author: Joao Boto <b...@boto.pro>
AuthorDate: Mon Apr 17 11:35:23 2023 +0200
[FLINK-31649] Fix archunit returning public(evolving) methods
---
.../archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a | 7 -------
.../org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java | 1 +
.../java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java | 1 +
.../java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java | 2 ++
.../org/apache/flink/connector/jdbc/dialect/AbstractDialect.java | 1 +
.../apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java | 3 +++
.../org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java | 4 ++--
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git
a/flink-connector-jdbc/archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a
b/flink-connector-jdbc/archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a
index 4f453d5..e69de29 100644
---
a/flink-connector-jdbc/archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a
+++
b/flink-connector-jdbc/archunit-violations/d45c3af5-52c6-45fd-9926-75e75e77473a
@@ -1,7 +0,0 @@
-org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions.builder(): Returned
leaf type
org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions$JDBCExactlyOnceOptionsBuilder
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.connector.jdbc.JdbcExecutionOptions.builder(): Returned leaf
type org.apache.flink.connector.jdbc.JdbcExecutionOptions$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.connector.jdbc.catalog.JdbcCatalog.getInternal(): Returned
leaf type org.apache.flink.connector.jdbc.catalog.AbstractJdbcCatalog 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.connector.jdbc.dialect.AbstractDialect.decimalPrecisionRange():
Returned leaf type
org.apache.flink.connector.jdbc.dialect.AbstractDialect$Range 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.connector.jdbc.dialect.AbstractDialect.timestampPrecisionRange():
Returned leaf type
org.apache.flink.connector.jdbc.dialect.AbstractDialect$Range 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.connector.jdbc.xa.XaSinkStateHandler.load(org.apache.flink.runtime.state.FunctionInitializationContext):
Returned leaf type org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunctionState
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.connector.jdbc.xa.XaSinkStateHandler.store(org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunctionState):
Argument leaf type org.apache.flink.connector.jdbc.xa.JdbcXaSinkFunctionState
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
\ No newline at end of file
diff --git
a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java
b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java
index c17ed17..47332d4 100644
---
a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java
+++
b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExactlyOnceOptions.java
@@ -104,6 +104,7 @@ public class JdbcExactlyOnceOptions implements Serializable
{
}
/** JDBCExactlyOnceOptionsBuilder. */
+ @PublicEvolving
public static class JDBCExactlyOnceOptionsBuilder {
private boolean recoveredAndRollback = DEFAULT_RECOVERED_AND_ROLLBACK;
private int maxCommitAttempts = DEFAULT_MAX_COMMIT_ATTEMPTS;
diff --git
a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java
b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java
index 137fb7c..c19677b 100644
---
a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java
+++
b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/JdbcExecutionOptions.java
@@ -81,6 +81,7 @@ public class JdbcExecutionOptions implements Serializable {
}
/** Builder for {@link JdbcExecutionOptions}. */
+ @PublicEvolving
public static final class Builder {
private long intervalMs = DEFAULT_INTERVAL_MILLIS;
private int size = DEFAULT_SIZE;
diff --git
a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
index fd8a6b5..8bab2be 100644
---
a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
+++
b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/catalog/JdbcCatalog.java
@@ -18,6 +18,7 @@
package org.apache.flink.connector.jdbc.catalog;
+import org.apache.flink.annotation.Internal;
import org.apache.flink.annotation.PublicEvolving;
import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.table.catalog.CatalogBaseTable;
@@ -120,6 +121,7 @@ public class JdbcCatalog extends AbstractJdbcCatalog {
// ------ getters ------
@VisibleForTesting
+ @Internal
public AbstractJdbcCatalog getInternal() {
return internal;
}
diff --git
a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
index 181fa67..d838ebe 100644
---
a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
+++
b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/dialect/AbstractDialect.java
@@ -246,6 +246,7 @@ public abstract class AbstractDialect implements
JdbcDialect {
public abstract Set<LogicalTypeRoot> supportedTypes();
/** A range from [min,max] where min <= max. */
+ @PublicEvolving
public static class Range {
private final int min;
diff --git
a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java
b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java
index 931e935..8bcde5c 100644
---
a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java
+++
b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/JdbcXaSinkFunctionState.java
@@ -17,6 +17,8 @@
package org.apache.flink.connector.jdbc.xa;
+import org.apache.flink.annotation.Internal;
+
import javax.annotation.concurrent.ThreadSafe;
import javax.transaction.xa.Xid;
@@ -28,6 +30,7 @@ import static java.util.Collections.unmodifiableCollection;
/** Thread-safe (assuming immutable {@link Xid} implementation). */
@ThreadSafe
+@Internal
class JdbcXaSinkFunctionState {
private final Collection<CheckpointAndXid> prepared;
private final Collection<Xid> hanging;
diff --git
a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java
b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java
index 1bf022c..90c6e6e 100644
---
a/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java
+++
b/flink-connector-jdbc/src/main/java/org/apache/flink/connector/jdbc/xa/XaSinkStateHandler.java
@@ -17,12 +17,12 @@
package org.apache.flink.connector.jdbc.xa;
-import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.annotation.Internal;
import org.apache.flink.runtime.state.FunctionInitializationContext;
import java.io.Serializable;
-@PublicEvolving
+@Internal
interface XaSinkStateHandler extends Serializable {
JdbcXaSinkFunctionState load(FunctionInitializationContext context) throws
Exception;
