Deprecated methods removed from EncodingSniffer, HttpClientConverter, WebResponse, and WebResponseWrapper

rbri · rbri · commit e597cf0456c6 · 2025-03-06T15:19:21.000+01:00
diff --git a/src/main/java/org/htmlunit/httpclient/HttpClientConverter.java b/src/main/java/org/htmlunit/httpclient/HttpClientConverter.java
@@ -16,16 +16,12 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
 import org.apache.http.NoHttpResponseException;
-import org.apache.http.client.utils.DateUtils;
-import org.apache.http.client.utils.URLEncodedUtils;
 import org.apache.http.cookie.ClientCookie;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieOrigin;
@@ -35,8 +31,6 @@
 import org.apache.http.message.BufferedHeader;
 import org.apache.http.util.CharArrayBuffer;
 import org.htmlunit.BrowserVersion;
-import org.htmlunit.http.HttpStatus;
-import org.htmlunit.http.HttpUtils;
 import org.htmlunit.util.NameValuePair;
 import org.htmlunit.util.UrlUtils;
 
diff --git a/src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java b/src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java
@@ -1345,11 +1345,6 @@ public Charset getContentCharset() {
             return null;
         }
 
-        @Override
-        public Charset getContentCharsetOrNull() {
-            return null;
-        }
-
         @Override
         public WebRequest getWebRequest() {
             return request_;
diff --git a/src/main/java/org/htmlunit/util/EncodingSniffer.java b/src/main/java/org/htmlunit/util/EncodingSniffer.java
@@ -19,7 +19,6 @@
 import static java.nio.charset.StandardCharsets.UTF_16LE;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
diff --git a/src/test/java/org/htmlunit/WebResponse2Test.java b/src/test/java/org/htmlunit/WebResponse2Test.java
@@ -48,7 +48,7 @@ public void charsetInMetaTag() throws Exception {
             + "<body>foo</body>\n"
             + "</html>";
         final HtmlPage page = loadPage(html);
-        assertSame(UTF_8, page.getWebResponse().getContentCharsetOrNull());
+        assertSame(UTF_8, page.getWebResponse().getContentCharset());
         assertEquals(html, page.getWebResponse().getContentAsString());
     }
 
diff --git a/src/test/java/org/htmlunit/util/mocks/WebResponseMock.java b/src/test/java/org/htmlunit/util/mocks/WebResponseMock.java
@@ -66,11 +66,6 @@ public Charset getContentCharset() {
         throw new RuntimeException("not implemented");
     }
 
-    @Override
-    public Charset getContentCharsetOrNull() {
-        throw new RuntimeException("not implemented");
-    }
-
     @Override
     public String getContentType() {
         throw new RuntimeException("not implemented");

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public void charsetInMetaTag() throws Exception {`
`48`	`48`	`+ "<body>foo</body>\n"`
`49`	`49`	`+ "</html>";`
`50`	`50`	`final HtmlPage page = loadPage(html);`
`51`		`- assertSame(UTF_8, page.getWebResponse().getContentCharsetOrNull());`
	`51`	`+ assertSame(UTF_8, page.getWebResponse().getContentCharset());`
`52`	`52`	`assertEquals(html, page.getWebResponse().getContentAsString());`
`53`	`53`	`}`
`54`	`54`