[grid] Move jmx package into the grid

shs96c · shs96c · commit 49ea7d8c4899 · 2021-02-02T12:02:34.000Z
diff --git a/java/server/src/org/openqa/selenium/grid/jmx/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/jmx/BUILD.bazel
diff --git a/java/server/src/org/openqa/selenium/grid/jmx/JMXHelper.java b/java/server/src/org/openqa/selenium/grid/jmx/JMXHelper.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.server.jmx;
+package org.openqa.selenium.grid.jmx;
 
 import java.lang.management.ManagementFactory;
 
diff --git a/java/server/src/org/openqa/selenium/grid/jmx/MBean.java b/java/server/src/org/openqa/selenium/grid/jmx/MBean.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.server.jmx;
+package org.openqa.selenium.grid.jmx;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/java/server/src/org/openqa/selenium/grid/jmx/ManagedAttribute.java b/java/server/src/org/openqa/selenium/grid/jmx/ManagedAttribute.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.server.jmx;
+package org.openqa.selenium.grid.jmx;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/java/server/src/org/openqa/selenium/grid/jmx/ManagedOperation.java b/java/server/src/org/openqa/selenium/grid/jmx/ManagedOperation.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.server.jmx;
+package org.openqa.selenium.grid.jmx;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/java/server/src/org/openqa/selenium/grid/jmx/ManagedService.java b/java/server/src/org/openqa/selenium/grid/jmx/ManagedService.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.server.jmx;
+package org.openqa.selenium.grid.jmx;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/java/server/src/org/openqa/selenium/grid/node/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/node/BUILD.bazel
@@ -18,10 +18,10 @@ java_library(
         "//java/client/src/org/openqa/selenium/remote",
         "//java/server/src/org/openqa/selenium/grid/component",
         "//java/server/src/org/openqa/selenium/grid/data",
+        "//java/server/src/org/openqa/selenium/grid/jmx",
         "//java/server/src/org/openqa/selenium/grid/node/locators",
         "//java/server/src/org/openqa/selenium/grid/security",
         "//java/server/src/org/openqa/selenium/grid/web",
-        "//java/server/src/org/openqa/selenium/remote/server/jmx",
         "//java/server/src/org/openqa/selenium/status",
         artifact("com.google.guava:guava"),
     ],
diff --git a/java/server/src/org/openqa/selenium/grid/node/local/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/node/local/BUILD.bazel
@@ -20,12 +20,12 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/config",
         "//java/server/src/org/openqa/selenium/grid/data",
         "//java/server/src/org/openqa/selenium/grid/docker",
+        "//java/server/src/org/openqa/selenium/grid/jmx",
         "//java/server/src/org/openqa/selenium/grid/log",
         "//java/server/src/org/openqa/selenium/grid/node",
         "//java/server/src/org/openqa/selenium/grid/node/config",
         "//java/server/src/org/openqa/selenium/grid/security",
         "//java/server/src/org/openqa/selenium/grid/server",
-        "//java/server/src/org/openqa/selenium/remote/server/jmx",
         artifact("com.google.guava:guava"),
     ],
 )
diff --git a/java/server/src/org/openqa/selenium/grid/node/local/LocalNode.java b/java/server/src/org/openqa/selenium/grid/node/local/LocalNode.java
@@ -54,9 +54,9 @@
 import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
-import org.openqa.selenium.remote.server.jmx.JMXHelper;
-import org.openqa.selenium.remote.server.jmx.ManagedAttribute;
-import org.openqa.selenium.remote.server.jmx.ManagedService;
+import org.openqa.selenium.grid.jmx.JMXHelper;
+import org.openqa.selenium.grid.jmx.ManagedAttribute;
+import org.openqa.selenium.grid.jmx.ManagedService;
 import org.openqa.selenium.remote.tracing.AttributeKey;
 import org.openqa.selenium.remote.tracing.EventAttribute;
 import org.openqa.selenium.remote.tracing.EventAttributeValue;
diff --git a/java/server/src/org/openqa/selenium/grid/server/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/server/BUILD.bazel
@@ -19,8 +19,8 @@ java_library(
         "//java/server/src/org/openqa/selenium/events",
         "//java/server/src/org/openqa/selenium/grid/component",
         "//java/server/src/org/openqa/selenium/grid/config",
+        "//java/server/src/org/openqa/selenium/grid/jmx",
         "//java/server/src/org/openqa/selenium/grid/web",
-        "//java/server/src/org/openqa/selenium/remote/server/jmx",
         artifact("com.beust:jcommander"),
         artifact("com.google.guava:guava"),
         artifact("javax.servlet:javax.servlet-api"),
diff --git a/java/server/src/org/openqa/selenium/grid/server/BaseServerOptions.java b/java/server/src/org/openqa/selenium/grid/server/BaseServerOptions.java
@@ -20,12 +20,12 @@
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.grid.config.Config;
 import org.openqa.selenium.grid.config.ConfigException;
+import org.openqa.selenium.grid.jmx.JMXHelper;
+import org.openqa.selenium.grid.jmx.ManagedAttribute;
+import org.openqa.selenium.grid.jmx.ManagedService;
 import org.openqa.selenium.net.HostIdentifier;
 import org.openqa.selenium.net.NetworkUtils;
 import org.openqa.selenium.net.PortProber;
-import org.openqa.selenium.remote.server.jmx.JMXHelper;
-import org.openqa.selenium.remote.server.jmx.ManagedAttribute;
-import org.openqa.selenium.remote.server.jmx.ManagedService;
 
 import java.io.File;
 import java.net.URI;
diff --git a/java/server/src/org/openqa/selenium/grid/session/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/session/BUILD.bazel
@@ -14,8 +14,8 @@ java_library(
     deps = [
         "//java/client/src/org/openqa/selenium/remote",
         "//java/server/src/org/openqa/selenium/grid/data",
+        "//java/server/src/org/openqa/selenium/grid/jmx",
         "//java/server/src/org/openqa/selenium/grid/web",
-        "//java/server/src/org/openqa/selenium/remote/server/jmx",
         artifact("com.google.guava:guava"),
     ],
 )
diff --git a/java/server/src/org/openqa/selenium/grid/session/remote/ServicedSession.java b/java/server/src/org/openqa/selenium/grid/session/remote/ServicedSession.java
@@ -18,12 +18,12 @@
 package org.openqa.selenium.grid.session.remote;
 
 
-import static java.util.concurrent.TimeUnit.SECONDS;
-
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.InvalidArgumentException;
 import org.openqa.selenium.SessionNotCreatedException;
 import org.openqa.selenium.grid.data.CreateSessionRequest;
+import org.openqa.selenium.grid.jmx.JMXHelper;
+import org.openqa.selenium.grid.jmx.ManagedService;
 import org.openqa.selenium.grid.session.ActiveSession;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.net.PortProber;
@@ -32,11 +32,11 @@
 import org.openqa.selenium.remote.http.HttpHandler;
 import org.openqa.selenium.remote.http.HttpMethod;
 import org.openqa.selenium.remote.http.HttpRequest;
-import org.openqa.selenium.remote.server.jmx.JMXHelper;
-import org.openqa.selenium.remote.server.jmx.ManagedService;
 import org.openqa.selenium.remote.service.DriverService;
 import org.openqa.selenium.remote.tracing.Tracer;
 
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.lang.reflect.Method;
@@ -48,8 +48,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 @ManagedService
 public class ServicedSession extends RemoteSession {
diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionqueue/BUILD.bazel
@@ -18,9 +18,9 @@ java_library(
         "//java/client/src/org/openqa/selenium/remote/http",
         "//java/server/src/org/openqa/selenium/events",
         "//java/server/src/org/openqa/selenium/grid/data",
+        "//java/server/src/org/openqa/selenium/grid/jmx",
         "//java/server/src/org/openqa/selenium/grid/log",
         "//java/server/src/org/openqa/selenium/grid/security",
-        "//java/server/src/org/openqa/selenium/remote/server/jmx",
         "//java/server/src/org/openqa/selenium/status",
         artifact("com.google.guava:guava"),
     ],
diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/config/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionqueue/config/BUILD.bazel
@@ -11,8 +11,8 @@ java_library(
     deps = [
         "//java:auto-service",
         "//java/server/src/org/openqa/selenium/grid/config",
+        "//java/server/src/org/openqa/selenium/grid/jmx",
         "//java/server/src/org/openqa/selenium/grid/sessionqueue",
-        "//java/server/src/org/openqa/selenium/remote/server/jmx",
         artifact("com.beust:jcommander"),
         artifact("io.opentelemetry:opentelemetry-api"),
     ],
diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/config/NewSessionQueueOptions.java b/java/server/src/org/openqa/selenium/grid/sessionqueue/config/NewSessionQueueOptions.java
@@ -18,10 +18,10 @@
 package org.openqa.selenium.grid.sessionqueue.config;
 
 import org.openqa.selenium.grid.config.Config;
+import org.openqa.selenium.grid.jmx.JMXHelper;
+import org.openqa.selenium.grid.jmx.ManagedAttribute;
+import org.openqa.selenium.grid.jmx.ManagedService;
 import org.openqa.selenium.grid.sessionqueue.NewSessionQueue;
-import org.openqa.selenium.remote.server.jmx.JMXHelper;
-import org.openqa.selenium.remote.server.jmx.ManagedAttribute;
-import org.openqa.selenium.remote.server.jmx.ManagedService;
 
 import java.time.Duration;
 
diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/local/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionqueue/local/BUILD.bazel
@@ -14,12 +14,12 @@ java_library(
         "//java/server/src/org/openqa/selenium/events",
         "//java/server/src/org/openqa/selenium/grid/config",
         "//java/server/src/org/openqa/selenium/grid/data",
+        "//java/server/src/org/openqa/selenium/grid/jmx",
         "//java/server/src/org/openqa/selenium/grid/log",
         "//java/server/src/org/openqa/selenium/grid/security",
         "//java/server/src/org/openqa/selenium/grid/server",
         "//java/server/src/org/openqa/selenium/grid/sessionqueue",
         "//java/server/src/org/openqa/selenium/grid/sessionqueue/config",
-        "//java/server/src/org/openqa/selenium/remote/server/jmx",
         artifact("com.google.guava:guava"),
     ],
 )
diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueue.java b/java/server/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueue.java
@@ -33,9 +33,9 @@
 import org.openqa.selenium.remote.NewSessionPayload;
 import org.openqa.selenium.remote.http.HttpRequest;
 
-import org.openqa.selenium.remote.server.jmx.JMXHelper;
-import org.openqa.selenium.remote.server.jmx.ManagedAttribute;
-import org.openqa.selenium.remote.server.jmx.ManagedService;
+import org.openqa.selenium.grid.jmx.JMXHelper;
+import org.openqa.selenium.grid.jmx.ManagedAttribute;
+import org.openqa.selenium.grid.jmx.ManagedService;
 
 import org.openqa.selenium.remote.tracing.AttributeKey;
 import org.openqa.selenium.remote.tracing.EventAttribute;
diff --git a/java/server/test/org/openqa/grid/selenium/proxy/DefaultRemoteProxyTest.java b/java/server/test/org/openqa/grid/selenium/proxy/DefaultRemoteProxyTest.java
@@ -19,7 +19,7 @@
 
 import org.junit.After;
 import org.junit.Test;
-import org.openqa.selenium.remote.server.jmx.JMXHelper;
+import org.openqa.selenium.grid.jmx.JMXHelper;
 
 import java.util.concurrent.TimeoutException;
 
diff --git a/java/server/test/org/openqa/selenium/grid/router/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/router/BUILD.bazel
@@ -60,6 +60,7 @@ java_test_suite(
         "//java/server/src/org/openqa/selenium/grid/distributor/httpd",
         "//java/server/src/org/openqa/selenium/grid/distributor/local",
         "//java/server/src/org/openqa/selenium/grid/distributor/remote",
+        "//java/server/src/org/openqa/selenium/grid/jmx",
         "//java/server/src/org/openqa/selenium/grid/node",
         "//java/server/src/org/openqa/selenium/grid/node/httpd",
         "//java/server/src/org/openqa/selenium/grid/node/local",
@@ -78,7 +79,6 @@ java_test_suite(
         "//java/server/src/org/openqa/selenium/grid/sessionqueue/remote",
         "//java/server/src/org/openqa/selenium/grid/web",
         "//java/server/src/org/openqa/selenium/netty/server",
-        "//java/server/src/org/openqa/selenium/remote/server/jmx",
         "//java/server/test/org/openqa/selenium/grid/testing",
         artifact("com.google.guava:guava"),
         artifact("io.opentelemetry:opentelemetry-api"),
diff --git a/java/server/test/org/openqa/selenium/grid/router/JmxTest.java b/java/server/test/org/openqa/selenium/grid/router/JmxTest.java
@@ -17,45 +17,44 @@
 
 package org.openqa.selenium.grid.router;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
-
 import com.google.common.collect.ImmutableMap;
-
-import java.lang.management.ManagementFactory;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.time.Duration;
-import java.time.Instant;
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceNotFoundException;
-import javax.management.IntrospectionException;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.management.ReflectionException;
-
 import org.junit.Test;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ImmutableCapabilities;
 import org.openqa.selenium.events.EventBus;
 import org.openqa.selenium.events.local.GuavaEventBus;
 import org.openqa.selenium.grid.config.MapConfig;
 import org.openqa.selenium.grid.data.Session;
+import org.openqa.selenium.grid.jmx.JMXHelper;
 import org.openqa.selenium.grid.node.local.LocalNode;
 import org.openqa.selenium.grid.security.Secret;
 import org.openqa.selenium.grid.server.BaseServerOptions;
 import org.openqa.selenium.grid.sessionqueue.config.NewSessionQueueOptions;
 import org.openqa.selenium.grid.sessionqueue.local.LocalNewSessionQueue;
 import org.openqa.selenium.grid.testing.TestSessionFactory;
 import org.openqa.selenium.net.PortProber;
-import org.openqa.selenium.remote.server.jmx.JMXHelper;
 import org.openqa.selenium.remote.tracing.DefaultTestTracer;
 import org.openqa.selenium.remote.tracing.Tracer;
 
+import javax.management.AttributeNotFoundException;
+import javax.management.InstanceNotFoundException;
+import javax.management.IntrospectionException;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanException;
+import javax.management.MBeanInfo;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.management.ReflectionException;
+import java.lang.management.ManagementFactory;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.time.Duration;
+import java.time.Instant;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+
 public class JmxTest {
 
   private final Capabilities CAPS = new ImmutableCapabilities("browserName", "cheese");
