diff --git a/pom.xml b/pom.xml index 4347d3f..59f3128 100644 --- a/pom.xml +++ b/pom.xml @@ -44,9 +44,10 @@ under the License. UTF-8 - 1.10.0 + 1.11.0 2.11 2.11.12 + 2.12.1 @@ -121,15 +122,21 @@ under the License. - org.slf4j - slf4j-log4j12 - 1.7.7 + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} runtime - log4j - log4j - 1.2.17 + org.apache.logging.log4j + log4j-api + ${log4j.version} + runtime + + + org.apache.logging.log4j + log4j-core + ${log4j.version} runtime 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 index 52b30d3..a91a447 100644 --- 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 lambda = dataStream.filter ( input -> input > 0 ); + lambda.print(); // 继承RichFilterFunction DataStream 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 index 1d4e009..d9390b3 100644 --- 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 index 53345d8..4a012a2 100644 --- 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 index 7026332..fe429b7 100644 --- 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 index 7bfbecc..312f452 100644 --- 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 index 3fa671b..f0ceea5 100644 --- 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 index 5347793..8d079ae 100644 --- 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 index 4387dda..fcf7ab5 100644 --- 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 index e58d810..68cd751 100644 --- 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 index 0933b0c..fbb5fb0 100644 --- 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 index 776f323..c703e09 100644 --- 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 index fa31768..ba1954a 100644 --- 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 index 977858e..25d948b 100644 --- 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 index 86742e1..173ab58 100644 --- 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 index 4b983d7..82cbd23 100644 --- 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 index 1294c2f..f4dfbe1 100644 --- 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 index 75180f3..0ce63c1 100644 --- 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 {