diff --git a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java index c097242034c..2f2d1d34d6a 100644 --- a/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java +++ b/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java @@ -324,9 +324,9 @@ public LocaleDropDownChoice(String id) } /** Relevant locales wrapped in a list. */ - private static final List LOCALES = Arrays.asList(Locale.ENGLISH, Locale.of("nl"), - Locale.GERMAN, Locale.SIMPLIFIED_CHINESE, Locale.JAPANESE, Locale.of("pt", "BR"), - Locale.of("fa", "IR"), Locale.of("da", "DK")); + private static final List LOCALES = Arrays.asList(Locale.ENGLISH, new Locale("nl"), + Locale.GERMAN, Locale.SIMPLIFIED_CHINESE, Locale.JAPANESE, new Locale("pt", "BR"), + new Locale("fa", "IR"), new Locale("da", "DK")); /** available sites for the multiple select. */ private static final List SITES = Arrays.asList("The Server Side", "Java Lobby", diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/LocalizerTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/LocalizerTest.java index fd461d8e383..40b92cbb975 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/LocalizerTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/LocalizerTest.java @@ -179,7 +179,7 @@ void testTwoComponents() assertEquals("value 1", localizer.getString("null", page.drop1)); assertEquals("value 2", localizer.getString("null", page.drop2)); - Session.get().setLocale(Locale.of("nl")); + Session.get().setLocale(new Locale("nl")); assertEquals("waarde 1", localizer.getString("null", page.drop1)); assertEquals("waarde 2", localizer.getString("null", page.drop2)); } diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java index b5ba6e38c59..05486cd4355 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/PageMarkupLoadingTest.java @@ -49,7 +49,7 @@ void english() throws Exception @Test void dutch() throws Exception { - tester.getSession().setLocale(Locale.of("nl")); + tester.getSession().setLocale(new Locale("nl")); tester.startPage(Page1.class); tester.assertRenderedPage(Page1.class); tester.assertResultPage(getClass(), "PageMarkupLoadingTest$Page1_nl_expected.html"); @@ -63,7 +63,7 @@ void dutch() throws Exception @Test void testDutchMyStyle() throws Exception { - tester.getSession().setLocale(Locale.of("nl")); + tester.getSession().setLocale(new Locale("nl")); tester.getSession().setStyle("mystyle"); tester.startPage(Page1.class); tester.assertRenderedPage(Page1.class); @@ -78,7 +78,7 @@ void testDutchMyStyle() throws Exception @Test void dutchMyStyleMyVar() throws Exception { - tester.getSession().setLocale(Locale.of("nl")); + tester.getSession().setLocale(new Locale("nl")); tester.getSession().setStyle("mystyle"); tester.startPage(Page2.class); tester.assertRenderedPage(Page2.class); diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java index 13339496e37..ee667929b4c 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/core/request/mapper/AbstractResourceReferenceMapperTest.java @@ -133,7 +133,7 @@ public IResource getResource() }; ResourceReference reference2 = new ResourceReference( - AbstractResourceReferenceMapperTest.class, "reference2/name2", Locale.of("en", "en"), + AbstractResourceReferenceMapperTest.class, "reference2/name2", new Locale("en", "en"), null, null) { private static final long serialVersionUID = 1L; @@ -146,7 +146,7 @@ public IResource getResource() }; private ResourceReference reference2_a = new ResourceReference( - AbstractResourceReferenceMapperTest.class, "reference2/name2", Locale.of("en", "en"), + AbstractResourceReferenceMapperTest.class, "reference2/name2", new Locale("en", "en"), "style", null) { private static final long serialVersionUID = 1L; diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java index 6acd50cfefc..550424ecfcc 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java @@ -162,7 +162,7 @@ void decode3() assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class); ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler; assertEquals(resource2, h.getResource()); - assertEquals(Locale.of("en", "en"), h.getLocale()); + assertEquals(new Locale("en", "en"), h.getLocale()); assertNull(h.getStyle()); assertNull(h.getVariation()); assertEquals(0, h.getPageParameters().getIndexedCount()); @@ -180,7 +180,7 @@ void decode3A() assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class); ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler; assertEquals(resource2, h.getResource()); - assertEquals(Locale.of("en", "en"), h.getLocale()); + assertEquals(new Locale("en", "en"), h.getLocale()); assertEquals("style", h.getStyle()); assertNull(h.getVariation()); assertEquals(0, h.getPageParameters().getIndexedCount()); @@ -210,7 +210,7 @@ void decode4() assertThat(handler).isInstanceOf(ResourceReferenceRequestHandler.class); ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler; assertEquals(resource2, h.getResource()); - assertEquals(Locale.of("en", "en"), h.getLocale()); + assertEquals(new Locale("en", "en"), h.getLocale()); assertNull(h.getStyle()); assertNull(h.getVariation()); assertEquals("v1", h.getPageParameters().get("p1").toString()); diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/core/request/resource/PackageResourceReferenceTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/core/request/resource/PackageResourceReferenceTest.java index 3e230660255..8b7e05aac38 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/core/request/resource/PackageResourceReferenceTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/core/request/resource/PackageResourceReferenceTest.java @@ -70,7 +70,7 @@ class PackageResourceReferenceTest extends WicketTestCase { private static Class scope = PackageResourceReferenceTest.class; private static final Locale defaultLocale = Locale.CHINA; - private static final Locale[] locales = { null, Locale.of("en"), Locale.of("en", "US") }; + private static final Locale[] locales = { null, new Locale("en"), new Locale("en", "US") }; private static final String[] styles = { null, "style" }; private static final String[] variations = { null, "var" }; @@ -173,7 +173,7 @@ void resourceResponse() @Test void sessionAttributesRelevance() { - for (Locale locale : new Locale[] { Locale.of("en"), Locale.of("en", "US") }) + for (Locale locale : new Locale[] { new Locale("en"), new Locale("en", "US") }) { tester.getSession().setLocale(locale); for (String style : styles) @@ -198,10 +198,10 @@ void sessionAttributesRelevance() @Test void userAttributesPreference() { - tester.getSession().setLocale(Locale.of("en")); + tester.getSession().setLocale(new Locale("en")); tester.getSession().setStyle("style"); - Locale[] userLocales = { null, Locale.of("pt"), Locale.of("pt", "BR") }; + Locale[] userLocales = { null, new Locale("pt"), new Locale("pt", "BR") }; String userStyle = "style2"; for (Locale userLocale : userLocales) diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/core/util/file/WebApplicationPathTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/core/util/file/WebApplicationPathTest.java index e1642de1507..d8badb3812a 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/core/util/file/WebApplicationPathTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/core/util/file/WebApplicationPathTest.java @@ -19,7 +19,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import java.net.URI; import java.net.URL; import jakarta.servlet.ServletContext; @@ -36,7 +35,7 @@ class WebApplicationPathTest @Test void doNotServeResourcesFromWebInf() throws Exception { - URL webUrl = URI.create("file://dummyFile").toURL(); + URL webUrl = new URL("file://dummyFile"); ServletContext context = Mockito.mock(ServletContext.class); Mockito.when(context.getResource(ArgumentMatchers.any(String.class))).thenReturn(webUrl); diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/ResourceStreamLocatorTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/ResourceStreamLocatorTest.java index 89be4a22764..cb9a7242f6c 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/ResourceStreamLocatorTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/ResourceStreamLocatorTest.java @@ -44,21 +44,21 @@ */ public class ResourceStreamLocatorTest extends WicketTestCase { - private final Locale locale_de = Locale.of("de"); - private final Locale locale_de_DE = Locale.of("de", "DE"); - private final Locale locale_de_DE_POSIX = Locale.of("de", "DE", "POSIX"); - private final Locale locale_de_POSIX = Locale.of("de", "", "POSIX"); - private final Locale locale_de_CH = Locale.of("de", "CH"); - - private final Locale locale_en = Locale.of("en"); - private final Locale locale_en_US = Locale.of("en", "US"); - private final Locale locale_en_US_WIN = Locale.of("en", "US", "WIN"); - private final Locale locale_en_WIN = Locale.of("en", "", "WIN"); - - private final Locale locale_fr = Locale.of("fr"); - private final Locale locale_fr_FR = Locale.of("fr", "FR"); - private final Locale locale_fr_FR_WIN = Locale.of("fr", "FR", "WIN"); - private final Locale locale_fr_WIN = Locale.of("fr", "", "WIN"); + private final Locale locale_de = new Locale("de"); + private final Locale locale_de_DE = new Locale("de", "DE"); + private final Locale locale_de_DE_POSIX = new Locale("de", "DE", "POSIX"); + private final Locale locale_de_POSIX = new Locale("de", "", "POSIX"); + private final Locale locale_de_CH = new Locale("de", "CH"); + + private final Locale locale_en = new Locale("en"); + private final Locale locale_en_US = new Locale("en", "US"); + private final Locale locale_en_US_WIN = new Locale("en", "US", "WIN"); + private final Locale locale_en_WIN = new Locale("en", "", "WIN"); + + private final Locale locale_fr = new Locale("fr"); + private final Locale locale_fr_FR = new Locale("fr", "FR"); + private final Locale locale_fr_FR_WIN = new Locale("fr", "FR", "WIN"); + private final Locale locale_fr_WIN = new Locale("fr", "", "WIN"); /** * diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/UrlResourceStreamTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/UrlResourceStreamTest.java index f6725f37947..60829c9b05d 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/UrlResourceStreamTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/UrlResourceStreamTest.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.io.InputStream; -import java.net.URI; import java.net.URL; import java.net.URLConnection; import java.net.URLStreamHandler; @@ -67,7 +66,7 @@ void loadJustOnce() throws IOException, ResourceStreamNotFoundException { final AtomicInteger connectCounter = new AtomicInteger(0); final AtomicInteger streamCounter = new AtomicInteger(0); - URL url = URL.of(URI.create("test://anything"), new CountingURLStreamHandler(realURL, + URL url = new URL(null, "test://anything", new CountingURLStreamHandler(realURL, connectCounter, streamCounter)); UrlResourceStream countingStream = new UrlResourceStream(url); diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/locator/CachingResourceStreamLocatorTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/locator/CachingResourceStreamLocatorTest.java index 0ede019f760..fd15e29cb3c 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/locator/CachingResourceStreamLocatorTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/locator/CachingResourceStreamLocatorTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import java.io.File; -import java.net.URI; import java.net.URL; import java.util.Locale; @@ -109,7 +108,7 @@ void strictMatchingDoesntInvalidateNonStrictMatching() String style = null; String variation = null; - Locale locale = Locale.of("nl", "NL"); + Locale locale = new Locale("nl", "NL"); String extension = null; String filename = "org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js"; @@ -139,7 +138,7 @@ void nonStrictMatchingDoesntResultInInvalidStrictMatch() String style = null; String variation = null; - Locale locale = Locale.of("nl", "NL"); + Locale locale = new Locale("nl", "NL"); String extension = null; String filename = "org/apache/wicket/ajax/res/js/wicket-ajax-jquery.js"; @@ -219,7 +218,7 @@ void urlResource() throws Exception { IResourceStreamLocator resourceStreamLocator = mock(IResourceStreamLocator.class); - UrlResourceStream urs = new UrlResourceStream(URI.create("file:///").toURL()); + UrlResourceStream urs = new UrlResourceStream(new URL("file:///")); when(resourceStreamLocator.locate(String.class, "path")).thenReturn(urs); diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/locator/ResourceNameIteratorTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/locator/ResourceNameIteratorTest.java index fdecd6feab2..487c19a8e15 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/locator/ResourceNameIteratorTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/core/util/resource/locator/ResourceNameIteratorTest.java @@ -39,7 +39,7 @@ class ResourceNameIteratorTest extends WicketTestCase @Test void localeResourceNameIterator() { - Locale locale = Locale.of("a", "b", "c"); + Locale locale = new Locale("a", "b", "c"); LocaleResourceNameIterator iterator = new LocaleResourceNameIterator(locale, false); HashSet variations = new HashSet(); while (iterator.hasNext()) @@ -52,7 +52,7 @@ void localeResourceNameIterator() assertTrue(variations.contains("_a")); assertTrue(variations.contains("")); - locale = Locale.of("a", "b"); + locale = new Locale("a", "b"); iterator = new LocaleResourceNameIterator(locale, false); variations = new HashSet(); while (iterator.hasNext()) @@ -64,7 +64,7 @@ void localeResourceNameIterator() assertTrue(variations.contains("_a")); assertTrue(variations.contains("")); - locale = Locale.of("a"); + locale = new Locale("a"); iterator = new LocaleResourceNameIterator(locale, false); variations = new HashSet(); while (iterator.hasNext()) diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java index b0b7e6dc249..c369d2aa2b6 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java @@ -40,36 +40,36 @@ void localeLanguageCountryVariant() Foo foo = new Foo("foo"); assertEquals("org.apache.wicket.markup.Foo.html", provider.getCacheKey(foo, foo.getClass())); - foo.locale = Locale.of(""); + foo.locale = new Locale(""); assertEquals("org.apache.wicket.markup.Foo_.html", provider.getCacheKey(foo, foo.getClass())); - foo.locale = Locale.of("language"); + foo.locale = new Locale("language"); assertEquals("org.apache.wicket.markup.Foo_language.html", provider.getCacheKey(foo, foo.getClass())); - foo.locale = Locale.of("", "COUNTRY"); + foo.locale = new Locale("", "COUNTRY"); assertEquals("org.apache.wicket.markup.Foo__COUNTRY.html", provider.getCacheKey(foo, foo.getClass())); // variant only is ignored - foo.locale = Locale.of("", "", "variant"); + foo.locale = new Locale("", "", "variant"); assertEquals("org.apache.wicket.markup.Foo_.html", provider.getCacheKey(foo, foo.getClass())); - foo.locale = Locale.of("language", "COUNTRY"); + foo.locale = new Locale("language", "COUNTRY"); assertEquals("org.apache.wicket.markup.Foo_language_COUNTRY.html", provider.getCacheKey( foo, foo.getClass())); - foo.locale = Locale.of("language", "", "variant"); + foo.locale = new Locale("language", "", "variant"); assertEquals("org.apache.wicket.markup.Foo_language__variant.html", provider.getCacheKey( foo, foo.getClass())); - foo.locale = Locale.of("", "COUNTRY", "variant"); + foo.locale = new Locale("", "COUNTRY", "variant"); assertEquals("org.apache.wicket.markup.Foo__COUNTRY_variant.html", provider.getCacheKey( foo, foo.getClass())); - foo.locale = Locale.of("language", "COUNTRY", "variant"); + foo.locale = new Locale("language", "COUNTRY", "variant"); assertEquals("org.apache.wicket.markup.Foo_language_COUNTRY_variant.html", provider.getCacheKey(foo, foo.getClass())); } diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java index 0e389171ca7..9d7e45b7596 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java @@ -33,7 +33,7 @@ class LocalizedErrorMessageTest extends WicketTestCase @Test void wicket891() { - tester.getSession().setLocale(Locale.of("nl")); + tester.getSession().setLocale(new Locale("nl")); LocalizedMessagePage page = new LocalizedMessagePage(); tester.startPage(page); @@ -42,7 +42,7 @@ void wicket891() tester.submitForm(page.form); tester.assertErrorMessages("'Number' moet een getal zijn. "); - tester.getSession().setLocale(Locale.of("us")); + tester.getSession().setLocale(new Locale("us")); tester.clearFeedbackMessages(); @@ -62,7 +62,7 @@ void wicket891() @Test void testConvertedVars() { - tester.getSession().setLocale(Locale.of("de")); + tester.getSession().setLocale(new Locale("de")); LocalizedMessagePage page = new LocalizedMessagePage(); tester.startPage(page); @@ -84,7 +84,7 @@ void testConvertedVars() void wicket_1927() { tester.getApplication().getMarkupSettings().setDefaultMarkupEncoding("UTF-8"); - tester.getSession().setLocale(Locale.of("de")); + tester.getSession().setLocale(new Locale("de")); LocalizedMessagePage page = new LocalizedMessagePage(); tester.startPage(page); @@ -94,7 +94,7 @@ void wicket_1927() tester.submitForm(page.form); tester.assertErrorMessages("Der Wert von 'Number' ist kein g\u00FCltiger Wert f\u00FCr 'Double'."); - tester.getSession().setLocale(Locale.of("pl")); + tester.getSession().setLocale(new Locale("pl")); tester.clearFeedbackMessages(); diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java index bc77c7eab0a..d23decda38b 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java @@ -183,7 +183,7 @@ void test1() // now test Dutch - tester.getSession().setLocale(Locale.of("nl")); + tester.getSession().setLocale(new Locale("nl")); page = new TestPage(); form = (Form)page.get("form1"); assertNotNull(form); diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java index eec70162e8a..4cebe01c9bf 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/imagebutton/Home.java @@ -74,7 +74,7 @@ public void onClick() @Override public void onClick() { - getSession().setLocale(Locale.of("nl", "NL")); + getSession().setLocale(new Locale("nl", "NL")); } }); add(new Link("goGerman") @@ -84,7 +84,7 @@ public void onClick() @Override public void onClick() { - getSession().setLocale(Locale.of("de", "DE")); + getSession().setLocale(new Locale("de", "DE")); } }); add(new Link("goChinese") @@ -94,7 +94,7 @@ public void onClick() @Override public void onClick() { - getSession().setLocale(Locale.of("zh", "CN")); + getSession().setLocale(new Locale("zh", "CN")); } }); add(new Link("goDanish") @@ -104,7 +104,7 @@ public void onClick() @Override public void onClick() { - getSession().setLocale(Locale.of("da", "DK")); + getSession().setLocale(new Locale("da", "DK")); } }); } diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java index 0035d417975..7e7ffae0304 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/form/imagebutton/ImageButtonTest.java @@ -33,7 +33,7 @@ class ImageButtonTest extends WicketTestCase @Test void imageButton() throws Exception { - Locale.setDefault(Locale.of("en", "US")); + Locale.setDefault(new Locale("en", "US")); tester.startPage(Home.class); diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/image/Home.java b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/image/Home.java index dd51c547dff..c9516c3be94 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/image/Home.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/image/Home.java @@ -73,7 +73,7 @@ public void onClick() @Override public void onClick() { - getSession().setLocale(Locale.of("nl", "NL")); + getSession().setLocale(new Locale("nl", "NL")); } }); add(new Link("goGerman") @@ -83,7 +83,7 @@ public void onClick() @Override public void onClick() { - getSession().setLocale(Locale.of("de", "DE")); + getSession().setLocale(new Locale("de", "DE")); } }); add(new Link("goChinese") @@ -93,7 +93,7 @@ public void onClick() @Override public void onClick() { - getSession().setLocale(Locale.of("zh", "CN")); + getSession().setLocale(new Locale("zh", "CN")); } }); add(new Link("goDanish") @@ -103,7 +103,7 @@ public void onClick() @Override public void onClick() { - getSession().setLocale(Locale.of("da", "DK")); + getSession().setLocale(new Locale("da", "DK")); } }); } diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java index 256cc372c71..04e8ad94e6b 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java @@ -34,7 +34,7 @@ public class ImageTest extends WicketTestCase @Test void test_1() throws Exception { - Locale.setDefault(Locale.of("en", "US")); + Locale.setDefault(new Locale("en", "US")); tester.startPage(Home.class); tester.clickLink("goCanadian"); diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java index 5c1577ee10a..ffd85e5020e 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/pageStore/AsynchronousPageStoreTest.java @@ -26,6 +26,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import org.apache.commons.lang3.RandomUtils; @@ -533,6 +534,6 @@ public IManageablePage getPage(IPageContext context, int id) { private long around(long target) { - return RandomUtils.secure().randomLong((long)(target * .9), (long)(target * 1.1)); + return RandomUtils.nextLong((long)(target * .9), (long)(target * 1.1)); } } diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/pageStore/InSessionPageStoreConcurrencyTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/pageStore/InSessionPageStoreConcurrencyTest.java index acd43f8dad4..75594096e25 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/pageStore/InSessionPageStoreConcurrencyTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/pageStore/InSessionPageStoreConcurrencyTest.java @@ -96,7 +96,7 @@ public MockHttpSession getHttpSession() }; Callable serializeSessionTask = () -> { - final NullOutputStream nullOutputStream = NullOutputStream.INSTANCE; + final NullOutputStream nullOutputStream = NullOutputStream.NULL_OUTPUT_STREAM; try(final ObjectOutputStream objectOutputStream = new ObjectOutputStream(nullOutputStream)) { objectOutputStream.writeObject(wicketTester.getSession()); diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java index 7ba32cc75a4..f289a4cf790 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java @@ -535,7 +535,7 @@ void ignorePaths() throws Exception filter.init(new FilterTestingConfig()); HttpServletRequest request = mock(HttpServletRequest.class); - when(request.getLocale()).thenReturn(Locale.of("bg", "BG")); + when(request.getLocale()).thenReturn(new Locale("bg", "BG")); when(request.getRequestURI()).thenReturn("/contextPath/js/bla.js") .thenReturn("/contextPath/css/bla.css") .thenReturn("/contextPath/images/bla.img") diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java b/wicket-core-tests/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java index 8d9d300fd99..186515d8611 100644 --- a/wicket-core-tests/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java +++ b/wicket-core-tests/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java @@ -106,7 +106,7 @@ void loaderInvalidKeyNoStyleDefaultLocale() @Test void loaderValidKeyNoStyleAlternativeLocale() { - String s = loader.loadStringResource(component.getClass(), "test.string", Locale.of("zz"), + String s = loader.loadStringResource(component.getClass(), "test.string", new Locale("zz"), null, null); assertEquals("Flib flob", s, "Resource should be loaded"); } @@ -118,7 +118,7 @@ void loaderValidKeyNoStyleAlternativeLocale() void loaderInvalidKeyNoStyleAlternativeLocale() { assertNull(loader.loadStringResource(component.getClass(), "unknown.string", - Locale.of("zz"), null, null), "Missing key should return null"); + new Locale("zz"), null, null), "Missing key should return null"); } /** diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/LocaleResourceNameIterator.java b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/LocaleResourceNameIterator.java index 3faedccda6f..a2d2763e3ca 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/LocaleResourceNameIterator.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/LocaleResourceNameIterator.java @@ -63,11 +63,11 @@ public Locale getLocale() } else if (state == 2) { - return Locale.of(locale.getLanguage(), locale.getCountry()); + return new Locale(locale.getLanguage(), locale.getCountry()); } else if (state == 3) { - return Locale.of(locale.getLanguage()); + return new Locale(locale.getLanguage()); } return null; } diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java index ee44fd3b877..1d1ee4bd4d3 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java @@ -17,8 +17,6 @@ package org.apache.wicket.markup.html.include; import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; import java.net.URL; import java.nio.charset.Charset; @@ -189,9 +187,9 @@ private String importAbsoluteUrl(CharSequence url) { try { - return importUrl(new URI(url.toString()).toURL()); + return importUrl(new URL(url.toString())); } - catch (URISyntaxException | MalformedURLException e) + catch (MalformedURLException e) { throw new WicketRuntimeException(e); } diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java index 3594200481e..362fb1dd8db 100755 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java @@ -650,11 +650,11 @@ private Locale getLocale(final String value) if (bits.length > 1) { final String country = bits[1].toUpperCase(Locale.ROOT); - return Locale.of(language, country); + return new Locale(language, country); } else { - return Locale.of(language); + return new Locale(language); } } diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/PartWriterCallback.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/PartWriterCallback.java index 8e2ce385452..6b6b4c9a6a8 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/PartWriterCallback.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/PartWriterCallback.java @@ -141,13 +141,12 @@ public void writeData(Attributes attributes) throws IOException { // Stream is going to be read from the starting point next to the skipped bytes // till the end byte computed by the range between startbyte / endbyte - boundedInputStream = BoundedInputStream.builder() - .setInputStream(inputStream) - .setMaxCount((endbyte - startbyte) + 1) - // The original input stream is going to be closed by the end of the request - // so set propagate close to false - .setPropagateClose(false) - .get(); + boundedInputStream = new BoundedInputStream(inputStream, + (endbyte - startbyte) + 1); + + // The original input stream is going to be closed by the end of the request + // so set propagate close to false + boundedInputStream.setPropagateClose(false); // The read bytes in the current buffer int readBytes; diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java b/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java index 2ef46d1957e..28ed7e2562e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/ResourceUtil.java @@ -196,15 +196,15 @@ public static Locale parseLocale(String locale) String parts[] = locale.toLowerCase(Locale.ROOT).split("_", 3); if (parts.length == 1) { - return Locale.of(parts[0]); + return new Locale(parts[0]); } else if (parts.length == 2) { - return Locale.of(parts[0], parts[1]); + return new Locale(parts[0], parts[1]); } else if (parts.length == 3) { - return Locale.of(parts[0], parts[1], parts[2]); + return new Locale(parts[0], parts[1], parts[2]); } else { diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java index 4bab3e24177..8833c456ee3 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java @@ -40,9 +40,9 @@ public class FormInputApplication extends WicketExampleApplication { /** Relevant locales wrapped in a list. */ public static final List LOCALES = Arrays.asList(Locale.ENGLISH, - Locale.of("nl", "NL"), Locale.GERMAN, Locale.SIMPLIFIED_CHINESE, Locale.JAPANESE, - Locale.of("pt", "BR"), Locale.of("fa", "IR"), Locale.of("da", "DK"), - Locale.of("th", "TH"), Locale.of("ru"), Locale.of("ko", "KR")); + new Locale("nl", "NL"), Locale.GERMAN, Locale.SIMPLIFIED_CHINESE, Locale.JAPANESE, + new Locale("pt", "BR"), new Locale("fa", "IR"), new Locale("da", "DK"), + new Locale("th", "TH"), new Locale("ru"), new Locale("ko", "KR")); @Override public Class getHomePage() @@ -92,7 +92,7 @@ protected void init() // Persian buttons Font fontFa = new Font("Serif", Font.BOLD, 16); - Locale farsi = Locale.of("fa", "IR"); + Locale farsi = new Locale("fa", "IR"); DefaultButtonImageResource imgSaveFa = new DefaultButtonImageResource( "\u0630\u062e\u064a\u0631\u0647"); imgSaveFa.setFont(fontFa); diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java index c4bcdbb9d8c..6d6d3f111c8 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java @@ -68,12 +68,12 @@ public Home(final PageParameters parameters) // locale add(new SetLocaleLink("goCanadian", Locale.CANADA)); add(new SetLocaleLink("goUS", Locale.US)); - add(new SetLocaleLink("goDutch", Locale.of("nl", "NL"))); - add(new SetLocaleLink("goGerman", Locale.of("de", "DE"))); - add(new SetLocaleLink("goChinese", Locale.of("zh", "CN"))); - add(new SetLocaleLink("goDanish", Locale.of("da", "DK"))); - add(new SetLocaleLink("goKorean", Locale.of("ko", "KR"))); - add(new SetLocaleLink("goHungarian", Locale.of("hu"))); + add(new SetLocaleLink("goDutch", new Locale("nl", "NL"))); + add(new SetLocaleLink("goGerman", new Locale("de", "DE"))); + add(new SetLocaleLink("goChinese", new Locale("zh", "CN"))); + add(new SetLocaleLink("goDanish", new Locale("da", "DK"))); + add(new SetLocaleLink("goKorean", new Locale("ko", "KR"))); + add(new SetLocaleLink("goHungarian", new Locale("hu"))); } private static class SetLocaleLink extends Link { diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java index 13d7010836f..088400c9235 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java @@ -64,12 +64,12 @@ public Home(final PageParameters parameters) // locale add(new SetLocaleLink("goCanadian", Locale.CANADA)); add(new SetLocaleLink("goUS", Locale.US)); - add(new SetLocaleLink("goDutch", Locale.of("nl", "NL"))); - add(new SetLocaleLink("goGerman", Locale.of("de", "DE"))); - add(new SetLocaleLink("goChinese", Locale.of("zh", "CN"))); - add(new SetLocaleLink("goDanish", Locale.of("da", "DK"))); - add(new SetLocaleLink("goKorean", Locale.of("ko", "KR"))); - add(new SetLocaleLink("goHungarian", Locale.of("hu"))); + add(new SetLocaleLink("goDutch", new Locale("nl", "NL"))); + add(new SetLocaleLink("goGerman", new Locale("de", "DE"))); + add(new SetLocaleLink("goChinese", new Locale("zh", "CN"))); + add(new SetLocaleLink("goDanish", new Locale("da", "DK"))); + add(new SetLocaleLink("goKorean", new Locale("ko", "KR"))); + add(new SetLocaleLink("goHungarian", new Locale("hu"))); } private static class SetLocaleLink extends Link { diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java index 040c4da7e90..e16399aadba 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java @@ -37,13 +37,13 @@ static Locale parseLocale(final String localeAsString, final Locale defaultLocal { String lang = localeAsString.substring(0, idxOfUnderbar); String country = localeAsString.substring(idxOfUnderbar + 1); - result = Locale.of(lang, country); + result = new Locale(lang, country); } else { String lang = localeAsString; - result = Locale.of(lang); + result = new Locale(lang); } return result; diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Threads.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Threads.java index 1d1e765551e..7f0ffdc1276 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Threads.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Threads.java @@ -106,7 +106,7 @@ private static void dumpSingleThread(Logger logger, Thread thread, StackTraceEle variables.put("name", thread.getName()); variables.put("isDaemon", thread.isDaemon() ? " daemon" : ""); variables.put("priority", thread.getPriority()); - variables.put("threadIdDec", thread.threadId()); + variables.put("threadIdDec", thread.getId()); variables.put("state", thread.getState()); ThreadDump throwable = new ThreadDump(); diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java index 30446adaf39..59ee9dda870 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java @@ -138,7 +138,7 @@ public static PathLocale getLocaleFromFilename(String path) String basePath = path.substring(0, languagePos) + (min == null ? "" : min) + extension; - Locale locale = Locale.of(language, country != null ? country : "", + Locale locale = new Locale(language, country != null ? country : "", variant != null ? variant : ""); return new PathLocale(basePath, locale); diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java index 01141650f0b..e09c64523e7 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java @@ -50,7 +50,7 @@ final class ConvertersTest { /** Dutch locale for localized testing. */ - private static final Locale DUTCH_LOCALE = Locale.of("nl", "NL"); + private static final Locale DUTCH_LOCALE = new Locale("nl", "NL"); @Test void thousandSeparator() { diff --git a/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java b/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java index f4c42967881..30de8724ce8 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/file/FilesTest.java @@ -20,7 +20,6 @@ import org.junit.jupiter.api.Test; import java.io.IOException; -import java.net.URI; import java.net.URL; import static java.lang.System.currentTimeMillis; @@ -234,7 +233,7 @@ public void removeFolderAsync() throws Exception @Test public void fileWithWhitespace() throws Exception { - URL url = URI.create("file:/file%20with%20whitespace").toURL(); + URL url = new URL("file:/file%20with%20whitespace"); assertEquals(java.io.File.separator + "file with whitespace", Files.getLocalFileFromUrl(url).getPath()); diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java index 0ac25887fef..02601b371f8 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/io/ConnectionsTest.java @@ -18,8 +18,6 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; - -import java.net.URI; import java.net.URL; import java.time.Instant; import org.apache.wicket.util.WicketTestTag; @@ -38,7 +36,7 @@ class ConnectionsTest @Test void getLastModified() throws Exception { - URL url = URI.create("https://wicket.apache.org/learn/books/wia.png").toURL(); + URL url = new URL("https://wicket.apache.org/learn/books/wia.png"); Instant lastModified = Connections.getLastModified(url); assertNotNull(lastModified); assertNotEquals(0L, lastModified.toEpochMilli()); diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/LastModifiedTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/LastModifiedTest.java index 55b5df4a287..2ed37103acf 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/io/LastModifiedTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/io/LastModifiedTest.java @@ -21,7 +21,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.IOException; -import java.net.URI; import java.net.URL; import java.time.Instant; import org.apache.wicket.util.file.Files; @@ -44,7 +43,7 @@ public void getTimestampForMissingFile() throws IOException { File file = new File("/does/not/exists/4iorp4opergere.txt"); assertNull(Files.getLastModified(file)); - assertNull(Connections.getLastModified(URI.create("file:" + file.getAbsolutePath()).toURL())); + assertNull(Connections.getLastModified(new URL("file:" + file.getAbsolutePath()))); } /** @@ -86,7 +85,7 @@ public void getLastModified() throws IOException final Instant expected = Instant.ofEpochMilli(lm); assertEquals(expected, Files.getLastModified(file)); assertEquals(expected, - Connections.getLastModified(URI.create("file:" + file.getAbsolutePath()).toURL())); + Connections.getLastModified(new URL("file:" + file.getAbsolutePath()))); } } finally