flink 1.10 => 1.11

log4j => 2.*
godaai · Jul 20, 2020 · 6285c9a · 6285c9a
1 parent 8d1ec65
commit 6285c9a
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -44,9 +44,10 @@ under the License.
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<flink.version>1.10.0</flink.version>
+		<flink.version>1.11.0</flink.version>
 		<scala.binary.version>2.11</scala.binary.version>
 		<scala.version>2.11.12</scala.version>
+		<log4j.version>2.12.1</log4j.version>
 	</properties>
 
 	<dependencies>
@@ -121,15 +122,21 @@ under the License.
 		<!-- Add logging framework, to produce console output when running in the IDE. -->
 		<!-- These dependencies are excluded from the application JAR by default. -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.7</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<version>${log4j.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>${log4j.version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>${log4j.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>

diff --git a/src/main/java/com/flink/tutorials/java/chapter4/transformations/FilterExample.java b/src/main/java/com/flink/tutorials/java/chapter4/transformations/FilterExample.java
@@ -14,6 +14,7 @@ public static void main(String[] args) throws Exception {
 
         // 使用 -> 构造Lambda表达式
         DataStream<Integer> lambda = dataStream.filter ( input -> input > 0 );
+        lambda.print();
 
         // 继承RichFilterFunction
         DataStream<Integer> richFunctionDataStream = dataStream.filter(new MyFilterFunction(2));

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/InsertExample.java b/src/main/java/com/flink/tutorials/java/chapter8/InsertExample.java
@@ -7,7 +7,7 @@
 import org.apache.flink.streaming.api.functions.timestamps.AscendingTimestampExtractor;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/RegularJoinExample.java b/src/main/java/com/flink/tutorials/java/chapter8/RegularJoinExample.java
@@ -8,7 +8,7 @@
 import org.apache.flink.streaming.api.functions.timestamps.AscendingTimestampExtractor;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.types.Row;
 
 import java.sql.Timestamp;

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/SalesFromDataStream.java b/src/main/java/com/flink/tutorials/java/chapter8/SalesFromDataStream.java
@@ -6,7 +6,7 @@
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.types.Row;
 
 import java.util.ArrayList;

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/SalesTopNExample.java b/src/main/java/com/flink/tutorials/java/chapter8/SalesTopNExample.java
@@ -6,7 +6,7 @@
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.types.Row;
 
 import java.util.ArrayList;

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/ScalarFunctionExample.java b/src/main/java/com/flink/tutorials/java/chapter8/ScalarFunctionExample.java
@@ -9,7 +9,7 @@
 import org.apache.flink.streaming.api.functions.timestamps.AscendingTimestampExtractor;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.types.Row;
 
 import java.sql.Timestamp;

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/SystemFunctionExample.java b/src/main/java/com/flink/tutorials/java/chapter8/SystemFunctionExample.java
@@ -7,7 +7,7 @@
 import org.apache.flink.streaming.api.functions.timestamps.AscendingTimestampExtractor;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.types.Row;
 
 import java.sql.Timestamp;

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/TableFunctionExample.java b/src/main/java/com/flink/tutorials/java/chapter8/TableFunctionExample.java
@@ -8,7 +8,7 @@
 import org.apache.flink.streaming.api.functions.timestamps.AscendingTimestampExtractor;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.types.Row;
 
 import java.sql.Timestamp;

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/TemporalTableJoinExample.java b/src/main/java/com/flink/tutorials/java/chapter8/TemporalTableJoinExample.java
@@ -8,7 +8,7 @@
 import org.apache.flink.streaming.api.functions.timestamps.AscendingTimestampExtractor;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.types.Row;
 
 import java.sql.Timestamp;

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/TimeWindowJoinExample.java b/src/main/java/com/flink/tutorials/java/chapter8/TimeWindowJoinExample.java
@@ -8,7 +8,7 @@
 import org.apache.flink.streaming.api.functions.timestamps.AscendingTimestampExtractor;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.types.Row;
 
 import java.sql.Timestamp;

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/UserBehaviorFromDataStream.java b/src/main/java/com/flink/tutorials/java/chapter8/UserBehaviorFromDataStream.java
@@ -12,7 +12,7 @@
 import org.apache.flink.table.api.DataTypes;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.table.descriptors.Csv;
 import org.apache.flink.table.descriptors.FileSystem;
 import org.apache.flink.table.descriptors.Schema;

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/UserBehaviorFromFile.java b/src/main/java/com/flink/tutorials/java/chapter8/UserBehaviorFromFile.java
@@ -6,7 +6,7 @@
 import org.apache.flink.table.api.DataTypes;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.table.descriptors.Csv;
 import org.apache.flink.table.descriptors.FileSystem;
 import org.apache.flink.table.descriptors.Schema;

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/UserBehaviorFromKafkaSQLDDL.java b/src/main/java/com/flink/tutorials/java/chapter8/UserBehaviorFromKafkaSQLDDL.java
@@ -7,7 +7,7 @@
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.types.Row;
 
 public class UserBehaviorFromKafkaSQLDDL {

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/UserBehaviorKafkaConnect.java b/src/main/java/com/flink/tutorials/java/chapter8/UserBehaviorKafkaConnect.java
@@ -7,7 +7,7 @@
 import org.apache.flink.table.api.DataTypes;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.table.descriptors.Json;
 import org.apache.flink.table.descriptors.Kafka;
 import org.apache.flink.table.descriptors.Rowtime;

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/UserBehaviorUVPerMin.java b/src/main/java/com/flink/tutorials/java/chapter8/UserBehaviorUVPerMin.java
@@ -6,7 +6,7 @@
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.types.Row;
 
 public class UserBehaviorUVPerMin {

diff --git a/src/main/java/com/flink/tutorials/java/chapter8/WeightedAggExample.java b/src/main/java/com/flink/tutorials/java/chapter8/WeightedAggExample.java
@@ -9,7 +9,7 @@
 import org.apache.flink.streaming.api.functions.timestamps.AscendingTimestampExtractor;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.types.Row;
 
 import java.sql.Timestamp;

diff --git a/src/main/java/com/flink/tutorials/java/projects/iot/IoTSQLDemo.java b/src/main/java/com/flink/tutorials/java/projects/iot/IoTSQLDemo.java
@@ -4,7 +4,7 @@
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.Table;
-import org.apache.flink.table.api.java.StreamTableEnvironment;
+import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
 import org.apache.flink.types.Row;
 
 public class IoTSQLDemo {