You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by pn...@apache.org on 2019/06/13 10:08:57 UTC
[flink] 04/10: [hotfix][core] Deduplicate code and unify method
names in GlobalConfiguration
This is an automated email from the ASF dual-hosted git repository.
pnowojski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit a98a7ee8ba716844372ebf4dc2b8efb3dcbd6cb3
Author: Piotr Nowojski <pi...@gmail.com>
AuthorDate: Fri Apr 26 15:48:51 2019 +0200
[hotfix][core] Deduplicate code and unify method names in GlobalConfiguration
---
.../flink/configuration/GlobalConfiguration.java | 32 ++++++++++------------
.../mesos/entrypoint/MesosEntrypointUtils.java | 2 +-
2 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/GlobalConfiguration.java b/flink-core/src/main/java/org/apache/flink/configuration/GlobalConfiguration.java
index fd7d441..564fe19 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/GlobalConfiguration.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/GlobalConfiguration.java
@@ -63,11 +63,23 @@ public final class GlobalConfiguration {
* @return Returns the Configuration
*/
public static Configuration loadConfiguration() {
+ return loadConfiguration(new Configuration());
+ }
+
+ /**
+ * Loads the global configuration and adds the given dynamic properties
+ * configuration.
+ *
+ * @param dynamicProperties The given dynamic properties
+ * @return Returns the loaded global configuration with dynamic properties
+ */
+ public static Configuration loadConfiguration(Configuration dynamicProperties) {
final String configDir = System.getenv(ConfigConstants.ENV_FLINK_CONF_DIR);
if (configDir == null) {
- return new Configuration();
+ return new Configuration(dynamicProperties);
}
- return loadConfiguration(configDir, null);
+
+ return loadConfiguration(configDir, dynamicProperties);
}
/**
@@ -122,22 +134,6 @@ public final class GlobalConfiguration {
}
/**
- * Loads the global configuration and adds the given dynamic properties
- * configuration.
- *
- * @param dynamicProperties The given dynamic properties
- * @return Returns the loaded global configuration with dynamic properties
- */
- public static Configuration loadConfigurationWithDynamicProperties(Configuration dynamicProperties) {
- final String configDir = System.getenv(ConfigConstants.ENV_FLINK_CONF_DIR);
- if (configDir == null) {
- return new Configuration(dynamicProperties);
- }
-
- return loadConfiguration(configDir, dynamicProperties);
- }
-
- /**
* Loads a YAML-file of key-value pairs.
*
* <p>Colon and whitespace ": " separate key and value (one per line). The hash tag "#" starts a single-line comment.
diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosEntrypointUtils.java b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosEntrypointUtils.java
index 4d7a485..19979e4 100755
--- a/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosEntrypointUtils.java
+++ b/flink-mesos/src/main/java/org/apache/flink/mesos/entrypoint/MesosEntrypointUtils.java
@@ -168,7 +168,7 @@ public class MesosEntrypointUtils {
*/
public static Configuration loadConfiguration(Configuration dynamicProperties, Logger log) {
Configuration configuration =
- GlobalConfiguration.loadConfigurationWithDynamicProperties(dynamicProperties);
+ GlobalConfiguration.loadConfiguration(dynamicProperties);
// read the environment variables
final Map<String, String> envs = System.getenv();