From 6b4d9f2c8499c1425948b675647267d44febb047 Mon Sep 17 00:00:00 2001 From: Googler Date: Mon, 24 Jul 2023 10:13:17 -0700 Subject: [PATCH] Use better naming for one-version allowlist for tests: rename it from `oneversion_enforcement_allowlist` to `oneversion_allowlist_for_tests` PiperOrigin-RevId: 550598799 Change-Id: I4d7e47e2df808c3727f84b7aceeff5f7041bb9a8 --- .../build/lib/rules/java/JavaToolchain.java | 6 +++--- .../lib/rules/java/JavaToolchainProvider.java | 20 +++++++++---------- .../lib/rules/java/JavaToolchainRule.java | 6 +++--- .../JavaToolchainStarlarkApiProviderApi.java | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchain.java index 2a30dd9c470084..daa876c33f510b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchain.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchain.java @@ -81,8 +81,8 @@ public ConfiguredTarget create(RuleContext ruleContext) FilesToRunProvider singleJar = ruleContext.getExecutablePrerequisite("singlejar"); FilesToRunProvider oneVersion = ruleContext.getExecutablePrerequisite("oneversion"); Artifact oneVersionAllowlist = ruleContext.getPrerequisiteArtifact("oneversion_whitelist"); - Artifact oneVersionEnforcementAllowlist = - ruleContext.getPrerequisiteArtifact("oneversion_enforcement_allowlist"); + Artifact oneVersionAllowlistForTests = + ruleContext.getPrerequisiteArtifact("oneversion_allowlist_for_tests"); Artifact genClass = ruleContext.getPrerequisiteArtifact("genclass"); Artifact depsChecker = ruleContext.getPrerequisiteArtifact("deps_checker"); Artifact timezoneData = ruleContext.getPrerequisiteArtifact("timezone_data"); @@ -185,7 +185,7 @@ public ConfiguredTarget create(RuleContext ruleContext) singleJar, oneVersion, oneVersionAllowlist, - oneVersionEnforcementAllowlist, + oneVersionAllowlistForTests, genClass, depsChecker, timezoneData, diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainProvider.java index 36bbe2f045facb..5c2a89b8ebc182 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainProvider.java @@ -113,7 +113,7 @@ public static JavaToolchainProvider create( FilesToRunProvider singleJar, @Nullable FilesToRunProvider oneVersion, @Nullable Artifact oneVersionAllowlist, - @Nullable Artifact oneVersionEnforcementAllowlist, + @Nullable Artifact oneVersionAllowlistForTests, Artifact genClass, @Nullable Artifact depsChecker, @Nullable Artifact timezoneData, @@ -141,7 +141,7 @@ public static JavaToolchainProvider create( singleJar, oneVersion, oneVersionAllowlist, - oneVersionEnforcementAllowlist, + oneVersionAllowlistForTests, genClass, depsChecker, timezoneData, @@ -175,7 +175,7 @@ public static JavaToolchainProvider create( private final FilesToRunProvider singleJar; @Nullable private final FilesToRunProvider oneVersion; @Nullable private final Artifact oneVersionAllowlist; - @Nullable private final Artifact oneVersionEnforcementAllowlist; + @Nullable private final Artifact oneVersionAllowlistForTests; private final Artifact genClass; @Nullable private final Artifact depsChecker; @Nullable private final Artifact timezoneData; @@ -209,7 +209,7 @@ private JavaToolchainProvider( FilesToRunProvider singleJar, @Nullable FilesToRunProvider oneVersion, @Nullable Artifact oneVersionAllowlist, - @Nullable Artifact oneVersionEnforcementAllowlist, + @Nullable Artifact oneVersionAllowlistForTests, Artifact genClass, @Nullable Artifact depsChecker, @Nullable Artifact timezoneData, @@ -242,7 +242,7 @@ private JavaToolchainProvider( this.singleJar = singleJar; this.oneVersion = oneVersion; this.oneVersionAllowlist = oneVersionAllowlist; - this.oneVersionEnforcementAllowlist = oneVersionEnforcementAllowlist; + this.oneVersionAllowlistForTests = oneVersionAllowlistForTests; this.genClass = genClass; this.depsChecker = depsChecker; this.timezoneData = timezoneData; @@ -375,19 +375,19 @@ public Artifact getOneVersionAllowlist() { } /** - * Return the {@link Artifact} of the one-version-enforcement allowlist used by the one-version + * Return the {@link Artifact} of the one-version allowlist for tests used by the one-version * compliance checker. */ @Nullable - public Artifact oneVersionEnforcementAllowlist() { - return oneVersionEnforcementAllowlist; + public Artifact oneVersionAllowlistForTests() { + return oneVersionAllowlistForTests; } @Override @Nullable - public Artifact getOneVersionEnforcementAllowlist(StarlarkThread thread) throws EvalException { + public Artifact getOneVersionAllowlistForTests(StarlarkThread thread) throws EvalException { checkPrivateAccess(thread); - return oneVersionEnforcementAllowlist(); + return oneVersionAllowlistForTests(); } /** Returns the {@link Artifact} of the GenClass deploy jar */ diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java index fe1003f6c377c2..db320822c19aa6 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java @@ -257,11 +257,11 @@ The Java target version (e.g., '6' or '7'). It specifies for which Java runtime .cfg(ExecutionTransitionFactory.createFactory()) .allowedFileTypes(FileTypeSet.ANY_FILE) .exec()) - /* - Label of the one-version-enforcement allowlist. + /* + Label of the one-version allowlist for tests. */ .add( - attr("oneversion_enforcement_allowlist", LABEL) + attr("oneversion_allowlist_for_tests", LABEL) .singleArtifact() // This needs to be in the execution configuration. .cfg(ExecutionTransitionFactory.createFactory()) diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaToolchainStarlarkApiProviderApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaToolchainStarlarkApiProviderApi.java index 2013aa342ed09e..f4104a8f200fd7 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaToolchainStarlarkApiProviderApi.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaToolchainStarlarkApiProviderApi.java @@ -86,12 +86,12 @@ public interface JavaToolchainStarlarkApiProviderApi extends StructApi { FileApi getOneVersionAllowlist(); @StarlarkMethod( - name = "one_version_enforcement_allowlist", + name = "one_version_allowlist_for_tests", doc = "The allowlist used by the One-Version compliance checker to disable enforcement", useStarlarkThread = true, allowReturnNones = true) @Nullable - FileApi getOneVersionEnforcementAllowlist(StarlarkThread thread) throws EvalException; + FileApi getOneVersionAllowlistForTests(StarlarkThread thread) throws EvalException; @StarlarkMethod( name = "bootclasspath",