Repository: flink Updated Branches: refs/heads/release-1.3 2e044d468 -> bb03c07d9
[FLINK-6459] Move origin header ConfigOption to JMOptions Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/bb03c07d Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/bb03c07d Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/bb03c07d Branch: refs/heads/release-1.3 Commit: bb03c07d98988b31d1cece020a3b35abbdaa714f Parents: e76a0aa Author: zentol <[email protected]> Authored: Fri May 5 12:13:10 2017 +0200 Committer: zentol <[email protected]> Committed: Tue May 9 21:07:33 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/flink/configuration/ConfigConstants.java | 6 ------ .../org/apache/flink/configuration/JobManagerOptions.java | 8 ++++++++ .../apache/flink/runtime/webmonitor/WebMonitorConfig.java | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/bb03c07d/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java index 975a3d4..61c1b27 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java @@ -1333,12 +1333,6 @@ public final class ConfigConstants { key("jobmanager.web.address") .noDefaultValue(); - /** The config parameter defining the Access-Control-Allow-Origin header for all - * responses from the web-frontend. */ - public static final ConfigOption<String> JOB_MANAGER_WEB_ACCESS_CONTROL_ALLOW_ORIGIN = - key("jobmanager.web.access-control-allow-origin") - .defaultValue("*"); - /** The config key for the port of the JobManager web frontend. * Setting this value to {@code -1} disables the web frontend. */ public static final int DEFAULT_JOB_MANAGER_WEB_FRONTEND_PORT = 8081; http://git-wip-us.apache.org/repos/asf/flink/blob/bb03c07d/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java index 5481d7a..140ba2e 100644 --- a/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java +++ b/flink-core/src/main/java/org/apache/flink/configuration/JobManagerOptions.java @@ -101,6 +101,14 @@ public class JobManagerOptions { .defaultValue(8081); /** + * The config parameter defining the Access-Control-Allow-Origin header for all + * responses from the web-frontend. + */ + public static final ConfigOption<String> WEB_ACCESS_CONTROL_ALLOW_ORIGIN = + key("jobmanager.web.access-control-allow-origin") + .defaultValue("*"); + + /** * Config parameter to override SSL support for the JobManager Web UI */ public static final ConfigOption<Boolean> WEB_SSL_ENABLED = http://git-wip-us.apache.org/repos/asf/flink/blob/bb03c07d/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java ---------------------------------------------------------------------- diff --git a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java index 11e94b0..d95d13a 100644 --- a/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java +++ b/flink-runtime-web/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorConfig.java @@ -21,6 +21,7 @@ package org.apache.flink.runtime.webmonitor; import org.apache.flink.configuration.ConfigConstants; import org.apache.flink.configuration.Configuration; +import org.apache.flink.configuration.JobManagerOptions; public class WebMonitorConfig { @@ -80,6 +81,6 @@ public class WebMonitorConfig { } public String getAllowOrigin() { - return config.getString(ConfigConstants.JOB_MANAGER_WEB_ACCESS_CONTROL_ALLOW_ORIGIN); + return config.getString(JobManagerOptions.WEB_ACCESS_CONTROL_ALLOW_ORIGIN); } }
