From 252f02f522dd5f709e3f2ba1bf3b2be825bd0f71 Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Fri, 22 Mar 2024 16:12:40 +0100 Subject: [PATCH] Mark parsers internal --- .../org/junit/platform/engine/discovery/ClassSelector.java | 2 ++ .../platform/engine/discovery/ClasspathResourceSelector.java | 2 ++ .../junit/platform/engine/discovery/ClasspathRootSelector.java | 2 ++ .../org/junit/platform/engine/discovery/DirectorySelector.java | 3 +++ .../java/org/junit/platform/engine/discovery/FileSelector.java | 2 ++ .../org/junit/platform/engine/discovery/IterationSelector.java | 2 ++ .../org/junit/platform/engine/discovery/MethodSelector.java | 2 ++ .../org/junit/platform/engine/discovery/ModuleSelector.java | 2 ++ .../junit/platform/engine/discovery/NestedClassSelector.java | 2 ++ .../junit/platform/engine/discovery/NestedMethodSelector.java | 2 ++ .../org/junit/platform/engine/discovery/PackageSelector.java | 2 ++ .../org/junit/platform/engine/discovery/UniqueIdSelector.java | 2 ++ .../java/org/junit/platform/engine/discovery/UriSelector.java | 2 ++ 13 files changed, 27 insertions(+) diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java index a653bb5a87da..eb293afc2239 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClassSelector.java @@ -11,6 +11,7 @@ package org.junit.platform.engine.discovery; import static org.apiguardian.api.API.Status.EXPERIMENTAL; +import static org.apiguardian.api.API.Status.INTERNAL; import static org.apiguardian.api.API.Status.STABLE; import java.util.Objects; @@ -140,6 +141,7 @@ public Optional toIdentifier() { return Optional.of(DiscoverySelectorIdentifier.create(IdentifierParser.PREFIX, this.className)); } + @API(status = INTERNAL, since = "1.11") public static class IdentifierParser implements DiscoverySelectorIdentifierParser { private static final String PREFIX = "class"; diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java index 61a9df4d4d1a..129dccba5ea7 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java @@ -10,6 +10,7 @@ package org.junit.platform.engine.discovery; +import static org.apiguardian.api.API.Status.INTERNAL; import static org.apiguardian.api.API.Status.STABLE; import java.util.Objects; @@ -114,6 +115,7 @@ public Optional toIdentifier() { } } + @API(status = INTERNAL, since = "1.11") public static class IdentifierParser implements DiscoverySelectorIdentifierParser { private static final String PREFIX = "resource"; diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java index 24fb7e1e92ea..c2466e8f3dbf 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathRootSelector.java @@ -11,6 +11,7 @@ package org.junit.platform.engine.discovery; import static java.util.Collections.singleton; +import static org.apiguardian.api.API.Status.INTERNAL; import static org.apiguardian.api.API.Status.STABLE; import static org.junit.platform.commons.util.CollectionUtils.getFirstElement; @@ -94,6 +95,7 @@ public Optional toIdentifier() { return Optional.of(DiscoverySelectorIdentifier.create(IdentifierParser.PREFIX, this.classpathRoot.toString())); } + @API(status = INTERNAL, since = "1.11") public static class IdentifierParser implements DiscoverySelectorIdentifierParser { private static final String PREFIX = "classpath-root"; diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java index 467d997ec5c0..2b7229e8c7d3 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DirectorySelector.java @@ -10,6 +10,7 @@ package org.junit.platform.engine.discovery; +import static org.apiguardian.api.API.Status.INTERNAL; import static org.apiguardian.api.API.Status.STABLE; import java.io.File; @@ -113,6 +114,8 @@ public String toString() { public Optional toIdentifier() { return Optional.of(DiscoverySelectorIdentifier.create(IdentifierParser.PREFIX, this.path)); } + + @API(status = INTERNAL, since = "1.11") public static class IdentifierParser implements DiscoverySelectorIdentifierParser { private static final String PREFIX = "directory"; diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java index 74ae6b6f7b98..e09a67e31cbd 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/FileSelector.java @@ -10,6 +10,7 @@ package org.junit.platform.engine.discovery; +import static org.apiguardian.api.API.Status.INTERNAL; import static org.apiguardian.api.API.Status.STABLE; import java.io.File; @@ -130,6 +131,7 @@ public Optional toIdentifier() { } } + @API(status = INTERNAL, since = "1.11") public static class IdentifierParser implements DiscoverySelectorIdentifierParser { private static final String PREFIX = "file"; diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java index b7428c62d8d9..35313a098fe0 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/IterationSelector.java @@ -14,6 +14,7 @@ import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toCollection; import static org.apiguardian.api.API.Status.EXPERIMENTAL; +import static org.apiguardian.api.API.Status.INTERNAL; import java.util.Arrays; import java.util.Collections; @@ -109,6 +110,7 @@ public Optional toIdentifier() { ); } + @API(status = INTERNAL, since = "1.11") public static class IdentifierParser implements DiscoverySelectorIdentifierParser { public static final String PREFIX = "iteration"; diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java index 83f87173b67c..505fc233fcf8 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/MethodSelector.java @@ -12,6 +12,7 @@ import static org.apiguardian.api.API.Status.DEPRECATED; import static org.apiguardian.api.API.Status.EXPERIMENTAL; +import static org.apiguardian.api.API.Status.INTERNAL; import static org.apiguardian.api.API.Status.STABLE; import java.lang.reflect.Method; @@ -317,6 +318,7 @@ public Optional toIdentifier() { return Optional.of(DiscoverySelectorIdentifier.create(IdentifierParser.PREFIX, fullyQualifiedMethodName)); } + @API(status = INTERNAL, since = "1.11") public static class IdentifierParser implements DiscoverySelectorIdentifierParser { private static final String PREFIX = "method"; diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java index 78454e87976b..158136260ddb 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ModuleSelector.java @@ -10,6 +10,7 @@ package org.junit.platform.engine.discovery; +import static org.apiguardian.api.API.Status.INTERNAL; import static org.apiguardian.api.API.Status.STABLE; import java.util.Objects; @@ -80,6 +81,7 @@ public Optional toIdentifier() { return Optional.of(DiscoverySelectorIdentifier.create(IdentifierParser.PREFIX, this.moduleName)); } + @API(status = INTERNAL, since = "1.11") public static class IdentifierParser implements DiscoverySelectorIdentifierParser { private static final String PREFIX = "module"; diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java index 978255339b4b..54bd82d7b24a 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedClassSelector.java @@ -13,6 +13,7 @@ import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; import static org.apiguardian.api.API.Status.EXPERIMENTAL; +import static org.apiguardian.api.API.Status.INTERNAL; import static org.apiguardian.api.API.Status.STABLE; import static org.junit.platform.commons.util.CollectionUtils.toUnmodifiableList; @@ -156,6 +157,7 @@ public Optional toIdentifier() { return Optional.of(DiscoverySelectorIdentifier.create(IdentifierParser.PREFIX, allClassNames)); } + @API(status = INTERNAL, since = "1.11") public static class IdentifierParser implements DiscoverySelectorIdentifierParser { static final String PREFIX = "nested-class"; diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java index 585389298db6..5213d4ed1632 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/NestedMethodSelector.java @@ -12,6 +12,7 @@ import static org.apiguardian.api.API.Status.DEPRECATED; import static org.apiguardian.api.API.Status.EXPERIMENTAL; +import static org.apiguardian.api.API.Status.INTERNAL; import static org.apiguardian.api.API.Status.STABLE; import java.lang.reflect.Method; @@ -253,6 +254,7 @@ public Optional toIdentifier() { }); } + @API(status = INTERNAL, since = "1.11") public static class IdentifierParser implements DiscoverySelectorIdentifierParser { private static final String PREFIX = "nested-method"; diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java index aedbeaa04f37..39c653d162b5 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/PackageSelector.java @@ -10,6 +10,7 @@ package org.junit.platform.engine.discovery; +import static org.apiguardian.api.API.Status.INTERNAL; import static org.apiguardian.api.API.Status.STABLE; import java.util.Objects; @@ -80,6 +81,7 @@ public Optional toIdentifier() { return Optional.of(DiscoverySelectorIdentifier.create(IdentifierParser.PREFIX, this.packageName)); } + @API(status = INTERNAL, since = "1.11") public static class IdentifierParser implements DiscoverySelectorIdentifierParser { private static final String PREFIX = "package"; diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java index 4ed62afbdcb4..71085181e13f 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UniqueIdSelector.java @@ -10,6 +10,7 @@ package org.junit.platform.engine.discovery; +import static org.apiguardian.api.API.Status.INTERNAL; import static org.apiguardian.api.API.Status.STABLE; import java.util.Objects; @@ -81,6 +82,7 @@ public Optional toIdentifier() { return Optional.of(DiscoverySelectorIdentifier.create(IdentifierParser.PREFIX, this.uniqueId.toString())); } + @API(status = INTERNAL, since = "1.11") public static class IdentifierParser implements DiscoverySelectorIdentifierParser { private static final String PREFIX = "uid"; diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java index b0c126aa229c..084efbcd4a69 100644 --- a/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java +++ b/junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/UriSelector.java @@ -10,6 +10,7 @@ package org.junit.platform.engine.discovery; +import static org.apiguardian.api.API.Status.INTERNAL; import static org.apiguardian.api.API.Status.STABLE; import java.net.URI; @@ -84,6 +85,7 @@ public Optional toIdentifier() { return Optional.of(DiscoverySelectorIdentifier.create(IdentifierParser.PREFIX, this.uri.toString())); } + @API(status = INTERNAL, since = "1.11") public static class IdentifierParser implements DiscoverySelectorIdentifierParser { private static final String PREFIX = "uri";