move classes to own package to break circular dependency of API to TimeoutUtils

Bukama · Bukama · commit cada4ef81936 · 2025-11-20T21:20:45.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.util.DefaultLocale;
-import org.junit.jupiter.api.util.DefaultTimeZone;
-import org.junit.jupiter.api.util.LocaleProvider;
-import org.junit.jupiter.api.util.TimeZoneProvider;
+import org.junit.jupiter.api.util.defaults.DefaultLocale;
+import org.junit.jupiter.api.util.defaults.DefaultTimeZone;
+import org.junit.jupiter.api.util.defaults.LocaleProvider;
+import org.junit.jupiter.api.util.defaults.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
@@ -30,7 +30,9 @@
 	exports org.junit.jupiter.api.function;
 	exports org.junit.jupiter.api.io;
 	exports org.junit.jupiter.api.parallel;
+	exports org.junit.jupiter.api.util.defaults to org.junit.platform.commons;
 	exports org.junit.jupiter.api.util to org.junit.jupiter.engine;
 
 	opens org.junit.jupiter.api.condition to org.junit.platform.commons;
+	opens org.junit.jupiter.api.util.defaults to org.junit.platform.commons;
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/DefaultLocale.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/DefaultLocale.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.util;
+package org.junit.jupiter.api.util.defaults;
 
 import static org.apiguardian.api.API.Status.STABLE;
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/DefaultLocaleExtension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/DefaultLocaleExtension.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.util;
+package org.junit.jupiter.api.util.defaults;
 
 import java.util.Locale;
 import java.util.Optional;
@@ -19,7 +19,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.util.LocaleProvider.NullLocaleProvider;
+import org.junit.jupiter.api.util.defaults.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/defaults/DefaultTimeZone.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/DefaultTimeZone.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.util;
+package org.junit.jupiter.api.util.defaults;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/DefaultTimeZoneExtension.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/DefaultTimeZoneExtension.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.util;
+package org.junit.jupiter.api.util.defaults;
 
 import java.util.Optional;
 import java.util.TimeZone;
@@ -19,7 +19,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.util.TimeZoneProvider.NullTimeZoneProvider;
+import org.junit.jupiter.api.util.defaults.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/defaults/JupiterLocaleUtils.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/JupiterLocaleUtils.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.util;
+package org.junit.jupiter.api.util.defaults;
 
 import java.util.Locale;
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/LocaleProvider.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/LocaleProvider.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.util;
+package org.junit.jupiter.api.util.defaults;
 
 import java.util.Locale;
 import java.util.function.Supplier;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/ReadsDefaultLocale.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/ReadsDefaultLocale.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.util;
+package org.junit.jupiter.api.util.defaults;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/ReadsDefaultTimeZone.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/ReadsDefaultTimeZone.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.util;
+package org.junit.jupiter.api.util.defaults;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/TimeZoneProvider.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/TimeZoneProvider.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.util;
+package org.junit.jupiter.api.util.defaults;
 
 import java.util.TimeZone;
 import java.util.function.Supplier;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/WritesDefaultLocale.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/WritesDefaultLocale.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.util;
+package org.junit.jupiter.api.util.defaults;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/WritesDefaultTimeZone.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/WritesDefaultTimeZone.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.util;
+package org.junit.jupiter.api.util.defaults;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/package-info.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/util/defaults/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * Those extensions are not internal stuff.
+ */
+
+@NullMarked
+package org.junit.jupiter.api.util.defaults;
+
+import org.jspecify.annotations.NullMarked;
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/util/defaults/DefaultLocaleTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/util/defaults/DefaultLocaleTests.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.util;
+package org.junit.jupiter.api.util.defaults;
 
 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/defaults/DefaultTimeZoneTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/util/defaults/DefaultTimeZoneTests.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api.util;
+package org.junit.jupiter.api.util.defaults;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.testkit.JUnitJupiterTestKit.executeTestClass;

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@`
`30`	`30`	`exports org.junit.jupiter.api.function;`
`31`	`31`	`exports org.junit.jupiter.api.io;`
`32`	`32`	`exports org.junit.jupiter.api.parallel;`
	`33`	`+ exports org.junit.jupiter.api.util.defaults to org.junit.platform.commons;`
`33`	`34`	`exports org.junit.jupiter.api.util to org.junit.jupiter.engine;`
`34`	`35`
`35`	`36`	`opens org.junit.jupiter.api.condition to org.junit.platform.commons;`
	`37`	`+ opens org.junit.jupiter.api.util.defaults to org.junit.platform.commons;`
`36`	`38`	`}`