[Java] Remove java api sub package from test module (#8853)

java/BUILD.bazel

@@ -65,6 +65,7 @@ define_java_module(
         "@maven//:com_beust_jcommander",
         "@maven//:org_testng_testng",
         "@maven//:commons_io_commons_io",
+        "@maven//:javax_xml_bind_jaxb_api",
     ],
     visibility = ["//visibility:public"],
     deps = [

java/runtime/pom.xml

@@ -52,6 +52,11 @@
   <artifactId>fst</artifactId>
   <version>2.57</version>
 </dependency>
+<dependency>
+  <groupId>javax.xml.bind</groupId>
+  <artifactId>jaxb-api</artifactId>
+  <version>2.3.0</version>
+</dependency>
 <dependency>
   <groupId>log4j</groupId>
   <artifactId>log4j</artifactId>

java/runtime/src/test/java/io/ray/runtime/UniqueIdTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.runtime;
 
 import io.ray.api.id.UniqueId;
 import io.ray.runtime.util.IdUtil;

java/runtime/src/test/java/io/ray/runtime/config/RayConfigTest.java

@@ -1,6 +1,5 @@
-package io.ray.api.test;
+package io.ray.runtime.config;
 
-import io.ray.runtime.config.RayConfig;
 import io.ray.runtime.generated.Common.WorkerType;
 import org.testng.Assert;
 import org.testng.annotations.Test;

java/runtime/src/test/java/io/ray/runtime/serializer/SerializerTest.java

@@ -1,6 +1,5 @@
 package io.ray.runtime.serializer;
 
-import io.ray.runtime.serializer.Serializer;
 import java.util.ArrayList;
 import org.apache.commons.lang3.tuple.Pair;
 import org.testng.Assert;

java/test/src/main/java/io/ray/benchmark/ActorPressTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;

java/test/src/main/java/io/ray/benchmark/MaxPressureTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;

java/test/src/main/java/io/ray/benchmark/MicroBenchmarks.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import io.ray.api.Ray;
 import org.slf4j.Logger;

java/test/src/main/java/io/ray/benchmark/PressureTestParameter.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import io.ray.api.ActorHandle;
 import java.io.Serializable;

java/test/src/main/java/io/ray/benchmark/PressureTestType.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 public enum PressureTestType {
 

java/test/src/main/java/io/ray/benchmark/RateLimiterPressureTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;

java/test/src/main/java/io/ray/benchmark/RayBenchmarkTest.java

@@ -1,11 +1,11 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import com.google.common.util.concurrent.RateLimiter;
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
 import io.ray.api.function.RayFunc1;
-import io.ray.api.test.BaseTest;
+import io.ray.test.BaseTest;
 import java.io.Serializable;
 import java.text.DecimalFormat;
 import java.util.ArrayList;

java/test/src/main/java/io/ray/benchmark/RemoteResult.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import java.io.Serializable;
 

java/test/src/main/java/io/ray/benchmark/RemoteResultWrapper.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import io.ray.api.ObjectRef;
 

java/test/src/main/java/io/ray/benchmark/SingleLatencyTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.benchmark;
+package io.ray.benchmark;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;

java/test/src/main/java/io/ray/test/ActorConcurrentCallTest.java

@@ -1,17 +1,15 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.options.ActorCreationOptions;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-
 @Test
 public class ActorConcurrentCallTest extends BaseTest {
 

java/test/src/main/java/io/ray/test/ActorRestartTest.java

@@ -1,9 +1,8 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.Checkpointable;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.exception.RayActorException;
 import io.ray.api.id.ActorId;
 import io.ray.api.id.UniqueId;

java/test/src/main/java/io/ray/test/ActorTest.java

@@ -1,11 +1,10 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.PyActorHandle;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.exception.UnreconstructableException;
 import io.ray.api.id.ActorId;
 import io.ray.api.id.UniqueId;

java/test/src/main/java/io/ray/test/BaseMultiLanguageTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;

java/test/src/main/java/io/ray/test/BaseTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.Ray;

java/test/src/main/java/io/ray/test/ClassLoaderTest.java

@@ -1,10 +1,9 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.BaseActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.options.ActorCreationOptions;
 import io.ray.runtime.AbstractRayRuntime;
 import io.ray.runtime.functionmanager.FunctionDescriptor;

java/test/src/main/java/io/ray/test/CrossLanguageInvocationTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;

java/test/src/main/java/io/ray/test/DynamicResourceTest.java

@@ -1,10 +1,9 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.WaitResult;
 import io.ray.api.options.CallOptions;
 import io.ray.api.runtimecontext.NodeInfo;

java/test/src/main/java/io/ray/test/FailureTest.java

@@ -1,9 +1,8 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.exception.RayActorException;
 import io.ray.api.exception.RayException;
 import io.ray.api.exception.RayTaskException;

java/test/src/main/java/io/ray/test/GcsClientTest.java

@@ -1,7 +1,6 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.base.Preconditions;
-import io.ray.api.TestUtils;
 import io.ray.api.id.JobId;
 import io.ray.api.runtimecontext.NodeInfo;
 import io.ray.runtime.config.RayConfig;

java/test/src/main/java/io/ray/test/HelloWorldTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;

java/test/src/main/java/io/ray/test/KillActorTest.java

@@ -1,10 +1,9 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.exception.RayActorException;
 import io.ray.api.options.ActorCreationOptions;
 import java.util.function.BiConsumer;

java/test/src/main/java/io/ray/test/MultiLanguageClusterTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;

java/test/src/main/java/io/ray/test/MultiThreadingTest.java

@@ -1,10 +1,9 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.WaitResult;
 import io.ray.api.exception.RayException;
 import io.ray.api.id.ActorId;

java/test/src/main/java/io/ray/test/ObjectStoreTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ObjectRef;

java/test/src/main/java/io/ray/test/PlasmaFreeTest.java

@@ -1,9 +1,8 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.id.TaskId;
 import java.util.Arrays;
 import org.testng.Assert;

java/test/src/main/java/io/ray/test/PlasmaStoreTest.java

@@ -1,7 +1,6 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.id.ObjectId;
 import io.ray.runtime.object.ObjectStore;
 import org.testng.Assert;

java/test/src/main/java/io/ray/test/RayCallTest.java

@@ -1,9 +1,8 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.id.ObjectId;
 import java.util.List;
 import java.util.Map;

java/test/src/main/java/io/ray/test/RayMethodsTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ObjectRef;

java/test/src/main/java/io/ray/test/RaySerializerTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.PyActorHandle;
 import io.ray.api.Ray;

java/test/src/main/java/io/ray/test/RayletConfigTest.java

@@ -1,8 +1,7 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;

java/test/src/main/java/io/ray/test/RedisPasswordTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;

java/test/src/main/java/io/ray/test/ResourcesManagementTest.java

@@ -1,11 +1,10 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.WaitResult;
 import io.ray.api.options.ActorCreationOptions;
 import io.ray.api.options.CallOptions;

java/test/src/main/java/io/ray/test/RuntimeContextTest.java

@@ -1,4 +1,4 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.Ray;

java/test/src/main/java/io/ray/test/SingleProcessModeTest.java

@@ -1,9 +1,8 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.id.ActorId;
 import java.util.ArrayList;
 import java.util.HashMap;

java/test/src/main/java/io/ray/test/StressTest.java

@@ -1,10 +1,9 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.id.ObjectId;
 import java.util.ArrayList;
 import java.util.List;

java/test/src/main/java/io/ray/test/TestProgressListener.java

@@ -1,4 +1,4 @@
-package io.ray.api;
+package io.ray.test;
 
 import java.time.LocalDateTime;
 import org.testng.IInvokedMethod;

java/test/src/main/java/io/ray/test/TestUtils.java

@@ -1,5 +1,7 @@
-package io.ray.api;
+package io.ray.test;
 
+import io.ray.api.ObjectRef;
+import io.ray.api.Ray;
 import io.ray.runtime.RayRuntimeInternal;
 import io.ray.runtime.RayRuntimeProxy;
 import io.ray.runtime.config.RunMode;

java/test/src/main/java/io/ray/test/WaitTest.java

@@ -1,9 +1,8 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import com.google.common.collect.ImmutableList;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.WaitResult;
 import java.util.ArrayList;
 import java.util.List;

java/test/src/main/java/io/ray/test/WorkerJvmOptionsTest.java

@@ -1,9 +1,8 @@
-package io.ray.api.test;
+package io.ray.test;
 
 import io.ray.api.ActorHandle;
 import io.ray.api.ObjectRef;
 import io.ray.api.Ray;
-import io.ray.api.TestUtils;
 import io.ray.api.options.ActorCreationOptions;
 import org.testng.Assert;
 import org.testng.annotations.Test;

java/testng.xml

@@ -8,6 +8,6 @@
         </packages>
     </test>
     <listeners>
-        <listener class-name="io.ray.api.TestProgressListener" />
+        <listener class-name="io.ray.test.TestProgressListener" />
     </listeners>
 </suite>