You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2021/09/24 00:44:09 UTC

[calcite] 01/02: Replace deprecated com.google.common.io.Files.createTempDir() with java.nio.file.Files.createTempDirectory() in ElasticSearch tests

This is an automated email from the ASF dual-hosted git repository.

jhyde pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git

commit d65397a6147b16a824b4d2cc78bc71f9e90ee3b6
Author: Alessandro Solimando <al...@gmail.com>
AuthorDate: Thu Sep 23 10:30:10 2021 +0200

    Replace deprecated com.google.common.io.Files.createTempDir() with java.nio.file.Files.createTempDirectory() in ElasticSearch tests
---
 .../elasticsearch/EmbeddedElasticsearchNode.java        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
index ff566fb..5b7ab5e 100644
--- a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
+++ b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
@@ -19,7 +19,6 @@ package org.apache.calcite.adapter.elasticsearch;
 import org.apache.calcite.util.TestUtil;
 
 import com.google.common.base.Preconditions;
-import com.google.common.io.Files;
 
 import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
 import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
@@ -34,6 +33,8 @@ import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.transport.Netty4Plugin;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Objects;
@@ -75,10 +76,16 @@ class EmbeddedElasticsearchNode implements AutoCloseable {
    * @return instance which needs to be explicitly started (using {@link #start()})
    */
   public static synchronized EmbeddedElasticsearchNode create() {
-    File data = Files.createTempDir();
-    data.deleteOnExit();
-    File home = Files.createTempDir();
-    home.deleteOnExit();
+    File data;
+    File home;
+    try {
+      data = Files.createTempDirectory("es-data").toFile();
+      data.deleteOnExit();
+      home = Files.createTempDirectory("es-home").toFile();
+      home.deleteOnExit();
+    } catch (IOException e) {
+      throw TestUtil.rethrow(e);
+    }
 
     Settings settings = Settings.builder()
         .put("node.name", "fake-elastic")