Move extensions to util package

Bukama · Bukama · commit 372ebfab02c7 · 2025-11-30T19:49:04.000+01:00
diff --git a/documentation/src/test/java/example/DefaultLocaleTimezoneExtensionDemo.java b/documentation/src/test/java/example/DefaultLocaleTimezoneExtensionDemo.java
@@ -18,10 +18,10 @@
 
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.locale.DefaultLocale;
-import org.junit.jupiter.api.locale.LocaleProvider;
-import org.junit.jupiter.api.timezone.DefaultTimeZone;
-import org.junit.jupiter.api.timezone.TimeZoneProvider;
+import org.junit.jupiter.api.util.DefaultLocale;
+import org.junit.jupiter.api.util.DefaultTimeZone;
+import org.junit.jupiter.api.util.LocaleProvider;
+import org.junit.jupiter.api.util.TimeZoneProvider;
 
 public class DefaultLocaleTimezoneExtensionDemo {
 
diff --git a/junit-jupiter-api/src/main/java/module-info.java b/junit-jupiter-api/src/main/java/module-info.java
@@ -29,10 +29,9 @@
 	exports org.junit.jupiter.api.extension.support;
 	exports org.junit.jupiter.api.function;
 	exports org.junit.jupiter.api.io;
-	exports org.junit.jupiter.api.locale;
 	exports org.junit.jupiter.api.parallel;
 	exports org.junit.jupiter.api.timeout to org.junit.jupiter.engine;
-	exports org.junit.jupiter.api.timezone;
+	exports org.junit.jupiter.api.util;
 
 	opens org.junit.jupiter.api.condition to org.junit.platform.commons;
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/locale/package-info.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/locale/package-info.java
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/timezone/package-info.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/timezone/package-info.java
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/DefaultLocale.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/DefaultLocale.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.locale;
+package org.junit.jupiter.api.util;
 
 import static org.apiguardian.api.API.Status.STABLE;
 
@@ -20,7 +20,6 @@
 
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.timezone.DefaultTimeZone;
 
 /**
  * {@code @DefaultLocale} is a JUnit Jupiter extension to change the value
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/DefaultLocaleExtension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/DefaultLocaleExtension.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.locale;
+package org.junit.jupiter.api.util;
 
 import static org.apiguardian.api.API.Status.STABLE;
 
@@ -22,7 +22,7 @@
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
-import org.junit.jupiter.api.locale.LocaleProvider.NullLocaleProvider;
+import org.junit.jupiter.api.util.LocaleProvider.NullLocaleProvider;
 import org.junit.platform.commons.support.AnnotationSupport;
 import org.junit.platform.commons.support.ReflectionSupport;
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/DefaultTimeZone.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/DefaultTimeZone.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.timezone;
+package org.junit.jupiter.api.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -18,7 +18,6 @@
 
 import org.apiguardian.api.API;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.locale.DefaultLocale;
 
 /**
  * {@code @DefaultTimeZone} is a JUnit Jupiter extension to change the value
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/DefaultTimeZoneExtension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/DefaultTimeZoneExtension.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.timezone;
+package org.junit.jupiter.api.util;
 
 import static org.apiguardian.api.API.Status.STABLE;
 
@@ -22,7 +22,7 @@
 import org.junit.jupiter.api.extension.ExtensionConfigurationException;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
-import org.junit.jupiter.api.timezone.TimeZoneProvider.NullTimeZoneProvider;
+import org.junit.jupiter.api.util.TimeZoneProvider.NullTimeZoneProvider;
 import org.junit.platform.commons.support.AnnotationSupport;
 import org.junit.platform.commons.support.ReflectionSupport;
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/JupiterLocaleUtils.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/JupiterLocaleUtils.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.locale;
+package org.junit.jupiter.api.util;
 
 import java.util.Locale;
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/LocaleProvider.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/LocaleProvider.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.locale;
+package org.junit.jupiter.api.util;
 
 import java.util.Locale;
 import java.util.function.Supplier;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/ReadsDefaultLocale.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/ReadsDefaultLocale.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.locale;
+package org.junit.jupiter.api.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/ReadsDefaultTimeZone.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/ReadsDefaultTimeZone.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.timezone;
+package org.junit.jupiter.api.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/TimeZoneProvider.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/TimeZoneProvider.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.timezone;
+package org.junit.jupiter.api.util;
 
 import java.util.TimeZone;
 import java.util.function.Supplier;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/WritesDefaultLocale.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/WritesDefaultLocale.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.locale;
+package org.junit.jupiter.api.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/WritesDefaultTimeZone.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/WritesDefaultTimeZone.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.timezone;
+package org.junit.jupiter.api.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/package-info.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * This package contains all files of the DefaultLocaleExtension and DefaultTimeZoneExtension.
+ */
+
+@NullMarked
+package org.junit.jupiter.api.util;
+
+import org.jspecify.annotations.NullMarked;
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/util/DefaultLocaleTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/util/DefaultLocaleTests.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.locale;
+package org.junit.jupiter.api.util;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.testkit.JUnitJupiterTestKit.executeTestClass;
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/util/DefaultTimeZoneTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/util/DefaultTimeZoneTests.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.timezone;
+package org.junit.jupiter.api.util;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.testkit.JUnitJupiterTestKit.executeTestClass;
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-jupiter-api.expected.txt
@@ -5,9 +5,8 @@ exports org.junit.jupiter.api.extension
 exports org.junit.jupiter.api.extension.support
 exports org.junit.jupiter.api.function
 exports org.junit.jupiter.api.io
-exports org.junit.jupiter.api.locale
 exports org.junit.jupiter.api.parallel
-exports org.junit.jupiter.api.timezone
+exports org.junit.jupiter.api.util
 requires java.base mandated
 requires kotlin.stdlib static
 requires org.apiguardian.api static transitive
