Update commons-io to version from Flink 1.19 (#6937)

TouK · Sep 24, 2024 · df4cb52 · df4cb52
1 parent 40fc17d
commit df4cb52
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -284,7 +284,7 @@ val flinkV               = "1.19.1"
 val flinkConnectorKafkaV = "3.2.0-1.19"
 val flinkCommonsLang3V   = "3.12.0"
 val flinkCommonsTextV    = "1.10.0"
-val flinkCommonsIOV      = "2.11.0"
+val flinkCommonsIOV      = "2.15.1"
 val avroV                = "1.11.3"
 //we should use max(version used by confluent, version acceptable by flink), https://docs.confluent.io/platform/current/installation/versions-interoperability.html - confluent version reference
 val kafkaV               = "3.6.2"

diff --git a/...flink/executor/src/main/java/pl/touk/nussknacker/engine/process/util/TimeSerializers.java b/...flink/executor/src/main/java/pl/touk/nussknacker/engine/process/util/TimeSerializers.java
@@ -70,7 +70,7 @@ public static void addDefaultSerializers(ExecutionConfig config) {
         addSerializer(config, Period.class, new PeriodSerializer());
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "deprecation"})
     private static <T, Y extends Serializer<T>> void addSerializer(ExecutionConfig config, Class<T> klass, Y serializer) {
         config.addDefaultKryoSerializer(klass, (Class<? extends Serializer<?>>) serializer.getClass());
     }

diff --git a/...ouk/nussknacker/engine/flink/api/typeinfo/caseclass/ScalaCaseClassSerializerSnapshot.java b/...ouk/nussknacker/engine/flink/api/typeinfo/caseclass/ScalaCaseClassSerializerSnapshot.java
@@ -42,7 +42,7 @@ public final class ScalaCaseClassSerializerSnapshot<T extends scala.Product>
     private Class<T> type;
 
     /** Used via reflection. */
-    @SuppressWarnings("unused")
+    @SuppressWarnings({"unused", "deprecation"})
     public ScalaCaseClassSerializerSnapshot() {
         super(ScalaCaseClassSerializer.class);
     }
@@ -85,6 +85,7 @@ protected void readOuterSnapshot(
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     protected CompositeTypeSerializerSnapshot.OuterSchemaCompatibility
     resolveOuterSchemaCompatibility(ScalaCaseClassSerializer<T> newSerializer) {
         return (Objects.equals(type, newSerializer.getTupleClass()))

diff --git a/...a/pl/touk/nussknacker/engine/flink/api/typeinfo/option/ScalaOptionSerializerSnapshot.java b/...a/pl/touk/nussknacker/engine/flink/api/typeinfo/option/ScalaOptionSerializerSnapshot.java
@@ -30,7 +30,7 @@ public final class ScalaOptionSerializerSnapshot<E>
 
     private static final int VERSION = 2;
 
-    @SuppressWarnings("WeakerAccess")
+    @SuppressWarnings({"WeakerAccess", "deprecation"})
     public ScalaOptionSerializerSnapshot() {
         super(OptionSerializer.class);
     }

diff --git a/...afka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/EmbeddedKafkaServer.scala b/...afka-test-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/EmbeddedKafkaServer.scala
@@ -91,7 +91,7 @@ object EmbeddedKafkaServer {
   private def prepareRaftStorage(logDir: File, kafkaConfig: server.KafkaConfig) = {
     val uuid = Uuid.randomUuid()
     StorageTool.formatCommand(
-      new PrintStream(NullOutputStream.NULL_OUTPUT_STREAM),
+      new PrintStream(NullOutputStream.INSTANCE),
       Seq(logDir.getAbsolutePath),
       StorageTool.buildMetadataProperties(uuid.toString, kafkaConfig),
       MetadataVersion.IBP_3_3_IV3,
@@ -165,7 +165,7 @@ object KafkaTestUtils {
     new KafkaProducer(props)
   }
 
-  private def createCommonProducerProps[K, T](kafkaAddress: String, id: String) = {
+  private def createCommonProducerProps[K, T](kafkaAddress: String, id: String): Properties = {
     val props = new Properties()
     props.put("bootstrap.servers", kafkaAddress)
     props.put("batch.size", "100000")