[java][cdp] Allow reusing DevTools instance upon calling close() (#11704)

pujagani · web-flow · commit ecea48d30ec0 · 2023-02-27T16:53:32.000+05:30
Fixes #11704
diff --git a/java/src/org/openqa/selenium/devtools/Connection.java b/java/src/org/openqa/selenium/devtools/Connection.java
@@ -42,6 +42,7 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -65,17 +66,29 @@ public class Connection implements Closeable {
     return thread;
   });
   private static final AtomicLong NEXT_ID = new AtomicLong(1L);
-  private final WebSocket socket;
+  private WebSocket socket;
   private final Map<Long, Consumer<Either<Throwable, JsonInput>>> methodCallbacks = new ConcurrentHashMap<>();
   private final ReadWriteLock callbacksLock = new ReentrantReadWriteLock(true);
   private final Multimap<Event<?>, Consumer<?>> eventCallbacks = HashMultimap.create();
   private final HttpClient client;
+  private final String url;
+  private final AtomicBoolean isClosed;
 
   public Connection(HttpClient client, String url) {
     Require.nonNull("HTTP client", client);
     Require.nonNull("URL to connect to", url);
+    this.url = url;
     this.client = client;
-    socket = this.client.openSocket(new HttpRequest(GET, url), new Listener());
+    this.socket = this.client.openSocket(new HttpRequest(GET, url), new Listener());
+    this.isClosed = new AtomicBoolean();
+  }
+
+  boolean isClosed() {
+    return isClosed.get();
+  }
+
+  void reopen() {
+    this.socket = this.client.openSocket(new HttpRequest(GET, url), new Listener());
   }
 
   private static class NamedConsumer<X> implements Consumer<X> {
@@ -190,6 +203,7 @@ public void clearListeners() {
   public void close() {
     socket.close();
     client.close();
+    this.isClosed.set(true);
   }
 
   private class Listener implements WebSocket.Listener {
diff --git a/java/src/org/openqa/selenium/devtools/DevTools.java b/java/src/org/openqa/selenium/devtools/DevTools.java
@@ -118,6 +118,9 @@ public void createSession() {
    * @param windowHandle result of {@link WebDriver#getWindowHandle()}, optional.
    */
   public void createSession(String windowHandle) {
+    if (connection.isClosed()) {
+      connection.reopen();
+    }
     TargetID targetId = findTarget(windowHandle);
 
     // Starts the session
diff --git a/java/test/org/openqa/selenium/devtools/DevToolsReuseTest.java b/java/test/org/openqa/selenium/devtools/DevToolsReuseTest.java
@@ -0,0 +1,49 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.devtools;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.remote.Augmenter;
+
+class DevToolsReuseTest extends DevToolsTestBase {
+
+  @Test
+  public void shouldBeAbleToCloseDevToolsAndCreateNewInstance() {
+    WebDriver driver = new Augmenter().augment(this.driver);
+
+    DevTools devTools = ((HasDevTools) driver).getDevTools();
+    devTools.createSession();
+    addConsoleLogListener(devTools);
+
+    devTools.close();
+
+    devTools = ((HasDevTools) driver).getDevTools();
+    devTools.createSession();
+    addConsoleLogListener(devTools);
+
+    devTools.close();
+  }
+
+  private static void addConsoleLogListener(DevTools devTools) {
+    devTools.getDomains().events().addConsoleListener(
+      consoleEvent -> assertThat(consoleEvent.getMessages()).contains("Hello, world!"));
+  }
+}
