This is an automated email from the ASF dual-hosted git repository. twalthr pushed a commit to branch release-1.15 in repository https://gitbox.apache.org/repos/asf/flink.git
commit f39d5fc0c02058810d86b7bd10927669505cb601 Author: Marios Trivyzas <mat...@gmail.com> AuthorDate: Wed Mar 2 11:36:20 2022 +0200 [hotfix][table-api] Remove deprecated create methods Those 2 methods accept also a TableConfig, which is not necessary, since with the new approach, extra configuration will be passed through `EnvironmentSettings` instead. If those methods are still around will create confusion. --- .../api/bridge/java/StreamTableEnvironment.java | 34 ---------------------- .../api/bridge/scala/StreamTableEnvironment.scala | 34 ---------------------- 2 files changed, 68 deletions(-) diff --git a/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/api/bridge/java/StreamTableEnvironment.java b/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/api/bridge/java/StreamTableEnvironment.java index 6481acf..09e6519 100644 --- a/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/api/bridge/java/StreamTableEnvironment.java +++ b/flink-table/flink-table-api-java-bridge/src/main/java/org/apache/flink/table/api/bridge/java/StreamTableEnvironment.java @@ -128,40 +128,6 @@ public interface StreamTableEnvironment extends TableEnvironment { } /** - * Creates a table environment that is the entry point and central context for creating Table - * and SQL API programs that integrate with the Java-specific {@link DataStream} API. - * - * <p>It is unified for bounded and unbounded data processing. - * - * <p>A stream table environment is responsible for: - * - * <ul> - * <li>Convert a {@link DataStream} into {@link Table} and vice-versa. - * <li>Connecting to external systems. - * <li>Registering and retrieving {@link Table}s and other meta objects from a catalog. - * <li>Executing SQL statements. - * <li>Offering further configuration options. - * </ul> - * - * <p>Note: If you don't intend to use the {@link DataStream} API, {@link TableEnvironment} is - * meant for pure table programs. - * - * @param executionEnvironment The Java {@link StreamExecutionEnvironment} of the {@link - * TableEnvironment}. - * @param tableConfig The configuration of the {@link TableEnvironment}. - * @deprecated Use {@link #create(StreamExecutionEnvironment)} and {@link #getConfig()} for - * manipulating {@link TableConfig}. - */ - @Deprecated - static StreamTableEnvironment create( - StreamExecutionEnvironment executionEnvironment, TableConfig tableConfig) { - return StreamTableEnvironmentImpl.create( - executionEnvironment, - EnvironmentSettings.fromConfiguration(tableConfig.getConfiguration()), - tableConfig); - } - - /** * Registers a {@link TableFunction} under a unique name in the TableEnvironment's catalog. * Registered functions can be referenced in Table API and SQL queries. * diff --git a/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/StreamTableEnvironment.scala b/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/StreamTableEnvironment.scala index 49d0b7a..e8463ee 100644 --- a/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/StreamTableEnvironment.scala +++ b/flink-table/flink-table-api-scala-bridge/src/main/scala/org/apache/flink/table/api/bridge/scala/StreamTableEnvironment.scala @@ -904,38 +904,4 @@ object StreamTableEnvironment { StreamTableEnvironmentImpl .create(executionEnvironment, settings, config) } - - /** - * Creates a table environment that is the entry point and central context for creating Table and - * SQL API programs that integrate with the Scala-specific [[DataStream]] API. - * - * It is unified for bounded and unbounded data processing. - * - * A stream table environment is responsible for: - * - * - Convert a [[DataStream]] into [[Table]] and vice-versa. - * - Connecting to external systems. - * - Registering and retrieving [[Table]]s and other meta objects from a catalog. - * - Executing SQL statements. - * - Offering further configuration options. - * - * Note: If you don't intend to use the [[DataStream]] API, [[TableEnvironment]] is meant for - * pure table programs. - * - * @param executionEnvironment The Scala [[StreamExecutionEnvironment]] of the - * [[TableEnvironment]]. - * @param tableConfig The configuration of the [[TableEnvironment]]. - * @deprecated Use [[create(StreamExecutionEnvironment)]] and - * [[StreamTableEnvironment#getConfig()]] for manipulating the [[TableConfig]]. - */ - @deprecated - def create(executionEnvironment: StreamExecutionEnvironment, tableConfig: TableConfig) - : StreamTableEnvironment = { - - StreamTableEnvironmentImpl - .create( - executionEnvironment, - EnvironmentSettings.fromConfiguration(tableConfig.getConfiguration), - tableConfig) - } }