Cleanup in ValidationEnvironment, provide static methods, reduce visibility.

Call sites were creating a ValidationEnvironment object with no other purpose
than calling validateAst(). Simplify the code so that callers don't have to
worry about it.

RELNOTES: None.
PiperOrigin-RevId: 158705853

1 files changed, 12 insertions, 14 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java
index d3a75d8cfd..30a9c08b16 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java
@@ -21,7 +21,6 @@ import com.google.devtools.build.lib.syntax.BuildFileAST;
 import com.google.devtools.build.lib.syntax.Mutability;
 import com.google.devtools.build.lib.syntax.Runtime;
 import com.google.devtools.build.lib.syntax.SkylarkSemanticsOptions;
-import com.google.devtools.build.lib.syntax.ValidationEnvironment;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.vfs.RootedPath;
@@ -111,19 +110,18 @@ public class ASTFileLookupFunction implements SkyFunction {
     try {
       long astFileSize = fileValue.getSize();
       try (Mutability mutability = Mutability.create("validate")) {
-          ValidationEnvironment validationEnv =
-              new ValidationEnvironment(
-                  ruleClassProvider
-                      .createSkylarkRuleClassEnvironment(
-                          fileLabel,
-                          mutability,
-                          skylarkSemantics,
-                          env.getListener(),
-                          // the two below don't matter for extracting the ValidationEnvironment:
-                          /*astFileContentHashCode=*/ null,
-                          /*importMap=*/ null)
-                      .setupDynamic(Runtime.PKG_NAME, Runtime.NONE)
-                      .setupDynamic(Runtime.REPOSITORY_NAME, Runtime.NONE));
+        com.google.devtools.build.lib.syntax.Environment validationEnv =
+            ruleClassProvider
+                .createSkylarkRuleClassEnvironment(
+                    fileLabel,
+                    mutability,
+                    skylarkSemantics,
+                    env.getListener(),
+                    // the two below don't matter for extracting the ValidationEnvironment:
+                    /*astFileContentHashCode=*/ null,
+                    /*importMap=*/ null)
+                .setupDynamic(Runtime.PKG_NAME, Runtime.NONE)
+                .setupDynamic(Runtime.REPOSITORY_NAME, Runtime.NONE);
           ast = BuildFileAST.parseSkylarkFile(path, astFileSize, env.getListener());
           ast = ast.validate(validationEnv, env.getListener());
         }