diff --git a/common/src/test/java/org/apache/celeborn/common/network/StreamTestHelper.java b/common/src/test/java/org/apache/celeborn/common/network/StreamTestHelper.java index 04f85d2164b..f47e8b80cd8 100644 --- a/common/src/test/java/org/apache/celeborn/common/network/StreamTestHelper.java +++ b/common/src/test/java/org/apache/celeborn/common/network/StreamTestHelper.java @@ -21,10 +21,9 @@ import java.io.FileOutputStream; import java.io.IOException; import java.nio.ByteBuffer; +import java.nio.file.Files; import java.util.Random; -import com.google.common.io.Files; - import org.apache.celeborn.common.network.buffer.FileSegmentManagedBuffer; import org.apache.celeborn.common.network.buffer.ManagedBuffer; import org.apache.celeborn.common.network.buffer.NioManagedBuffer; @@ -51,7 +50,7 @@ private static ByteBuffer createBuffer(int bufSize) { } StreamTestHelper() throws Exception { - tempDir = Files.createTempDir(); + tempDir = Files.createTempDirectory(null).toFile(); emptyBuffer = createBuffer(0); smallBuffer = createBuffer(100); largeBuffer = createBuffer(100000); diff --git a/master/src/test/scala/org/apache/celeborn/service/deploy/master/ApiMasterResourceAuthenticationSuite.scala b/master/src/test/scala/org/apache/celeborn/service/deploy/master/ApiMasterResourceAuthenticationSuite.scala index 27907f5f413..aa8ee2d3bba 100644 --- a/master/src/test/scala/org/apache/celeborn/service/deploy/master/ApiMasterResourceAuthenticationSuite.scala +++ b/master/src/test/scala/org/apache/celeborn/service/deploy/master/ApiMasterResourceAuthenticationSuite.scala @@ -17,7 +17,7 @@ package org.apache.celeborn.service.deploy.master -import com.google.common.io.Files +import java.nio.file.Files import org.apache.celeborn.common.CelebornConf import org.apache.celeborn.common.util.{CelebornExitKind, Utils} @@ -30,7 +30,7 @@ class ApiMasterResourceAuthenticationSuite extends ApiBaseResourceAuthentication override protected def httpService: HttpService = master def getTmpDir(): String = { - val tmpDir = Files.createTempDir() + val tmpDir = Files.createTempDirectory(null).toFile tmpDir.deleteOnExit() tmpDir.getAbsolutePath } diff --git a/master/src/test/scala/org/apache/celeborn/service/deploy/master/MasterSuite.scala b/master/src/test/scala/org/apache/celeborn/service/deploy/master/MasterSuite.scala index b6d4b856b5e..224ae89ba41 100644 --- a/master/src/test/scala/org/apache/celeborn/service/deploy/master/MasterSuite.scala +++ b/master/src/test/scala/org/apache/celeborn/service/deploy/master/MasterSuite.scala @@ -17,7 +17,8 @@ package org.apache.celeborn.service.deploy.master -import com.google.common.io.Files +import java.nio.file.Files + import org.mockito.Mockito.{mock, times, verify} import org.scalatest.{BeforeAndAfterAll, BeforeAndAfterEach} import org.scalatest.funsuite.AnyFunSuite @@ -34,7 +35,7 @@ class MasterSuite extends AnyFunSuite with Logging { def getTmpDir(): String = { - val tmpDir = Files.createTempDir() + val tmpDir = Files.createTempDirectory(null).toFile tmpDir.deleteOnExit() tmpDir.getAbsolutePath } diff --git a/master/src/test/scala/org/apache/celeborn/service/deploy/master/http/api/ApiMasterResourceSuite.scala b/master/src/test/scala/org/apache/celeborn/service/deploy/master/http/api/ApiMasterResourceSuite.scala index 40bde4a052f..5ef078c7be0 100644 --- a/master/src/test/scala/org/apache/celeborn/service/deploy/master/http/api/ApiMasterResourceSuite.scala +++ b/master/src/test/scala/org/apache/celeborn/service/deploy/master/http/api/ApiMasterResourceSuite.scala @@ -17,11 +17,10 @@ package org.apache.celeborn.service.deploy.master.http.api +import java.nio.file.Files import javax.ws.rs.client.Entity import javax.ws.rs.core.{Form, MediaType} -import com.google.common.io.Files - import org.apache.celeborn.common.CelebornConf import org.apache.celeborn.common.util.{CelebornExitKind, Utils} import org.apache.celeborn.server.common.HttpService @@ -34,7 +33,7 @@ class ApiMasterResourceSuite extends ApiBaseResourceSuite { override protected def httpService: HttpService = master def getTmpDir(): String = { - val tmpDir = Files.createTempDir() + val tmpDir = Files.createTempDirectory(null).toFile tmpDir.deleteOnExit() tmpDir.getAbsolutePath } diff --git a/master/src/test/scala/org/apache/celeborn/service/deploy/master/http/api/v1/ApiV1MasterResourceSuite.scala b/master/src/test/scala/org/apache/celeborn/service/deploy/master/http/api/v1/ApiV1MasterResourceSuite.scala index 388b26b2e2a..eaff7af2ba4 100644 --- a/master/src/test/scala/org/apache/celeborn/service/deploy/master/http/api/v1/ApiV1MasterResourceSuite.scala +++ b/master/src/test/scala/org/apache/celeborn/service/deploy/master/http/api/v1/ApiV1MasterResourceSuite.scala @@ -17,13 +17,12 @@ package org.apache.celeborn.service.deploy.master.http.api.v1 +import java.nio.file.Files import java.util.Collections import javax.servlet.http.HttpServletResponse import javax.ws.rs.client.Entity import javax.ws.rs.core.MediaType -import com.google.common.io.Files - import org.apache.celeborn.common.CelebornConf import org.apache.celeborn.common.util.{CelebornExitKind, Utils} import org.apache.celeborn.rest.v1.model.{AppDiskUsageSnapshotsResponse, ApplicationsResponse, ExcludeWorkerRequest, HandleResponse, HostnamesResponse, RemoveWorkersUnavailableInfoRequest, SendWorkerEventRequest, ShufflesResponse, WorkerEventsResponse, WorkerId, WorkersResponse} @@ -37,7 +36,7 @@ class ApiV1MasterResourceSuite extends ApiV1BaseResourceSuite { override protected def httpService: HttpService = master def getTmpDir(): String = { - val tmpDir = Files.createTempDir() + val tmpDir = Files.createTempDirectory(null).toFile tmpDir.deleteOnExit() tmpDir.getAbsolutePath } diff --git a/worker/src/test/java/org/apache/celeborn/service/deploy/worker/storage/PartitionDataWriterSuiteUtils.java b/worker/src/test/java/org/apache/celeborn/service/deploy/worker/storage/PartitionDataWriterSuiteUtils.java index 44baa691e10..e24d98e3b95 100644 --- a/worker/src/test/java/org/apache/celeborn/service/deploy/worker/storage/PartitionDataWriterSuiteUtils.java +++ b/worker/src/test/java/org/apache/celeborn/service/deploy/worker/storage/PartitionDataWriterSuiteUtils.java @@ -19,13 +19,13 @@ import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import scala.Function0; import scala.Tuple4; -import org.apache.hadoop.shaded.com.google.common.io.Files; import org.mockito.Mockito; import org.apache.celeborn.common.CelebornConf; @@ -102,7 +102,7 @@ public static StorageManager prepareMemoryEvictEnvironment( memoryFileInfo.replaceFileMeta(new MapFileMeta(32 * 1024, 10)); } - File tempDir = Files.createTempDir(); + File tempDir = Files.createTempDirectory(null).toFile(); tempDir.deleteOnExit(); File file = getTemporaryFile(tempDir); DiskFileInfo fileInfo = new DiskFileInfo(file, userIdentifier, celebornConf);