diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java index 06c05ac8b6a9dd..50d67089faa67a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java @@ -591,7 +591,7 @@ public Builder setJavaConstraints(ImmutableList javaConstraints) { return this; } - // TODO(b/111090089): delete once java_common.compile(disable_annotation_processing) is + // TODO(b/111090089): delete once java_common.compile(enable_annotation_processing) is // available public Builder experimentalDisableAnnotationProcessing() { JavaPluginInfo provider = diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java index 72b43651d45c77..f968c5b2ae15c6 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java @@ -264,7 +264,7 @@ public JavaInfo createJavaCompileAction( ImmutableList sourcepathEntries, List resources, Boolean neverlink, - Boolean disableAnnotationProcessing, + Boolean enableAnnotationProcessing, JavaSemantics javaSemantics, StarlarkThread thread) throws EvalException, InterruptedException { @@ -296,7 +296,7 @@ public JavaInfo createJavaCompileAction( streamProviders(exports, JavaCompilationArgsProvider.class).forEach(helper::addExport); helper.setCompilationStrictDepsMode(getStrictDepsMode(Ascii.toUpperCase(strictDepsMode))); JavaPluginInfo pluginInfo = mergeExportedJavaPluginInfo(plugins, deps); - if (disableAnnotationProcessing) { + if (!enableAnnotationProcessing) { pluginInfo = pluginInfo.disableAnnotationProcessing(); } helper.setPlugins(pluginInfo); 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 80872065a2f6f9..547a8e25f128e7 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 @@ -78,7 +78,7 @@ public JavaInfo createJavaCompileAction( Sequence sourcepathEntries, // expected Sequence resources, // expected Boolean neverlink, - Boolean disableAnnotationProcessing, + Boolean enableAnnotationProcessing, StarlarkThread thread) throws EvalException, InterruptedException { @@ -147,7 +147,7 @@ public JavaInfo createJavaCompileAction( ImmutableList.copyOf(Sequence.cast(sourcepathEntries, Artifact.class, "sourcepath")), Sequence.cast(resources, Artifact.class, "resources"), neverlink, - disableAnnotationProcessing, + enableAnnotationProcessing, javaSemantics, 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 0db998206cdfd7..bd2e09a515d59b 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 @@ -217,10 +217,10 @@ public interface JavaCommonApi< defaultValue = "[]"), @Param(name = "neverlink", positional = false, named = true, defaultValue = "False"), @Param( - name = "disable_annotation_processing", + name = "enable_annotation_processing", positional = false, named = true, - defaultValue = "False", + defaultValue = "True", doc = "Disables annotation processing in this compilation, causing any annotation" + " processors provided in plugins or in exported_plugins of deps to be" @@ -249,7 +249,7 @@ JavaInfoT createJavaCompileAction( Sequence sourcepathEntries, // expected. Sequence resources, // expected. Boolean neverlink, - Boolean disableAnnotationProcessing, + Boolean enableAnnotationProcessing, StarlarkThread thread) throws EvalException, InterruptedException; @@ -512,7 +512,7 @@ JavaInfoT addConstraints(JavaInfoT javaInfo, Sequence constraints /* enableOnlyWithFlag = BuildLanguageOptions.EXPERIMENTAL_GOOGLE_LEGACY_API) Sequence getConstraints(JavaInfoT javaInfo); - // TODO(b/111090089): delete once java_common.compile(disable_annotation_processing) is available + // TODO(b/111090089): delete once java_common.compile(enable_annotation_processing) is available @StarlarkMethod( name = "experimental_disable_annotation_processing", doc = diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java index dc1fbc04f10229..90985b20206751 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java @@ -3076,7 +3076,7 @@ public void testSkipAnnotationProcessing() throws Exception { " java_toolchain = ctx.attr._java_toolchain[java_common.JavaToolchainInfo],", " deps = [p[JavaInfo] for p in ctx.attr.deps],", " plugins = [p[JavaPluginInfo] for p in ctx.attr.plugins],", - " disable_annotation_processing = True,", + " enable_annotation_processing = False,", " )", " return struct(", " files = depset([output_jar]),",