Use default methods in PackageSettings.

PiperOrigin-RevId: 532451426 Change-Id: I946fc358ee85ae8d0ce551ed95df8ef6e1709812
bazelbuild · May 16, 2023 · 6c1487c · 6c1487c
1 parent 277d05f
commit 6c1487c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 33 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -45,7 +45,6 @@
 import com.google.devtools.build.lib.events.EventKind;
 import com.google.devtools.build.lib.events.ExtendedEventHandler.Postable;
 import com.google.devtools.build.lib.packages.License.DistributionType;
-import com.google.devtools.build.lib.packages.Package.Builder.DefaultPackageSettings;
 import com.google.devtools.build.lib.packages.Package.Builder.PackageSettings;
 import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions;
 import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
@@ -900,7 +899,7 @@ public static Builder newExternalPackageBuilderForBzlmod(
       PackageIdentifier basePackageId,
       RepositoryMapping repoMapping) {
     return new Builder(
-            DefaultPackageSettings.INSTANCE,
+            PackageSettings.DEFAULTS,
             basePackageId,
             DUMMY_WORKSPACE_NAME_FOR_BZLMOD_PACKAGES,
             /* associatedModuleName= */ Optional.empty(),
@@ -943,30 +942,16 @@ public interface PackageSettings {
        * thrown from {@link #getTarget}. Useful for toning down verbosity in situations where it can
        * be less helpful.
        */
-      boolean succinctTargetNotFoundErrors();
-
-      /**
-       * Reports whether to record the set of Modules loaded by this package, which enables richer
-       * modes of blaze query.
-       */
-      boolean recordLoadedModules();
-    }
-
-    /** Default {@link PackageSettings}. */
-    public static class DefaultPackageSettings implements PackageSettings {
-      public static final DefaultPackageSettings INSTANCE = new DefaultPackageSettings();
-
-      private DefaultPackageSettings() {}
-
-      @Override
-      public boolean succinctTargetNotFoundErrors() {
+      default boolean succinctTargetNotFoundErrors() {
         return false;
       }
 
-      @Override
-      public boolean recordLoadedModules() {
+      /** Reports whether to record the set of Modules loaded by this package. */
+      default boolean recordLoadedModules() {
         return true;
       }
+
+      PackageSettings DEFAULTS = new PackageSettings() {};
     }
 
     /**

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -56,7 +56,6 @@
 import com.google.devtools.build.lib.events.OutputFilter;
 import com.google.devtools.build.lib.exec.BinTools;
 import com.google.devtools.build.lib.jni.JniLoader;
-import com.google.devtools.build.lib.packages.Package.Builder.DefaultPackageSettings;
 import com.google.devtools.build.lib.packages.Package.Builder.PackageSettings;
 import com.google.devtools.build.lib.packages.PackageFactory;
 import com.google.devtools.build.lib.packages.PackageLoadingListener;
@@ -1644,7 +1643,7 @@ private static PackageSettings getPackageSettings(List<BlazeModule> blazeModules
               .collect(toImmutableList());
       Preconditions.checkState(
           packageSettingss.size() <= 1, "more than one module defines a PackageSettings");
-      return Iterables.getFirst(packageSettingss, DefaultPackageSettings.INSTANCE);
+      return Iterables.getFirst(packageSettingss, PackageSettings.DEFAULTS);
     }
 
     private static PackageValidator getPackageValidator(List<BlazeModule> blazeModules) {

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
@@ -41,7 +41,7 @@
 import com.google.devtools.build.lib.packages.CachingPackageLocator;
 import com.google.devtools.build.lib.packages.NoSuchPackageException;
 import com.google.devtools.build.lib.packages.Package;
-import com.google.devtools.build.lib.packages.Package.Builder.DefaultPackageSettings;
+import com.google.devtools.build.lib.packages.Package.Builder.PackageSettings;
 import com.google.devtools.build.lib.packages.Package.ConfigSettingVisibilityPolicy;
 import com.google.devtools.build.lib.packages.PackageFactory;
 import com.google.devtools.build.lib.packages.PackageLoadingListener;
@@ -286,7 +286,7 @@ public final PackageLoader build() {
         new PackageFactory(
             ruleClassProvider,
             forkJoinPoolForNonSkyframeGlobbing,
-            DefaultPackageSettings.INSTANCE,
+            PackageSettings.DEFAULTS,
             PackageValidator.NOOP_VALIDATOR,
             PackageOverheadEstimator.NOOP_ESTIMATOR,
             PackageLoadingListener.NOOP_LISTENER);

diff --git a/...om/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryContextTest.java b/...om/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryContextTest.java
@@ -30,7 +30,7 @@
 import com.google.devtools.build.lib.events.ExtendedEventHandler;
 import com.google.devtools.build.lib.packages.Attribute;
 import com.google.devtools.build.lib.packages.Package;
-import com.google.devtools.build.lib.packages.Package.Builder.DefaultPackageSettings;
+import com.google.devtools.build.lib.packages.Package.Builder.PackageSettings;
 import com.google.devtools.build.lib.packages.Rule;
 import com.google.devtools.build.lib.packages.RuleClass;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
@@ -135,7 +135,7 @@ private void setUpContextForRule(
       throws Exception {
     Package.Builder packageBuilder =
         Package.newExternalPackageBuilder(
-            DefaultPackageSettings.INSTANCE,
+            PackageSettings.DEFAULTS,
             RootedPath.toRootedPath(root, workspaceFile),
             "runfiles",
             RepositoryMapping.ALWAYS_FALLBACK,

diff --git a/src/test/java/com/google/devtools/build/lib/packages/PackageTest.java b/src/test/java/com/google/devtools/build/lib/packages/PackageTest.java
@@ -22,7 +22,7 @@
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.cmdline.RepositoryMapping;
 import com.google.devtools.build.lib.events.StoredEventHandler;
-import com.google.devtools.build.lib.packages.Package.Builder.DefaultPackageSettings;
+import com.google.devtools.build.lib.packages.Package.Builder.PackageSettings;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
 import com.google.devtools.build.lib.vfs.DigestHashFunction;
 import com.google.devtools.build.lib.vfs.FileSystem;
@@ -160,7 +160,7 @@ public void testBuildPartialPopulatesImplicitTestSuiteValueIdempotently() throws
   private Package.Builder pkgBuilder(String name) {
     Package.Builder result =
         new Package.Builder(
-            DefaultPackageSettings.INSTANCE,
+            PackageSettings.DEFAULTS,
             PackageIdentifier.createInMainRepo(name),
             "workspace",
             Optional.empty(),

diff --git a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java
@@ -21,7 +21,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.cmdline.RepositoryMapping;
 import com.google.devtools.build.lib.events.Event;
-import com.google.devtools.build.lib.packages.Package.Builder.DefaultPackageSettings;
+import com.google.devtools.build.lib.packages.Package.Builder.PackageSettings;
 import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.Root;
@@ -65,7 +65,7 @@ void parse(String... args) {
     // execute
     builder =
         Package.newExternalPackageBuilder(
-            DefaultPackageSettings.INSTANCE,
+            PackageSettings.DEFAULTS,
             RootedPath.toRootedPath(root, workspaceFilePath),
             "",
             RepositoryMapping.ALWAYS_FALLBACK,

diff --git a/...com/google/devtools/build/lib/testutil/PackageFactoryBuilderFactoryForBazelUnitTests.java b/...com/google/devtools/build/lib/testutil/PackageFactoryBuilderFactoryForBazelUnitTests.java
@@ -16,7 +16,7 @@
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
 import com.google.devtools.build.lib.packages.BuilderFactoryForTesting;
-import com.google.devtools.build.lib.packages.Package.Builder.DefaultPackageSettings;
+import com.google.devtools.build.lib.packages.Package.Builder.PackageSettings;
 import com.google.devtools.build.lib.packages.PackageFactory;
 import com.google.devtools.build.lib.packages.PackageLoadingListener;
 import com.google.devtools.build.lib.packages.RuleClassProvider;
@@ -52,7 +52,7 @@ public PackageFactory build(RuleClassProvider ruleClassProvider, FileSystem fs)
       return new PackageFactory(
           ruleClassProvider,
           PackageFactory.makeDefaultSizedForkJoinPoolForGlobbing(),
-          DefaultPackageSettings.INSTANCE,
+          PackageSettings.DEFAULTS,
           packageValidator,
           packageOverheadEstimator,
           doChecksForTesting