From 6e86674e4ed9f606ead8ada1a4d80718186ab29b Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 22 Jul 2024 21:15:15 +0200 Subject: [PATCH 1/2] Do not use deprecated BOMInputStream constructor any more Signed-off-by: Sven Strickroth --- src/main/java/org/htmlunit/WebResponseData.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/htmlunit/WebResponseData.java b/src/main/java/org/htmlunit/WebResponseData.java index bd9b11f9d5f..3c41e2851e7 100644 --- a/src/main/java/org/htmlunit/WebResponseData.java +++ b/src/main/java/org/htmlunit/WebResponseData.java @@ -43,6 +43,7 @@ * @author Daniel Gredler * @author Ahmed Ashour * @author Ronald Brill + * @author Sven Strickroth */ public class WebResponseData implements Serializable { private static final Log LOG = LogFactory.getLog(WebResponseData.class); @@ -123,7 +124,7 @@ private InputStream getStream(final ByteOrderMark... bomHeaders) throws IOExcept + "", ISO_8859_1); } if (stream != null && bomHeaders != null) { - stream = new BOMInputStream(stream, bomHeaders); + stream = BOMInputStream.builder().setInputStream(stream).setByteOrderMarks(bomHeaders).get(); } return stream; } @@ -168,7 +169,7 @@ private InputStream getStream(final ByteOrderMark... bomHeaders) throws IOExcept } if (stream != null && bomHeaders != null) { - stream = new BOMInputStream(stream, bomHeaders); + stream = BOMInputStream.builder().setInputStream(stream).setByteOrderMarks(bomHeaders).get(); } return stream; } From c04adb6b84ea35030eeb237878114717db6e69eb Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 22 Jul 2024 21:20:37 +0200 Subject: [PATCH 2/2] Do not use deprecated Locale constructors any more Those are deprecated since Java 19. Signed-off-by: Sven Strickroth --- .../org/htmlunit/javascript/host/intl/V8BreakIterator.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/htmlunit/javascript/host/intl/V8BreakIterator.java b/src/main/java/org/htmlunit/javascript/host/intl/V8BreakIterator.java index 0c4da7721ef..169c04cdb44 100644 --- a/src/main/java/org/htmlunit/javascript/host/intl/V8BreakIterator.java +++ b/src/main/java/org/htmlunit/javascript/host/intl/V8BreakIterator.java @@ -38,6 +38,7 @@ * * @author Ahmed Ashour * @author Ronald Brill + * @author Sven Strickroth */ @JsxClass(value = {CHROME, EDGE}, className = "v8BreakIterator") public class V8BreakIterator extends HtmlUnitScriptable { @@ -58,16 +59,16 @@ public class V8BreakIterator extends HtmlUnitScriptable { @JsxConstructor public static Scriptable jsConstructor(final Context cx, final Scriptable scope, final Object[] args, final Function ctorObj, final boolean inNewExpr) { - Locale locale = new Locale("en", "US"); + Locale locale = new Locale.Builder().setLanguage("en").setRegion("US").build(); if (args.length != 0) { final Object locales = args[0]; if (locales instanceof NativeArray) { if (((NativeArray) locales).getLength() != 0) { - locale = new Locale(((NativeArray) locales).get(0).toString()); + locale = new Locale.Builder().setLanguage(((NativeArray) locales).get(0).toString()).build(); } } else if (locales instanceof String) { - locale = new Locale(locales.toString()); + locale = new Locale.Builder().setLanguage(locales.toString()).build(); } else if (!JavaScriptEngine.isUndefined(locales)) { throw JavaScriptEngine.throwAsScriptRuntimeEx(