[FLINK-36659] Bump to 2.0-preview1.

apache · Jan 27, 2025 · d026274 · d026274
1 parent 8e97244
commit d026274
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 15 deletions.
diff --git a/.../test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSinkTest.java b/.../test/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSinkTest.java
@@ -18,7 +18,8 @@
 
 package org.apache.flink.connector.jdbc.backward.compatibility;
 
-import org.apache.flink.api.common.restartstrategy.RestartStrategies;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.configuration.RestartStrategyOptions;
 import org.apache.flink.connector.jdbc.JdbcConnectionOptions;
 import org.apache.flink.connector.jdbc.JdbcExactlyOnceOptions;
 import org.apache.flink.connector.jdbc.JdbcExecutionOptions;
@@ -71,8 +72,10 @@ public List<TableManaged> getManagedTables() {
 
     @Test
     public void testAtLeastOnce() throws Exception {
-        StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
-        env.setRestartStrategy(new RestartStrategies.NoRestartStrategyConfiguration());
+        Configuration configuration = new Configuration();
+        configuration.set(RestartStrategyOptions.RESTART_STRATEGY, "disable");
+        StreamExecutionEnvironment env =
+                StreamExecutionEnvironment.getExecutionEnvironment(configuration);
         env.setParallelism(1);
 
         assertResult(new ArrayList<>());
@@ -97,8 +100,10 @@ public void testAtLeastOnce() throws Exception {
 
     @Test
     public void testExactlyOnce() throws Exception {
-        StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
-        env.setRestartStrategy(new RestartStrategies.NoRestartStrategyConfiguration());
+        Configuration configuration = new Configuration();
+        configuration.set(RestartStrategyOptions.RESTART_STRATEGY, "disable");
+        StreamExecutionEnvironment env =
+                StreamExecutionEnvironment.getExecutionEnvironment(configuration);
         env.setParallelism(1);
 
         assertResult(new ArrayList<>());

diff --git a/...est/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSourceTest.java b/...est/java/org/apache/flink/connector/jdbc/backward/compatibility/DataStreamSourceTest.java
@@ -19,8 +19,9 @@
 package org.apache.flink.connector.jdbc.backward.compatibility;
 
 import org.apache.flink.api.common.eventtime.WatermarkStrategy;
-import org.apache.flink.api.common.restartstrategy.RestartStrategies;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.configuration.RestartStrategyOptions;
 import org.apache.flink.connector.jdbc.JdbcTestFixture;
 import org.apache.flink.connector.jdbc.postgres.PostgresTestBase;
 import org.apache.flink.connector.jdbc.source.JdbcSource;
@@ -30,7 +31,7 @@
 import org.apache.flink.connector.jdbc.testutils.tables.templates.BooksTable;
 import org.apache.flink.runtime.testutils.MiniClusterResourceConfiguration;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
-import org.apache.flink.streaming.api.functions.sink.SinkFunction;
+import org.apache.flink.streaming.api.functions.sink.legacy.SinkFunction;
 import org.apache.flink.test.junit5.MiniClusterExtension;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -100,8 +101,10 @@ void init() throws SQLException {
 
     @Test
     void testReadWithoutParallelismWithoutParamsProvider() throws Exception {
-        StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
-        env.setRestartStrategy(new RestartStrategies.NoRestartStrategyConfiguration());
+        Configuration configuration = new Configuration();
+        configuration.set(RestartStrategyOptions.RESTART_STRATEGY, "disable");
+        StreamExecutionEnvironment env =
+                StreamExecutionEnvironment.getExecutionEnvironment(configuration);
         env.setParallelism(1);
         JdbcSource<JdbcTestFixture.TestEntry> jdbcSource =
                 JdbcSource.<JdbcTestFixture.TestEntry>builder()
@@ -121,8 +124,10 @@ void testReadWithoutParallelismWithoutParamsProvider() throws Exception {
 
     @Test
     void testReadWithoutParallelismWithParamsProvider() throws Exception {
-        StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
-        env.setRestartStrategy(new RestartStrategies.NoRestartStrategyConfiguration());
+        Configuration configuration = new Configuration();
+        configuration.set(RestartStrategyOptions.RESTART_STRATEGY, "disable");
+        StreamExecutionEnvironment env =
+                StreamExecutionEnvironment.getExecutionEnvironment(configuration);
         env.setParallelism(1);
         JdbcSource<JdbcTestFixture.TestEntry> jdbcSource =
                 JdbcSource.<JdbcTestFixture.TestEntry>builder()
@@ -145,8 +150,10 @@ void testReadWithoutParallelismWithParamsProvider() throws Exception {
 
     @Test
     void testReadWithParallelismWithoutParamsProvider() throws Exception {
-        StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
-        env.setRestartStrategy(new RestartStrategies.NoRestartStrategyConfiguration());
+        Configuration configuration = new Configuration();
+        configuration.set(RestartStrategyOptions.RESTART_STRATEGY, "disable");
+        StreamExecutionEnvironment env =
+                StreamExecutionEnvironment.getExecutionEnvironment(configuration);
         env.setParallelism(2);
         JdbcSource<JdbcTestFixture.TestEntry> jdbcSource =
                 JdbcSource.<JdbcTestFixture.TestEntry>builder()
@@ -166,8 +173,10 @@ void testReadWithParallelismWithoutParamsProvider() throws Exception {
 
     @Test
     void testReadWithParallelismWithParamsProvider() throws Exception {
-        StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
-        env.setRestartStrategy(new RestartStrategies.NoRestartStrategyConfiguration());
+        Configuration configuration = new Configuration();
+        configuration.set(RestartStrategyOptions.RESTART_STRATEGY, "disable");
+        StreamExecutionEnvironment env =
+                StreamExecutionEnvironment.getExecutionEnvironment(configuration);
         env.setParallelism(2);
         JdbcSource<JdbcTestFixture.TestEntry> jdbcSource =
                 JdbcSource.<JdbcTestFixture.TestEntry>builder()