[FLINK-35429][sqlgateway] Do not introduce new method in SqlGatewayEn…

…dpointFactory#Context
reswqa · May 23, 2024 · 6792253 · 6792253
1 parent a5efed2
commit 6792253
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/.../src/main/java/org/apache/flink/table/gateway/api/endpoint/SqlGatewayEndpointFactory.java b/.../src/main/java/org/apache/flink/table/gateway/api/endpoint/SqlGatewayEndpointFactory.java
@@ -50,14 +50,6 @@ interface Context {
         /** Gives read-only access to the configuration of the current session. */
         ReadableConfig getFlinkConfiguration();
 
-        /**
-         * Get a map contains all flink configurations.
-         *
-         * @return The copy of flink configurations in the form of map, modifying this map will not
-         *     influence the original configuration object.
-         */
-        Map<String, String> getFlinkConfigurationOptions();
-
         /**
          * Returns the options with which the endpoint is created. All options that are prefixed
          * with the endpoint identifier are included in the map.

diff --git a/...main/java/org/apache/flink/table/gateway/api/endpoint/SqlGatewayEndpointFactoryUtils.java b/...main/java/org/apache/flink/table/gateway/api/endpoint/SqlGatewayEndpointFactoryUtils.java
@@ -141,11 +141,6 @@ public ReadableConfig getFlinkConfiguration() {
             return flinkConfiguration;
         }
 
-        @Override
-        public Map<String, String> getFlinkConfigurationOptions() {
-            return flinkConfiguration.toMap();
-        }
-
         @Override
         public Map<String, String> getEndpointOptions() {
             return endpointConfig;

diff --git a/...eway/src/main/java/org/apache/flink/table/gateway/rest/SqlGatewayRestEndpointFactory.java b/...eway/src/main/java/org/apache/flink/table/gateway/rest/SqlGatewayRestEndpointFactory.java
@@ -49,7 +49,7 @@ public SqlGatewayEndpoint createSqlGatewayEndpoint(Context context) {
         endpointFactoryHelper.validate();
         Configuration config =
                 rebuildRestEndpointOptions(
-                        context.getEndpointOptions(), context.getFlinkConfigurationOptions());
+                        context.getEndpointOptions(), context.getFlinkConfiguration().toMap());
         try {
             return new SqlGatewayRestEndpoint(config, context.getSqlGatewayService());
         } catch (Exception e) {

diff --git a/...c/test/java/org/apache/flink/table/gateway/rest/util/SqlGatewayRestEndpointTestUtils.java b/...c/test/java/org/apache/flink/table/gateway/rest/util/SqlGatewayRestEndpointTestUtils.java
@@ -41,7 +41,7 @@ public static Configuration getBaseConfig(Configuration flinkConf) {
                         null, flinkConf, getEndpointConfig(flinkConf, IDENTIFIER));
 
         return rebuildRestEndpointOptions(
-                context.getEndpointOptions(), context.getFlinkConfigurationOptions());
+                context.getEndpointOptions(), context.getFlinkConfiguration().toMap());
     }
 
     /** Create the configuration generated from config.yaml. */