Flink 1.17

.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink.yml

@@ -78,7 +78,7 @@ jobs:
       - name: run validatesRunner script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:
-          gradle-command: :runners:flink:1.15:validatesRunner
+          gradle-command: :runners:flink:1.17:validatesRunner
       - name: Archive JUnit Test Results
         uses: actions/upload-artifact@v4
         if: ${{ !success() }}
@@ -92,4 +92,4 @@ jobs:
           large_files: true
           commit: '${{ env.prsha || env.GITHUB_SHA }}'
           comment_mode: ${{ github.event_name == 'issue_comment'  && 'always' || 'off' }}
-          files: '**/build/test-results/**/*.xml'
+          files: '**/build/test-results/**/*.xml'

gradle.properties

@@ -39,6 +39,6 @@ docker_image_default_repo_root=apache
 docker_image_default_repo_prefix=beam_
 
 # supported flink versions
-flink_versions=1.12,1.13,1.14,1.15,1.16
+flink_versions=1.12,1.13,1.14,1.15,1.16,1.17
 # supported python versions
 python_versions=3.8,3.9,3.10,3.11

runners/flink/1.12/build.gradle

@@ -16,18 +16,10 @@
  * limitations under the License.
  */
 
-def basePath = '..'
-/* All properties required for loading the Flink build script */
 project.ext {
-  // Set the version of all Flink-related dependencies here.
+  flink_major = '1.12'
   flink_version = '1.12.7'
-  // Version specific code overrides.
-  main_source_overrides = ['./src/main/java']
-  test_source_overrides = ['./src/test/java']
-  main_resources_overrides = []
-  test_resources_overrides = []
-  archives_base_name = 'beam-runners-flink-1.12'
 }
 
 // Load the main build script which contains all build logic.
-apply from: "$basePath/flink_runner.gradle"
+apply from: "../flink_runner.gradle"

runners/flink/src/main/java/org/apache/beam/runners/flink/translation/types/CoderTypeSerializer.java → runners/flink/1.12/src/main/java/org/apache/beam/runners/flink/translation/types/CoderTypeSerializer.java

@@ -46,6 +46,8 @@
 })
 public class CoderTypeSerializer<T> extends TypeSerializer<T> {
 
+  private static final long serialVersionUID = 7247319138941746449L;
+
   private final Coder<T> coder;
 
   /**
@@ -155,10 +157,13 @@ public int hashCode() {
 
   @Override
   public TypeSerializerSnapshot<T> snapshotConfiguration() {
-    return new LegacySnapshot<>(this);
+    return new UnversionedTypeSerializerSnapshot<>(this);
   }
 
-  /** A legacy snapshot which does not care about schema compatibility. */
+  /**
+   * A legacy snapshot which does not care about schema compatibility. This is used only for state
+   * restore of state created by Beam 2.54.0 and below for Flink 1.16 and below.
+   */
   public static class LegacySnapshot<T> extends TypeSerializerConfigSnapshot<T> {
 
     /** Needs to be public to work with {@link VersionedIOReadableWritable}. */
@@ -177,6 +182,7 @@ public int getVersion() {
     @Override
     public TypeSerializerSchemaCompatibility<T> resolveSchemaCompatibility(
         TypeSerializer<T> newSerializer) {
+
       // We assume compatibility because we don't have a way of checking schema compatibility
       return TypeSerializerSchemaCompatibility.compatibleAsIs();
     }

runners/flink/src/test/java/org/apache/beam/runners/flink/translation/types/CoderTypeSerializerTest.java → runners/flink/1.12/src/test/java/org/apache/beam/runners/flink/translation/types/CoderTypeSerializerTest.java

@@ -71,7 +71,7 @@ private void testWriteAndReadConfigSnapshot(Coder<String> coder) throws IOExcept
     ComparatorTestBase.TestOutputView outView = new ComparatorTestBase.TestOutputView();
     writtenSnapshot.writeSnapshot(outView);
 
-    TypeSerializerSnapshot readSnapshot = new CoderTypeSerializer.LegacySnapshot();
+    TypeSerializerSnapshot readSnapshot = new UnversionedTypeSerializerSnapshot();
     readSnapshot.readSnapshot(
         writtenSnapshot.getCurrentVersion(), outView.getInputView(), getClass().getClassLoader());
 

runners/flink/1.13/build.gradle

@@ -16,18 +16,10 @@
  * limitations under the License.
  */
 
-def basePath = '..'
-/* All properties required for loading the Flink build script */
 project.ext {
-  // Set the version of all Flink-related dependencies here.
+  flink_major = '1.13'
   flink_version = '1.13.5'
-  // Version specific code overrides.
-  main_source_overrides = ["${basePath}/1.12/src/main/java", './src/main/java']
-  test_source_overrides = ["${basePath}/1.12/src/test/java", './src/test/java']
-  main_resources_overrides = []
-  test_resources_overrides = []
-  archives_base_name = 'beam-runners-flink-1.13'
 }
 
 // Load the main build script which contains all build logic.
-apply from: "$basePath/flink_runner.gradle"
+apply from: "../flink_runner.gradle"

runners/flink/1.14/build.gradle

@@ -16,19 +16,10 @@
  * limitations under the License.
  */
 
-def basePath = '..'
-
-/* All properties required for loading the Flink build script */
 project.ext {
-  // Set the version of all Flink-related dependencies here.
+  flink_major = '1.14'
   flink_version = '1.14.3'
-  // Version specific code overrides.
-  main_source_overrides = ["${basePath}/1.12/src/main/java", "${basePath}/1.13/src/main/java", './src/main/java']
-  test_source_overrides = ["${basePath}/1.12/src/test/java", "${basePath}/1.13/src/test/java", './src/test/java']
-  main_resources_overrides = []
-  test_resources_overrides = []
-  archives_base_name = 'beam-runners-flink-1.14'
 }
 
 // Load the main build script which contains all build logic.
-apply from: "$basePath/flink_runner.gradle"
+apply from: "../flink_runner.gradle"

runners/flink/1.15/build.gradle

@@ -16,19 +16,10 @@
  * limitations under the License.
  */
 
-def basePath = '..'
-
-/* All properties required for loading the Flink build script */
 project.ext {
-  // Set the version of all Flink-related dependencies here.
+  flink_major = '1.15'
   flink_version = '1.15.0'
-  // Version specific code overrides.
-  main_source_overrides = ["${basePath}/1.12/src/main/java", "${basePath}/1.13/src/main/java", "${basePath}/1.14/src/main/java", './src/main/java']
-  test_source_overrides = ["${basePath}/1.12/src/test/java", "${basePath}/1.13/src/test/java", "${basePath}/1.14/src/test/java", './src/test/java']
-  main_resources_overrides = []
-  test_resources_overrides = []
-  archives_base_name = 'beam-runners-flink-1.15'
 }
 
 // Load the main build script which contains all build logic.
-apply from: "$basePath/flink_runner.gradle"
+apply from: "../flink_runner.gradle"

runners/flink/1.16/build.gradle

@@ -16,19 +16,10 @@
  * limitations under the License.
  */
 
-def basePath = '..'
-
-/* All properties required for loading the Flink build script */
 project.ext {
-  // Set the version of all Flink-related dependencies here.
+  flink_major = '1.16'
   flink_version = '1.16.0'
-  // Version specific code overrides.
-  main_source_overrides = ["${basePath}/1.12/src/main/java", "${basePath}/1.13/src/main/java", "${basePath}/1.14/src/main/java", "${basePath}/1.15/src/main/java", './src/main/java']
-  test_source_overrides = ["${basePath}/1.12/src/test/java", "${basePath}/1.13/src/test/java", "${basePath}/1.14/src/test/java", "${basePath}/1.15/src/test/java", './src/test/java']
-  main_resources_overrides = []
-  test_resources_overrides = []
-  archives_base_name = 'beam-runners-flink-1.16'
 }
 
 // Load the main build script which contains all build logic.
-apply from: "$basePath/flink_runner.gradle"
+apply from: "../flink_runner.gradle"

runners/flink/1.17/build.gradle

@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+project.ext {
+  flink_major = '1.17'
+  flink_version = '1.17.0'
+}
+
+// Load the main build script which contains all build logic.
+apply from: "../flink_runner.gradle"

runners/flink/1.17/job-server-container/build.gradle

@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+def basePath = '../../job-server-container'
+
+project.ext {
+  resource_path = basePath
+}
+
+// Load the main build script which contains all build logic.
+apply from: "$basePath/flink_job_server_container.gradle"

runners/flink/1.17/job-server/build.gradle

@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+def basePath = '../../job-server'
+
+project.ext {
+  // Look for the source code in the parent module
+  main_source_dirs = ["$basePath/src/main/java"]
+  test_source_dirs = ["$basePath/src/test/java"]
+  main_resources_dirs = ["$basePath/src/main/resources"]
+  test_resources_dirs = ["$basePath/src/test/resources"]
+  archives_base_name = 'beam-runners-flink-1.17-job-server'
+}
+
+// Load the main build script which contains all build logic.
+apply from: "$basePath/flink_job_server.gradle"