[FLINK-36009] Architecture tests refactor

apache · Jan 12, 2025 · 15c1a78 · 15c1a78
1 parent 134d858
commit 15c1a78
Show file tree

Hide file tree

Showing 35 changed files with 279 additions and 390 deletions.
diff --git a/...ions/0c7b60d6-a12c-432d-8a72-747cabaeb7ed → ...ions/10da9e19-442f-49fb-b340-a2e401062d33 b/...ions/0c7b60d6-a12c-432d-8a72-747cabaeb7ed → ...ions/10da9e19-442f-49fb-b340-a2e401062d33
diff --git a/...ions/0f94f11b-9bc8-445a-8be8-e7dfd8a384b0 → ...ions/3547d327-0923-4fa7-8319-b18102cc22d0 b/...ions/0f94f11b-9bc8-445a-8be8-e7dfd8a384b0 → ...ions/3547d327-0923-4fa7-8319-b18102cc22d0
diff --git a/flink-connector-jdbc-architecture/archunit-violations/47967139-2deb-41b4-91c3-b19e56e5fc76 b/flink-connector-jdbc-architecture/archunit-violations/47967139-2deb-41b4-91c3-b19e56e5fc76
@@ -0,0 +1,2 @@
+org.apache.flink.connector.jdbc.postgres.database.dialect.CompatiblePostgresDialect.getRowConverter(org.apache.flink.table.types.logical.RowType): Returned leaf type org.apache.flink.connector.jdbc.postgres.database.dialect.CompatiblePostgresDialectConverter 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.postgres.database.dialect.CompatiblePostgresDialect.getRowConverter(org.apache.flink.table.types.logical.RowType): Returned leaf type org.apache.flink.connector.jdbc.postgres.database.dialect.PostgresDialectConverter 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/...ions/4bca2274-65a9-4a61-81ef-767d58233ea0 → ...ions/7d5a32d5-922b-4760-825b-c30427dc987e b/...ions/4bca2274-65a9-4a61-81ef-767d58233ea0 → ...ions/7d5a32d5-922b-4760-825b-c30427dc987e
diff --git a/flink-connector-jdbc-architecture/archunit-violations/afc13e03-aa50-408b-b87e-aa491cf0b8cb b/flink-connector-jdbc-architecture/archunit-violations/afc13e03-aa50-408b-b87e-aa491cf0b8cb
diff --git a/...ions/596bd7eb-1ed5-4963-a56a-941766d61233 → ...ions/b97067ac-f37f-4793-8578-bdbe6d2abf5b b/...ions/596bd7eb-1ed5-4963-a56a-941766d61233 → ...ions/b97067ac-f37f-4793-8578-bdbe6d2abf5b
diff --git a/...ions/6b9ab1b0-c14d-4667-bab5-407b81fba98b → ...ions/e391ec0f-7ba6-4b7e-8125-cbd364cbedd9 b/...ions/6b9ab1b0-c14d-4667-bab5-407b81fba98b → ...ions/e391ec0f-7ba6-4b7e-8125-cbd364cbedd9
diff --git a/...ions/b10c194a-0517-4744-830f-81abfb71ab18 → ...ions/f09f3e26-9371-41f4-86a1-cd59b0fe624c b/...ions/b10c194a-0517-4744-830f-81abfb71ab18 → ...ions/f09f3e26-9371-41f4-86a1-cd59b0fe624c
diff --git a/flink-connector-jdbc-architecture/archunit-violations/stored.rules b/flink-connector-jdbc-architecture/archunit-violations/stored.rules
@@ -0,0 +1,10 @@
+#
+#Wed Oct 23 14:35:32 CEST 2024
+Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @Public\ must\ be\ annotated\ with\ @Public.=e391ec0f-7ba6-4b7e-8125-cbd364cbedd9
+ITCASE\ tests\ should\ use\ a\ MiniCluster\ resource\ or\ extension=f09f3e26-9371-41f4-86a1-cd59b0fe624c
+Production\ code\ must\ not\ call\ methods\ annotated\ with\ @VisibleForTesting=3547d327-0923-4fa7-8319-b18102cc22d0
+Options\ for\ connectors\ and\ formats\ should\ reside\ in\ a\ consistent\ package\ and\ be\ public\ API.=10da9e19-442f-49fb-b340-a2e401062d33
+Tests\ inheriting\ from\ AbstractTestBase\ should\ have\ name\ ending\ with\ ITCase=7d5a32d5-922b-4760-825b-c30427dc987e
+Return\ and\ argument\ types\ of\ methods\ annotated\ with\ @PublicEvolving\ must\ be\ annotated\ with\ @Public(Evolving).=47967139-2deb-41b4-91c3-b19e56e5fc76
+Classes\ in\ API\ packages\ should\ have\ at\ least\ one\ API\ visibility\ annotation.=b97067ac-f37f-4793-8578-bdbe6d2abf5b
+Connector\ production\ code\ must\ depend\ only\ on\ public\ API\ when\ outside\ of\ connector\ packages=afc13e03-aa50-408b-b87e-aa491cf0b8cb
diff --git a/flink-connector-jdbc-architecture/pom.xml b/flink-connector-jdbc-architecture/pom.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.flink</groupId>
+        <artifactId>flink-connector-jdbc-parent</artifactId>
+        <version>3.3-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>flink-connector-jdbc-architecture</artifactId>
+    <name>Flink : Connectors : JDBC : Architecture</name>
+
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <!-- Flink ArchUnit -->
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-architecture-tests-base</artifactId>
+            <version>${flink.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-architecture-tests-test</artifactId>
+            <version>${flink.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-architecture-tests-production</artifactId>
+            <version>${flink.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Flink Jdbc Modules To Test -->
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-jdbc</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-jdbc-core</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-jdbc-cratedb</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-jdbc-db2</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-jdbc-mysql</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-jdbc-oceanbase</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-jdbc-oracle</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-jdbc-postgres</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-jdbc-sqlserver</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-jdbc-trino</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/...cture/ProductionCodeArchitectureTest.java → ...cture/ProductionCodeArchitectureTest.java b/...cture/ProductionCodeArchitectureTest.java → ...cture/ProductionCodeArchitectureTest.java
@@ -16,8 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.flink.architecture;
+package org.apache.flink.connector.jdbc.architecture;
 
+import org.apache.flink.architecture.ProductionCodeArchitectureBase;
 import org.apache.flink.architecture.common.ImportOptions;
 
 import com.tngtech.archunit.core.importer.ImportOption;

diff --git a/...rchitecture/TestCodeArchitectureTest.java → ...rchitecture/TestCodeArchitectureTest.java b/...rchitecture/TestCodeArchitectureTest.java → ...rchitecture/TestCodeArchitectureTest.java
@@ -16,8 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.flink.architecture;
+package org.apache.flink.connector.jdbc.architecture;
 
+import org.apache.flink.architecture.TestCodeArchitectureTestBase;
 import org.apache.flink.architecture.common.ImportOptions;
 
 import com.tngtech.archunit.core.importer.ImportOption;

diff --git a/...re/src/test/resources/archunit.properties → ...re/src/test/resources/archunit.properties b/...re/src/test/resources/archunit.properties → ...re/src/test/resources/archunit.properties
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		org.apache.flink.connector.jdbc.postgres.database.dialect.CompatiblePostgresDialect.getRowConverter(org.apache.flink.table.types.logical.RowType): Returned leaf type org.apache.flink.connector.jdbc.postgres.database.dialect.CompatiblePostgresDialectConverter 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.postgres.database.dialect.CompatiblePostgresDialect.getRowConverter(org.apache.flink.table.types.logical.RowType): Returned leaf type org.apache.flink.connector.jdbc.postgres.database.dialect.PostgresDialectConverter 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