Repository: flink Updated Branches: refs/heads/master 873d6cd18 -> 4b8f28825
[cleanup] remove unused code - remove unused utility testing function - remove leftover FLINK_CONF_DIR jvm property This closes #2325 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/4b8f2882 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/4b8f2882 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/4b8f2882 Branch: refs/heads/master Commit: 4b8f28825757a5501f02135d34eb7daced0d108d Parents: 873d6cd Author: Maximilian Michels <[email protected]> Authored: Tue Aug 2 11:45:25 2016 +0200 Committer: Maximilian Michels <[email protected]> Committed: Tue Aug 2 11:45:25 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/flink/client/CliFrontend.java | 3 +-- .../apache/flink/api/common/ExecutionConfigTest.java | 13 ------------- 2 files changed, 1 insertion(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/4b8f2882/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java b/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java index 7c2ee2e..15e1362 100644 --- a/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java +++ b/flink-clients/src/main/java/org/apache/flink/client/CliFrontend.java @@ -1058,8 +1058,7 @@ public class CliFrontend { // -------------------------------------------------------------------------------------------- public static String getConfigurationDirectoryFromEnv() { - String envLocation = System.getenv(ConfigConstants.ENV_FLINK_CONF_DIR); - String location = envLocation != null ? envLocation : System.getProperty(ConfigConstants.ENV_FLINK_CONF_DIR); + String location = System.getenv(ConfigConstants.ENV_FLINK_CONF_DIR); if (location != null) { if (new File(location).exists()) { http://git-wip-us.apache.org/repos/asf/flink/blob/4b8f2882/flink-core/src/test/java/org/apache/flink/api/common/ExecutionConfigTest.java ---------------------------------------------------------------------- diff --git a/flink-core/src/test/java/org/apache/flink/api/common/ExecutionConfigTest.java b/flink-core/src/test/java/org/apache/flink/api/common/ExecutionConfigTest.java index 1f646a5..883ee6c 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/ExecutionConfigTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/ExecutionConfigTest.java @@ -18,10 +18,8 @@ package org.apache.flink.api.common; -import org.apache.flink.util.SerializedValue; import org.junit.Test; -import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -66,15 +64,4 @@ public class ExecutionConfigTest { assertEquals(parallelism, config.getParallelism()); } - /** - * Helper function to create a new ExecutionConfig for tests. - * @return A serialized ExecutionConfig - */ - public static SerializedValue<ExecutionConfig> getSerializedConfig() { - try { - return new SerializedValue<>(new ExecutionConfig()); - } catch (IOException e) { - throw new RuntimeException("Couldn't create new ExecutionConfig for test.", e); - } - } }
