Remove the --experimental_java_proto_library_default_has_services command line option and with it, the java_common.experimental_java_proto_library_default_has_services function.

RELNOTES[INC]: The --experimental_java_proto_library_default_has_services command line option and the Starlark symbol java_common.experimental_java_proto_library_default_has_services function are not
available anymore.

PiperOrigin-RevId: 570294003
Change-Id: Ic74408fd98761c6aafa6f9f629b9602fda20c5fe

Author: lberki

src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java

@@ -216,14 +216,6 @@ public final class BuildLanguageOptions extends OptionsBase {
               + " function.")
   public boolean experimentalIsolatedExtensionUsages;
 
-  @Option(
-      name = "experimental_java_proto_library_default_has_services",
-      defaultValue = "true",
-      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-      effectTags = OptionEffectTag.BUILD_FILE_SEMANTICS,
-      help = "The default value of java_proto_library.has_services.")
-  public boolean experimentalJavaProtoLibraryDefaultHasServices;
-
   @Option(
       name = "incompatible_existing_rules_immutable_view",
       defaultValue = "true",
@@ -728,9 +720,6 @@ public StarlarkSemantics toStarlarkSemantics() {
             .setBool(EXPERIMENTAL_ENABLE_SCL_DIALECT, experimentalEnableSclDialect)
             .setBool(ENABLE_BZLMOD, enableBzlmod)
             .setBool(EXPERIMENTAL_ISOLATED_EXTENSION_USAGES, experimentalIsolatedExtensionUsages)
-            .setBool(
-                EXPERIMENTAL_JAVA_PROTO_LIBRARY_DEFAULT_HAS_SERVICES,
-                experimentalJavaProtoLibraryDefaultHasServices)
             .setBool(
                 INCOMPATIBLE_EXISTING_RULES_IMMUTABLE_VIEW, incompatibleExistingRulesImmutableView)
             .setBool(EXPERIMENTAL_ACTION_RESOURCE_SET, experimentalActionResourceSet)
@@ -835,8 +824,6 @@ public StarlarkSemantics toStarlarkSemantics() {
   public static final String ENABLE_BZLMOD = "-enable_bzlmod";
   public static final String EXPERIMENTAL_ISOLATED_EXTENSION_USAGES =
       "-experimental_isolated_extension_usages";
-  public static final String EXPERIMENTAL_JAVA_PROTO_LIBRARY_DEFAULT_HAS_SERVICES =
-      "+experimental_java_proto_library_default_has_services";
   public static final String INCOMPATIBLE_EXISTING_RULES_IMMUTABLE_VIEW =
       "+incompatible_existing_rules_immutable_view";
   public static final String EXPERIMENTAL_GOOGLE_LEGACY_API = "-experimental_google_legacy_api";

src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java

@@ -53,7 +53,6 @@
 import net.starlark.java.eval.Sequence;
 import net.starlark.java.eval.Starlark;
 import net.starlark.java.eval.StarlarkList;
-import net.starlark.java.eval.StarlarkSemantics;
 import net.starlark.java.eval.StarlarkThread;
 import net.starlark.java.eval.StarlarkValue;
 
@@ -310,13 +309,6 @@ public Sequence<Artifact> getBuildInfo(
                 isStampingEnabled, JavaBuildInfoFactory.KEY, ruleContext.getConfiguration()));
   }
 
-  @Override
-  public boolean getExperimentalJavaProtoLibraryDefaultHasServices(
-      StarlarkSemantics starlarkSemantics) throws EvalException {
-    return starlarkSemantics.getBool(
-        BuildLanguageOptions.EXPERIMENTAL_JAVA_PROTO_LIBRARY_DEFAULT_HAS_SERVICES);
-  }
-
   @Override
   public Sequence<String> collectNativeLibsDirs(Depset libraries, StarlarkThread thread)
       throws EvalException, TypeException {

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaCommonApi.java

@@ -35,7 +35,6 @@
 import net.starlark.java.eval.EvalException;
 import net.starlark.java.eval.NoneType;
 import net.starlark.java.eval.Sequence;
-import net.starlark.java.eval.StarlarkSemantics;
 import net.starlark.java.eval.StarlarkThread;
 import net.starlark.java.eval.StarlarkValue;
 
@@ -656,15 +655,6 @@ Sequence<FileT> getBuildInfo(
       StarlarkRuleContextT ruleContext, boolean isStampingEnabled, StarlarkThread thread)
       throws EvalException, InterruptedException;
 
-  @StarlarkMethod(
-      name = "experimental_java_proto_library_default_has_services",
-      documented = false,
-      useStarlarkSemantics = true,
-      structField = true,
-      doc = "Default value of java_proto_library.has_services")
-  boolean getExperimentalJavaProtoLibraryDefaultHasServices(StarlarkSemantics starlarkSemantics)
-      throws EvalException;
-
   @StarlarkMethod(
       name = "collect_native_deps_dirs",
       parameters = {@Param(name = "libraries")},

src/main/starlark/builtins_bzl/common/java/java_common.bzl

@@ -14,6 +14,8 @@
 
 """ Utilities for Java compilation support in Starlark. """
 
+load(":common/java/java_common_internal_for_builtins.bzl", "compile", "run_ijar")
+load(":common/java/java_helper.bzl", "helper")
 load(
     ":common/java/java_info.bzl",
     "JavaInfo",
@@ -23,11 +25,9 @@ load(
     _java_info_merge = "merge",
     _java_info_set_annotation_processing = "set_annotation_processing",
 )
-load(":common/java/message_bundle_info.bzl", "MessageBundleInfo")
-load(":common/java/java_common_internal_for_builtins.bzl", "compile", "run_ijar")
 load(":common/java/java_semantics.bzl", "semantics")
+load(":common/java/message_bundle_info.bzl", "MessageBundleInfo")
 load(":common/paths.bzl", "paths")
-load(":common/java/java_helper.bzl", "helper")
 
 _java_common_internal = _builtins.internal.java_common_internal_do_not_use
 JavaToolchainInfo = _java_common_internal.JavaToolchainInfo
@@ -303,7 +303,6 @@ def _make_java_common():
         "JavaRuntimeInfo": _java_common_internal.JavaRuntimeInfo,
         "BootClassPathInfo": _java_common_internal.BootClassPathInfo,
         "JavaRuntimeClasspathInfo": JavaRuntimeClasspathInfo,
-        "experimental_java_proto_library_default_has_services": _java_common_internal.experimental_java_proto_library_default_has_services,
     }
     if _java_common_internal._google_legacy_api_enabled():
         methods.update(