diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java
index 2fa0b75e2f93a4..d95e59491afed2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java
@@ -271,24 +271,6 @@ public StarlarkValue getDefaultJavacOpts(Info javaToolchainUnchecked, boolean as
     }
   }
 
-  @Override
-  public ProviderApi getJavaToolchainProvider() {
-    // method exists solely for documentation
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Provider getJavaRuntimeProvider() {
-    // method exists purely for documentation
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ProviderApi getBootClassPathInfo() {
-    // method exists solely for documentation
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public String getTargetKind(Object target, StarlarkThread thread) throws EvalException {
     checkPrivateAccess(thread);
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaCommonApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaCommonApi.java
index d31c2ed5b1d65b..69e6504a367045 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaCommonApi.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaCommonApi.java
@@ -617,7 +617,10 @@ StarlarkValue getDefaultJavacOpts(Info javaToolchain, boolean asDepset)
           "The key used to retrieve the provider that contains information about the Java "
               + "toolchain being used.",
       structField = true)
-  ProviderApi getJavaToolchainProvider();
+  default ProviderApi getJavaToolchainProvider() {
+    // method exists purely for documentation
+    throw new UnsupportedOperationException();
+  }
 
   @StarlarkMethod(
       name = "JavaRuntimeInfo",
@@ -625,13 +628,19 @@ StarlarkValue getDefaultJavacOpts(Info javaToolchain, boolean asDepset)
           "The key used to retrieve the provider that contains information about the Java "
               + "runtime being used.",
       structField = true)
-  ProviderApi getJavaRuntimeProvider();
+  default ProviderApi getJavaRuntimeProvider() {
+    // method exists purely for documentation
+    throw new UnsupportedOperationException();
+  }
 
   @StarlarkMethod(
       name = "BootClassPathInfo",
       doc = "The provider used to supply bootclasspath information",
       structField = true)
-  ProviderApi getBootClassPathInfo();
+  default ProviderApi getBootClassPathInfo() {
+    // method exists solely for documentation
+    throw new UnsupportedOperationException();
+  }
 
   /** Returns target kind. */
   @StarlarkMethod(