Internal class WebClientInternals removed

rbri · rbri · commit fb4c098281fa · 2024-04-26T17:19:30.000+02:00
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -27,6 +27,9 @@
                 Deprecated http status code constants removed from WebResponse.
             </action>
 
+            <action type="remove" dev="rbri">
+                Internal class WebClientInternals removed.
+            </action>
             <action type="add" dev="rbri">
                 First simple version of HtmlElement innerText setter implemented.
             </action>
diff --git a/src/main/java/org/htmlunit/WebClient.java b/src/main/java/org/htmlunit/WebClient.java
@@ -218,7 +218,6 @@ public class WebClient implements Serializable, AutoCloseable {
 
     private final WebClientOptions options_ = new WebClientOptions();
     private final boolean javaScriptEngineEnabled_;
-    private final WebClientInternals internals_ = new WebClientInternals();
     private final StorageHolder storageHolder_ = new StorageHolder();
 
     /**
@@ -2727,16 +2726,6 @@ public WebClientOptions getOptions() {
         return options_;
     }
 
-    /**
-     * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br>
-     *
-     * Returns the internals object of this WebClient.
-     * @return the internals object
-     */
-    public WebClientInternals getInternals() {
-        return internals_;
-    }
-
     /**
      * Gets the holder for the different storages.
      * <p><span style="color:red">Experimental API: May be changed in next release!</span></p>
diff --git a/src/main/java/org/htmlunit/WebClientInternals.java b/src/main/java/org/htmlunit/WebClientInternals.java
diff --git a/src/main/java/org/htmlunit/javascript/host/WebSocket.java b/src/main/java/org/htmlunit/javascript/host/WebSocket.java
@@ -191,8 +191,6 @@ public void onWebSocketError(final Throwable cause) {
             containingPage_.addAutoCloseable(this);
             url_ = new URI(url);
 
-            webClient.getInternals().created(this);
-
             webSocketImpl_.connect(url_);
         }
         catch (final Exception e) {
diff --git a/src/test/java/org/htmlunit/general/ElementPropertiesTest.java b/src/test/java/org/htmlunit/general/ElementPropertiesTest.java
@@ -7147,7 +7147,7 @@ public void nodeListButtonLabels() throws Exception {
                 + "container,container-name,container-type,containerName,containerType,"
                 + "containIntrinsicBlockSize,containIntrinsicHeight,"
                 + "containIntrinsicInlineSize,containIntrinsicSize,containIntrinsicWidth,"
-                + "content,counter-increment,counter-reset,counter-set,"
+                + "content,content-visibility,contentVisibility,counter-increment,counter-reset,counter-set,"
                 + "counterIncrement,counterReset,counterSet,cssFloat,cssText,cursor,cx,cy,d,direction,display,"
                 + "dominant-baseline,dominantBaseline,empty-cells,emptyCells,fill,fill-opacity,fill-rule,"
                 + "fillOpacity,fillRule,filter,flex,flex-basis,flex-direction,flex-flow,flex-grow,flex-shrink,"
diff --git a/src/test/java/org/htmlunit/javascript/host/WebSocketTest.java b/src/test/java/org/htmlunit/javascript/host/WebSocketTest.java
@@ -31,8 +31,6 @@
 import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
 import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
 import org.htmlunit.HttpHeader;
-import org.htmlunit.WebClient;
-import org.htmlunit.WebClientInternals;
 import org.htmlunit.WebDriverTestCase;
 import org.htmlunit.junit.BrowserRunner;
 import org.htmlunit.junit.BrowserRunner.Alerts;
@@ -43,7 +41,6 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 
 /**
  * Tests for {@link WebSocket}.
@@ -623,44 +620,6 @@ public void onWebSocketBinary(final byte[] payload, final int offset, final int
         }
     }
 
-    /**
-     * @throws Exception if the test fails
-     */
-    @Test
-    public void listener() throws Exception {
-        startWebServer("src/test/resources/org/htmlunit/javascript/host",
-                null, null, new EventsWebSocketHandler());
-        try {
-            final WebDriver driver = getWebDriver();
-            final int[] webSocketCreated = {0};
-
-            if (driver instanceof HtmlUnitDriver) {
-                final WebClient webClient = getWebClient();
-                final WebClientInternals internals = webClient.getInternals();
-
-                internals.addListener(new WebClientInternals.Listener() {
-                    @Override
-                    public void webSocketCreated(final WebSocket webSocket) {
-                        webSocketCreated[0]++;
-                    }
-                });
-            }
-
-            driver.get(URL_FIRST + "WebSocketTest_listener.html");
-
-            if (driver instanceof HtmlUnitDriver) {
-                final long maxWait = System.currentTimeMillis() + DEFAULT_WAIT_TIME;
-                while (webSocketCreated[0] < 0 && System.currentTimeMillis() < maxWait) {
-                    Thread.sleep(30);
-                }
-                assertEquals(1, webSocketCreated[0]);
-            }
-        }
-        finally {
-            stopWebServers();
-        }
-    }
-
     /**
      * @throws Exception if the test fails
      */

Original file line number	Diff line number	Diff line change
`@@ -191,8 +191,6 @@ public void onWebSocketError(final Throwable cause) {`
`191`	`191`	`containingPage_.addAutoCloseable(this);`
`192`	`192`	`url_ = new URI(url);`
`193`	`193`
`194`		`- webClient.getInternals().created(this);`
`195`		`-`
`196`	`194`	`webSocketImpl_.connect(url_);`
`197`	`195`	`}`
`198`	`196`	`catch (final Exception e) {`