[FLINK-32820][flink-java] Revert the ParameterTool related changes fr…

…om FLINK-32558 This closes apache#23193
xiangyuf · Aug 13, 2023 · fc2b5d8 · fc2b5d8
1 parent f68967a
commit fc2b5d8
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 302 deletions.
diff --git a/flink-examples/flink-examples-streaming/pom.xml b/flink-examples/flink-examples-streaming/pom.xml
@@ -253,7 +253,6 @@ under the License.
  <include>org/apache/flink/streaming/examples/wordcount/WordCount$*.class</include>
  <include>org/apache/flink/streaming/examples/wordcount/util/WordCountData.class</include>
  <include>org/apache/flink/streaming/examples/wordcount/util/CLI.class</include>
- <include>org/apache/flink/streaming/examples/utils/ParameterTool.class</include>
  <include>META-INF/LICENSE</include>
  <include>META-INF/NOTICE</include>
  </includes>

diff --git a/...les-streaming/src/main/java/org/apache/flink/streaming/examples/async/AsyncIOExample.java b/...les-streaming/src/main/java/org/apache/flink/streaming/examples/async/AsyncIOExample.java
@@ -20,6 +20,7 @@
 import org.apache.flink.api.common.eventtime.WatermarkStrategy;
 import org.apache.flink.api.common.typeinfo.Types;
 import org.apache.flink.api.connector.source.util.ratelimit.RateLimiterStrategy;
+import org.apache.flink.api.java.utils.ParameterTool;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.connector.datagen.source.DataGeneratorSource;
 import org.apache.flink.streaming.api.datastream.AsyncDataStream;
@@ -28,7 +29,6 @@
 import org.apache.flink.streaming.api.functions.async.AsyncFunction;
 import org.apache.flink.streaming.api.functions.async.ResultFuture;
 import org.apache.flink.streaming.api.functions.async.RichAsyncFunction;
-import org.apache.flink.streaming.examples.utils.ParameterTool;
 
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;

diff --git a/...ples-streaming/src/main/java/org/apache/flink/streaming/examples/gpu/MatrixVectorMul.java b/...ples-streaming/src/main/java/org/apache/flink/streaming/examples/gpu/MatrixVectorMul.java
@@ -23,14 +23,14 @@
 import org.apache.flink.api.common.functions.RichMapFunction;
 import org.apache.flink.api.common.serialization.SimpleStringEncoder;
 import org.apache.flink.api.common.typeinfo.Types;
+import org.apache.flink.api.java.utils.ParameterTool;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.connector.datagen.source.DataGeneratorSource;
 import org.apache.flink.connector.datagen.source.GeneratorFunction;
 import org.apache.flink.connector.file.sink.FileSink;
 import org.apache.flink.core.fs.Path;
 import org.apache.flink.streaming.api.datastream.DataStream;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
-import org.apache.flink.streaming.examples.utils.ParameterTool;
 import org.apache.flink.util.Preconditions;
 
 import jcuda.Pointer;

diff --git a/...streaming/src/main/java/org/apache/flink/streaming/examples/iteration/IterateExample.java b/...streaming/src/main/java/org/apache/flink/streaming/examples/iteration/IterateExample.java
@@ -24,6 +24,7 @@
 import org.apache.flink.api.connector.source.util.ratelimit.RateLimiterStrategy;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.api.java.tuple.Tuple5;
+import org.apache.flink.api.java.utils.ParameterTool;
 import org.apache.flink.configuration.MemorySize;
 import org.apache.flink.connector.datagen.source.DataGeneratorSource;
 import org.apache.flink.connector.datagen.source.GeneratorFunction;
@@ -37,7 +38,6 @@
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.streaming.api.functions.ProcessFunction;
 import org.apache.flink.streaming.api.functions.sink.filesystem.rollingpolicies.DefaultRollingPolicy;
-import org.apache.flink.streaming.examples.utils.ParameterTool;
 import org.apache.flink.util.Collector;
 import org.apache.flink.util.OutputTag;
 

diff --git a/...examples-streaming/src/main/java/org/apache/flink/streaming/examples/join/WindowJoin.java b/...examples-streaming/src/main/java/org/apache/flink/streaming/examples/join/WindowJoin.java
@@ -27,13 +27,13 @@
 import org.apache.flink.api.java.functions.KeySelector;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.api.java.tuple.Tuple3;
+import org.apache.flink.api.java.utils.ParameterTool;
 import org.apache.flink.streaming.api.datastream.DataStream;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.streaming.api.windowing.assigners.TumblingEventTimeWindows;
 import org.apache.flink.streaming.api.windowing.time.Time;
 import org.apache.flink.streaming.examples.join.WindowJoinSampleData.GradeSource;
 import org.apache.flink.streaming.examples.join.WindowJoinSampleData.SalarySource;
-import org.apache.flink.streaming.examples.utils.ParameterTool;
 
 /**
  * Example illustrating a windowed stream join between two data streams.
@@ -63,6 +63,9 @@ public static void main(String[] args) throws Exception {
  // obtain execution environment, run this example in "ingestion time"
  StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
 
+ // make parameters available in the web interface
+ env.getConfig().setGlobalJobParameters(params);
+
  // create the data sources for both grades and salaries
  DataStream<Tuple2<String, Integer>> grades =
  GradeSource.getSource(env, rate)

diff --git a/...aming/src/main/java/org/apache/flink/streaming/examples/sideoutput/SideOutputExample.java b/...aming/src/main/java/org/apache/flink/streaming/examples/sideoutput/SideOutputExample.java
@@ -26,6 +26,7 @@
 import org.apache.flink.api.common.serialization.SimpleStringEncoder;
 import org.apache.flink.api.common.typeinfo.Types;
 import org.apache.flink.api.java.tuple.Tuple2;
+import org.apache.flink.api.java.utils.ParameterTool;
 import org.apache.flink.configuration.MemorySize;
 import org.apache.flink.connector.file.sink.FileSink;
 import org.apache.flink.connector.file.src.FileSource;
@@ -39,7 +40,6 @@
 import org.apache.flink.streaming.api.functions.sink.filesystem.rollingpolicies.DefaultRollingPolicy;
 import org.apache.flink.streaming.api.windowing.assigners.TumblingEventTimeWindows;
 import org.apache.flink.streaming.api.windowing.time.Time;
-import org.apache.flink.streaming.examples.utils.ParameterTool;
 import org.apache.flink.streaming.examples.wordcount.util.WordCountData;
 import org.apache.flink.util.Collector;
 import org.apache.flink.util.OutputTag;

diff --git a/...aming/src/main/java/org/apache/flink/streaming/examples/socket/SocketWindowWordCount.java b/...aming/src/main/java/org/apache/flink/streaming/examples/socket/SocketWindowWordCount.java
@@ -20,11 +20,11 @@
 
 import org.apache.flink.api.common.functions.FlatMapFunction;
 import org.apache.flink.api.common.typeinfo.Types;
+import org.apache.flink.api.java.utils.ParameterTool;
 import org.apache.flink.streaming.api.datastream.DataStream;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.streaming.api.windowing.assigners.TumblingProcessingTimeWindows;
 import org.apache.flink.streaming.api.windowing.time.Time;
-import org.apache.flink.streaming.examples.utils.ParameterTool;
 
 /**
  * Implements a streaming windowed version of the "WordCount" program.

diff --git a/...c/main/java/org/apache/flink/streaming/examples/statemachine/KafkaEventsGeneratorJob.java b/...c/main/java/org/apache/flink/streaming/examples/statemachine/KafkaEventsGeneratorJob.java
@@ -21,6 +21,7 @@
 import org.apache.flink.api.common.eventtime.WatermarkStrategy;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.connector.source.util.ratelimit.RateLimiterStrategy;
+import org.apache.flink.api.java.utils.ParameterTool;
 import org.apache.flink.connector.datagen.source.DataGeneratorSource;
 import org.apache.flink.connector.datagen.source.GeneratorFunction;
 import org.apache.flink.connector.kafka.sink.KafkaRecordSerializationSchema;
@@ -29,7 +30,6 @@
 import org.apache.flink.streaming.examples.statemachine.event.Event;
 import org.apache.flink.streaming.examples.statemachine.generator.EventsGeneratorFunction;
 import org.apache.flink.streaming.examples.statemachine.kafka.EventDeSerializationSchema;
-import org.apache.flink.streaming.examples.utils.ParameterTool;
 
 /**
  * Job to generate input events that are written to Kafka, for the {@link StateMachineExample} job.

diff --git a/...g/src/main/java/org/apache/flink/streaming/examples/statemachine/StateMachineExample.java b/...g/src/main/java/org/apache/flink/streaming/examples/statemachine/StateMachineExample.java
@@ -25,6 +25,7 @@
 import org.apache.flink.api.common.state.ValueStateDescriptor;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.connector.source.util.ratelimit.RateLimiterStrategy;
+import org.apache.flink.api.java.utils.ParameterTool;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.MemorySize;
 import org.apache.flink.connector.datagen.source.DataGeneratorSource;
@@ -44,7 +45,6 @@
 import org.apache.flink.streaming.examples.statemachine.event.Event;
 import org.apache.flink.streaming.examples.statemachine.generator.EventsGeneratorFunction;
 import org.apache.flink.streaming.examples.statemachine.kafka.EventDeSerializationSchema;
-import org.apache.flink.streaming.examples.utils.ParameterTool;
 import org.apache.flink.util.Collector;
 
 import java.time.Duration;

diff --git a/...ples-streaming/src/main/java/org/apache/flink/streaming/examples/utils/ParameterTool.java b/...ples-streaming/src/main/java/org/apache/flink/streaming/examples/utils/ParameterTool.java
diff --git a/...reaming/src/main/java/org/apache/flink/streaming/examples/windowing/SessionWindowing.java b/...reaming/src/main/java/org/apache/flink/streaming/examples/windowing/SessionWindowing.java
@@ -22,6 +22,7 @@
 import org.apache.flink.api.common.typeinfo.TypeHint;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.tuple.Tuple3;
+import org.apache.flink.api.java.utils.ParameterTool;
 import org.apache.flink.configuration.MemorySize;
 import org.apache.flink.connector.datagen.source.DataGeneratorSource;
 import org.apache.flink.connector.datagen.source.GeneratorFunction;
@@ -32,7 +33,6 @@
 import org.apache.flink.streaming.api.functions.sink.filesystem.rollingpolicies.DefaultRollingPolicy;
 import org.apache.flink.streaming.api.windowing.assigners.EventTimeSessionWindows;
 import org.apache.flink.streaming.api.windowing.time.Time;
-import org.apache.flink.streaming.examples.utils.ParameterTool;
 
 import java.time.Duration;
 import java.util.ArrayList;