[hotfix] Replace nio.Path with File in RestHandlerConfiguration
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7a78d005 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7a78d005 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7a78d005 Branch: refs/heads/master Commit: 7a78d00545ddd26d2147f58a100b1f8db689fbf3 Parents: 6356128 Author: Till Rohrmann <trohrm...@apache.org> Authored: Fri Apr 13 12:53:01 2018 -0700 Committer: Till Rohrmann <trohrm...@apache.org> Committed: Fri Apr 13 12:56:32 2018 -0700 ---------------------------------------------------------------------- .../flink/runtime/entrypoint/ClusterEntrypoint.java | 6 ++---- .../runtime/rest/handler/RestHandlerConfiguration.java | 11 +++++------ .../flink/runtime/webmonitor/WebMonitorEndpoint.java | 9 ++++----- 3 files changed, 11 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/7a78d005/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java index b25729b..0993cb6 100755 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/ClusterEntrypoint.java @@ -83,8 +83,6 @@ import javax.annotation.concurrent.GuardedBy; import java.io.File; import java.io.IOException; import java.net.InetSocketAddress; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collection; import java.util.UUID; @@ -539,9 +537,9 @@ public abstract class ClusterEntrypoint implements FatalErrorHandler { final Configuration resultConfiguration = new Configuration(Preconditions.checkNotNull(configuration)); final String webTmpDir = configuration.getString(WebOptions.TMP_DIR); - final Path uniqueWebTmpDir = Paths.get(webTmpDir, "flink-web-" + UUID.randomUUID()); + final File uniqueWebTmpDir = new File(webTmpDir, "flink-web-" + UUID.randomUUID()); - resultConfiguration.setString(WebOptions.TMP_DIR, uniqueWebTmpDir.toAbsolutePath().toString()); + resultConfiguration.setString(WebOptions.TMP_DIR, uniqueWebTmpDir.getAbsolutePath()); return resultConfiguration; } http://git-wip-us.apache.org/repos/asf/flink/blob/7a78d005/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/RestHandlerConfiguration.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/RestHandlerConfiguration.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/RestHandlerConfiguration.java index 3f6516a..336e3aa 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/RestHandlerConfiguration.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/RestHandlerConfiguration.java @@ -23,8 +23,7 @@ import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.WebOptions; import org.apache.flink.util.Preconditions; -import java.nio.file.Path; -import java.nio.file.Paths; +import java.io.File; /** * Configuration object containing values for the rest handler configuration. @@ -37,13 +36,13 @@ public class RestHandlerConfiguration { private final Time timeout; - private final Path webUiDir; + private final File webUiDir; public RestHandlerConfiguration( long refreshInterval, int maxCheckpointStatisticCacheEntries, Time timeout, - Path webUiDir) { + File webUiDir) { Preconditions.checkArgument(refreshInterval > 0L, "The refresh interval (ms) should be larger than 0."); this.refreshInterval = refreshInterval; @@ -65,7 +64,7 @@ public class RestHandlerConfiguration { return timeout; } - public Path getWebUiDir() { + public File getWebUiDir() { return webUiDir; } @@ -77,7 +76,7 @@ public class RestHandlerConfiguration { final Time timeout = Time.milliseconds(configuration.getLong(WebOptions.TIMEOUT)); final String rootDir = "flink-web-ui"; - final Path webUiDir = Paths.get(configuration.getString(WebOptions.TMP_DIR), rootDir); + final File webUiDir = new File(configuration.getString(WebOptions.TMP_DIR), rootDir); return new RestHandlerConfiguration( refreshInterval, http://git-wip-us.apache.org/repos/asf/flink/blob/7a78d005/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java index af346a7..7e552de 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/WebMonitorEndpoint.java @@ -130,7 +130,6 @@ import javax.annotation.Nonnull; import java.io.File; import java.io.IOException; -import java.nio.file.Path; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -516,7 +515,7 @@ public class WebMonitorEndpoint<T extends RestfulGateway> extends RestServerEndp timeout, responseHeaders); - final Path webUiDir = restConfiguration.getWebUiDir(); + final File webUiDir = restConfiguration.getWebUiDir(); Optional<StaticFileServerHandler<T>> optWebContent; @@ -525,7 +524,7 @@ public class WebMonitorEndpoint<T extends RestfulGateway> extends RestServerEndp leaderRetriever, restAddressFuture, timeout, - webUiDir.toFile()); + webUiDir); } catch (IOException e) { log.warn("Could not load web content handler.", e); optWebContent = Optional.empty(); @@ -655,7 +654,7 @@ public class WebMonitorEndpoint<T extends RestfulGateway> extends RestServerEndp final CompletableFuture<Void> shutdownFuture = super.shutDownInternal(); - final Path webUiDir = restConfiguration.getWebUiDir(); + final File webUiDir = restConfiguration.getWebUiDir(); return FutureUtils.runAfterwardsAsync( shutdownFuture, @@ -663,7 +662,7 @@ public class WebMonitorEndpoint<T extends RestfulGateway> extends RestServerEndp Exception exception = null; try { log.info("Removing cache directory {}", webUiDir); - FileUtils.deleteDirectory(webUiDir.toFile()); + FileUtils.deleteDirectory(webUiDir); } catch (Exception e) { exception = e; }
