Remove platform classpath features deprecated in GH-396.

Author: ascopes

java-compiler-testing/src/main/java/io/github/ascopes/jct/compilers/AbstractJctCompiler.java

@@ -77,11 +77,6 @@ public abstract class AbstractJctCompiler<A extends AbstractJctCompiler<A>>
   private boolean fixJvmModulePathMismatch;
   private boolean inheritClassPath;
   private boolean inheritModulePath;
-
-  @Deprecated(forRemoval = true, since = "0.6.0")
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  private boolean inheritPlatformClassPath;
-
   private boolean inheritSystemModulePath;
   private LoggingMode fileManagerLoggingMode;
   private AnnotationProcessorDiscovery annotationProcessorDiscovery;
@@ -91,7 +86,6 @@ public abstract class AbstractJctCompiler<A extends AbstractJctCompiler<A>>
    *
    * @param defaultName the printable default name to use for the compiler.
    */
-  @SuppressWarnings("removal")
   protected AbstractJctCompiler(String defaultName) {
     name = requireNonNull(defaultName, "name");
     annotationProcessors = new ArrayList<>();
@@ -112,7 +106,6 @@ protected AbstractJctCompiler(String defaultName) {
     fixJvmModulePathMismatch = JctCompiler.DEFAULT_FIX_JVM_MODULE_PATH_MISMATCH;
     inheritClassPath = JctCompiler.DEFAULT_INHERIT_CLASS_PATH;
     inheritModulePath = JctCompiler.DEFAULT_INHERIT_MODULE_PATH;
-    inheritPlatformClassPath = JctCompiler.DEFAULT_INHERIT_PLATFORM_CLASS_PATH;
     inheritSystemModulePath = JctCompiler.DEFAULT_INHERIT_SYSTEM_MODULE_PATH;
     fileManagerLoggingMode = JctCompiler.DEFAULT_FILE_MANAGER_LOGGING_MODE;
     annotationProcessorDiscovery = JctCompiler.DEFAULT_ANNOTATION_PROCESSOR_DISCOVERY;
@@ -340,21 +333,6 @@ public A inheritModulePath(boolean inheritModulePath) {
     return myself();
   }
 
-  @Deprecated(forRemoval = true, since = "0.6.0")
-  @Override
-  @SuppressWarnings({"removal", "DeprecatedIsStillUsed"})
-  public boolean isInheritPlatformClassPath() {
-    return inheritPlatformClassPath;
-  }
-
-  @Deprecated(forRemoval = true, since = "0.6.0")
-  @Override
-  @SuppressWarnings({"removal", "DeprecatedIsStillUsed"})
-  public A inheritPlatformClassPath(boolean inheritPlatformClassPath) {
-    this.inheritPlatformClassPath = inheritPlatformClassPath;
-    return myself();
-  }
-
   @Override
   public boolean isInheritSystemModulePath() {
     return inheritSystemModulePath;

java-compiler-testing/src/main/java/io/github/ascopes/jct/compilers/JctCompiler.java

@@ -89,17 +89,6 @@ public interface JctCompiler<C extends JctCompiler<C, R>, R extends JctCompilati
    */
   boolean DEFAULT_INHERIT_MODULE_PATH = true;
 
-  /**
-   * Default setting for inclusion of the current platform class path ({@code false}).
-   *
-   * @deprecated The platform class path has been mostly replaced by the use of system modules, so
-   *    should not be used. This will be removed in v1.0.0, and has been changed to default to
-   *    {@code false} as of v0.6.0
-   */
-  @Deprecated(forRemoval = true, since = "0.6.0")
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  boolean DEFAULT_INHERIT_PLATFORM_CLASS_PATH = false;
-
   /**
    * Default setting for inclusion of the system module path ({@code true}).
    */
@@ -721,41 +710,6 @@ default C target(SourceVersion target) {
    */
   C inheritModulePath(boolean inheritModulePath);
 
-  /**
-   * Get whether the current platform class path is being inherited from the caller JVM or not.
-   *
-   * <p>This may also be known as the "bootstrap class path".
-   *
-   * <p>Default environments probably will not provide this functionality, in which case it will be
-   * ignored.
-   *
-   * <p>Unless otherwise changed or specified, implementations should default to
-   * {@link #DEFAULT_INHERIT_PLATFORM_CLASS_PATH}.
-   *
-   * @return whether the platform class path is being inherited or not.
-   * @deprecated The platform class path has been mostly replaced by the use of system modules, so
-   * should not be used. This will be removed in v1.0.0.
-   */
-  @Deprecated(forRemoval = true, since = "0.6.0")
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  boolean isInheritPlatformClassPath();
-
-  /**
-   * Set whether the current platform class path is being inherited from the caller JVM or not.
-   *
-   * <p>This may also be known as the "bootstrap class path".
-   *
-   * <p>Default environments probably will not provide this functionality, in which case it will be
-   * ignored.
-   *
-   * @param inheritPlatformClassPath {@code true} to include it, or {@code false} to exclude it.
-   * @return this compiler object for further call chaining.
-   * @deprecated The platform class path has been mostly replaced by the use of system modules, so
-   * should not be used. This will be removed in v1.0.0.
-   */
-  @Deprecated(forRemoval = true, since = "0.6.0")
-  C inheritPlatformClassPath(boolean inheritPlatformClassPath);
-
   /**
    * Get whether the system module path is inherited from the caller JVM or not.
    *

java-compiler-testing/src/main/java/io/github/ascopes/jct/filemanagers/JctFileManager.java

@@ -245,22 +245,6 @@ default ModuleContainerGroup getAnnotationProcessorModulePathGroup() {
     return getModuleContainerGroup(StandardLocation.ANNOTATION_PROCESSOR_MODULE_PATH);
   }
 
-  /**
-   * Get the location holding the {@link StandardLocation#PLATFORM_CLASS_PATH platform class path}
-   * (also known as the boot class path).
-   *
-   * @return the location, or {@code null} if the location is not present in the file manager.
-   * @since 0.1.0
-   * @deprecated The platform class path has been mostly replaced by the use of system modules, so
-   *    should not be used. This will be removed in v1.0.0.
-   */
-  @Deprecated(forRemoval = true, since = "0.6.0")
-  @Nullable
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  default PackageContainerGroup getPlatformClassPathGroup() {
-    return getPackageContainerGroup(StandardLocation.PLATFORM_CLASS_PATH);
-  }
-
   /**
    * Get the location holding the
    * {@link StandardLocation#NATIVE_HEADER_OUTPUT native header outputs}.

java-compiler-testing/src/main/java/io/github/ascopes/jct/filemanagers/config/JctFileManagerJvmPlatformClassPathConfigurer.java

@@ -23,7 +23,6 @@
 import io.github.ascopes.jct.filemanagers.config.JctFileManagerJvmClassPathConfigurer;
 import io.github.ascopes.jct.filemanagers.config.JctFileManagerJvmClassPathModuleConfigurer;
 import io.github.ascopes.jct.filemanagers.config.JctFileManagerJvmModulePathConfigurer;
-import io.github.ascopes.jct.filemanagers.config.JctFileManagerJvmPlatformClassPathConfigurer;
 import io.github.ascopes.jct.filemanagers.config.JctFileManagerJvmSystemModulesConfigurer;
 import io.github.ascopes.jct.filemanagers.config.JctFileManagerLoggingProxyConfigurer;
 import io.github.ascopes.jct.filemanagers.config.JctFileManagerRequiredLocationsConfigurer;
@@ -74,15 +73,13 @@ public JctFileManager createFileManager(Workspace workspace) {
    * @return the chain to use.
    */
   @VisibleForTestingOnly
-  @SuppressWarnings("removal")
   public JctFileManagerConfigurerChain createConfigurerChain(Workspace workspace) {
     // The order here is important. Do not adjust it without testing extensively first!
     return new JctFileManagerConfigurerChain()
         .addLast(new JctFileManagerWorkspaceConfigurer(workspace))
         .addLast(new JctFileManagerJvmClassPathConfigurer(compiler))
         .addLast(new JctFileManagerJvmClassPathModuleConfigurer(compiler))
         .addLast(new JctFileManagerJvmModulePathConfigurer(compiler))
-        .addLast(new JctFileManagerJvmPlatformClassPathConfigurer(compiler))
         .addLast(new JctFileManagerJvmSystemModulesConfigurer(compiler))
         .addLast(new JctFileManagerAnnotationProcessorClassPathConfigurer(compiler))
         .addLast(new JctFileManagerRequiredLocationsConfigurer(workspace))

java-compiler-testing/src/main/java/io/github/ascopes/jct/filemanagers/impl/JctFileManagerFactoryImpl.java

@@ -109,37 +109,6 @@ public static List<Path> currentModulePathLocations() {
     return createPaths(System.getProperty(JDK_MODULE_PROPERTY, NO_PATH));
   }
 
-  /**
-   * Get the boot classpath of the current JVM. This will usually include any dependencies you may
-   * have loaded into memory, and may refer to directories of {@code *.class} files, {@code *.war}
-   * files, or {@code *.jar} files.
-   *
-   * <p>This corresponds to the {@link javax.tools.StandardLocation#PLATFORM_CLASS_PATH} location.
-   *
-   * <p>Most OpenJDK implementations do not appear to support this. In this case, an empty list
-   * will be returned here.
-   *
-   * @return a list across the paths.
-   */
-  @Deprecated(forRemoval = true, since = "0.6.0")
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  public static List<Path> currentPlatformClassPathLocations() {
-    var mxBean = ManagementFactory.getRuntimeMXBean();
-
-    if (mxBean.isBootClassPathSupported()) {
-      LOGGER.warn(
-          "Warning: platform (boot) class path locations were found on this JVM, but this "
-              + "feature is deprecated for removal in v1.0.0 of the java-compiler-testing API. "
-              + "Consider disabling platform classpath discovery explicitly to prevent tests "
-              + "having differing behaviour for v1.0.0."
-      );
-      return createPaths(mxBean.getBootClassPath());
-    }
-
-    LOGGER.trace("Platform (boot) classpath is not supported on this JVM, so will be ignored");
-    return List.of();
-  }
-
   private static List<Path> createPaths(String raw) {
     return SEPARATOR
         .splitToStream(raw)

java-compiler-testing/src/main/java/io/github/ascopes/jct/utils/SpecialLocationUtils.java

@@ -505,23 +505,6 @@ default void addAnnotationProcessorPathModule(String moduleName, Path path) {
     addModule(StandardLocation.ANNOTATION_PROCESSOR_MODULE_PATH, moduleName, path);
   }
 
-  /**
-   * Add a package to the {@link StandardLocation#PLATFORM_CLASS_PATH platform class path} (also
-   * known as the boot class path).
-   *
-   * @param path the path to add.
-   * @throws IllegalArgumentException if the path does not exist.
-   * @see #addPackage(Location, Path)
-   * @see #createPlatformClassPathPackage()
-   * @deprecated The platform class path has been mostly replaced by the use of system modules, so
-   * should not be used. This will be removed in v1.0.0.
-   */
-  @Deprecated(forRemoval = true, since = "0.6.0")
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  default void addPlatformClassPathPackage(Path path) {
-    addPackage(StandardLocation.PLATFORM_CLASS_PATH, path);
-  }
-
   /**
    * Add a package to the {@link StandardLocation#NATIVE_HEADER_OUTPUT native header outputs}.
    *
@@ -777,22 +760,6 @@ default ManagedDirectory createAnnotationProcessorPathModule(String moduleName)
     return createModule(StandardLocation.ANNOTATION_PROCESSOR_MODULE_PATH, moduleName);
   }
 
-  /**
-   * Create a package in the {@link StandardLocation#PLATFORM_CLASS_PATH platform class path} (also
-   * known as the boot class path).
-   *
-   * @return the created test directory.
-   * @see #createPackage(Location)
-   * @see #addPlatformClassPathPackage(Path)
-   * @deprecated The platform class path has been mostly replaced by the use of system modules, so
-   * should not be used. This will be removed in v1.0.0.
-   */
-  @Deprecated(forRemoval = true, since = "0.6.0")
-  @SuppressWarnings("DeprecatedIsStillUsed")
-  default ManagedDirectory createPlatformClassPathPackage() {
-    return createPackage(StandardLocation.PLATFORM_CLASS_PATH);
-  }
-
   /**
    * Create a package in the {@link StandardLocation#NATIVE_HEADER_OUTPUT native header outputs}.
    *

java-compiler-testing/src/main/java/io/github/ascopes/jct/workspaces/Workspace.java

@@ -283,15 +283,6 @@ void constructorInitialisesInheritModulePathToDefaultValue() {
           .isEqualTo(JctCompiler.DEFAULT_INHERIT_MODULE_PATH);
     }
 
-    @DisplayName("constructor initialises inheritPlatformClassPath to default value")
-    @Test
-    @SuppressWarnings("removal")
-    void constructorInitialisesInheritPlatformClassPathToDefaultValue() {
-      // Then
-      assertThatCompilerField("inheritPlatformClassPath")
-          .isEqualTo(JctCompiler.DEFAULT_INHERIT_PLATFORM_CLASS_PATH);
-    }
-
     @DisplayName("constructor initialises inheritSystemModulePath to default value")
     @Test
     void constructorInitialisesInheritSystemModulePathToDefaultValue() {
@@ -1290,46 +1281,6 @@ void inheritModulePathReturnsTheCompiler() {
     }
   }
 
-  @DisplayName(".isInheritPlatformClassPath() returns the expected values")
-  @ValueSource(booleans = {true, false})
-  @ParameterizedTest(name = "for inheritPlatformClassPath = {0}")
-  @SuppressWarnings("removal")
-  void isInheritPlatformClassPathReturnsExpectedValue(boolean expected) {
-    // Given
-    setFieldOnCompiler("inheritPlatformClassPath", expected);
-
-    // Then
-    assertThat(compiler.isInheritPlatformClassPath()).isEqualTo(expected);
-  }
-
-  @DisplayName("AbstractJctCompiler#inheritPlatformClassPath tests")
-  @Nested
-  class InheritPlatformClassPathTests {
-
-    @DisplayName(".inheritPlatformClassPath(...) sets the expected values")
-    @ValueSource(booleans = {true, false})
-    @ParameterizedTest(name = "for inheritPlatformClassPath = {0}")
-    @SuppressWarnings("removal")
-    void inheritPlatformClassPathSetsExpectedValue(boolean expected) {
-      // When
-      compiler.inheritPlatformClassPath(expected);
-
-      // Then
-      assertThatCompilerField("inheritPlatformClassPath").isEqualTo(expected);
-    }
-
-    @DisplayName(".inheritPlatformClassPath(...) returns the compiler")
-    @Test
-    @SuppressWarnings("removal")
-    void inheritPlatformClassPathReturnsTheCompiler() {
-      // When
-      var result = compiler.inheritPlatformClassPath(true);
-
-      // Then
-      assertThat(result).isSameAs(compiler);
-    }
-  }
-
   @DisplayName(".isInheritSystemModulePath() returns the expected values")
   @ValueSource(booleans = {true, false})
   @ParameterizedTest(name = "for inheritSystemModulePath = {0}")