Remove "get" from field names in BzlmodFlagsAndEnvVars class

Disable Html escaping for better format To make things more clear in the lockfile PiperOrigin-RevId: 521440311 Change-Id: Ieab404109649f8612692a6472221c59c0bd9d655
fweikert · Apr 3, 2023 · aa2407f · aa2407f
1 parent 83c954d
commit aa2407f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BzlmodFlagsAndEnvVars.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BzlmodFlagsAndEnvVars.java
@@ -44,23 +44,23 @@ public static BzlmodFlagsAndEnvVars create(
   }
 
   /** Registries provided via command line */
-  public abstract ImmutableList<String> getCmdRegistries();
+  public abstract ImmutableList<String> cmdRegistries();
 
   /** ModulesOverride provided via command line */
-  public abstract ImmutableMap<String, String> getCmdModuleOverrides();
+  public abstract ImmutableMap<String, String> cmdModuleOverrides();
 
   /** Allowed yanked version in the dependency graph */
-  public abstract ImmutableList<String> getAllowedYankedVersions();
+  public abstract ImmutableList<String> allowedYankedVersions();
 
   /** Allowed yanked version in the dependency graph from environment variables */
-  public abstract String getEnvVarAllowedYankedVersions();
+  public abstract String envVarAllowedYankedVersions();
 
   /** Whether to ignore things declared as dev dependencies or not */
   public abstract boolean ignoreDevDependency();
 
   /** Error level of direct dependencies check */
-  public abstract String getDirectDependenciesMode();
+  public abstract String directDependenciesMode();
 
   /** Error level of bazel compatability check */
-  public abstract String getCompatibilityMode();
+  public abstract String compatibilityMode();
 }
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/GsonTypeAdapterUtil.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/GsonTypeAdapterUtil.java
@@ -110,6 +110,7 @@ public Registry read(JsonReader jsonReader) throws IOException {
   private static final GsonBuilder adapterGson =
       new GsonBuilder()
           .setPrettyPrinting()
+          .disableHtmlEscaping()
           .registerTypeAdapterFactory(GenerateTypeAdapter.FACTORY)
           .registerTypeAdapterFactory(DICT)
           .registerTypeAdapterFactory(IMMUTABLE_MAP)

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileFunctionTest.java
@@ -198,8 +198,8 @@ public void simpleModule() throws Exception {
 
   @Test
   public void simpleModuleWithFlags() throws Exception {
-    // Test having --ovseride_module, --ignore_dev_dependency, --check_bazel_compatibility &
-    // --check_direct_dependencies
+    // Test having --override_module, --ignore_dev_dependency, --check_bazel_compatibility
+    // --check_direct_dependencies & --registry
     scratch.file(
         rootDirectory.getRelative("MODULE.bazel").getPathString(),
         "module(name='my_root', version='1.0')");
@@ -218,10 +218,12 @@ public void simpleModuleWithFlags() throws Exception {
 
     ImmutableList<String> yankedVersions = ImmutableList.of("2.4", "2.3");
     LocalPathOverride override = LocalPathOverride.create("override_path");
+    ImmutableList<String> registries = ImmutableList.of("registry1", "registry2");
+    ImmutableMap<String, String> moduleOverride = ImmutableMap.of("my_dep_1", override.getPath());
 
     ModuleFileFunction.IGNORE_DEV_DEPS.set(differencer, true);
+    ModuleFileFunction.REGISTRIES.set(differencer, registries);
     ModuleFileFunction.MODULE_OVERRIDES.set(differencer, ImmutableMap.of("my_dep_1", override));
-
     BazelModuleResolutionFunction.ALLOWED_YANKED_VERSIONS.set(differencer, yankedVersions);
     BazelModuleResolutionFunction.CHECK_DIRECT_DEPENDENCIES.set(
         differencer, CheckDirectDepsMode.ERROR);
@@ -243,10 +245,12 @@ public void simpleModuleWithFlags() throws Exception {
     BazelLockFileValue value = result.get(BazelLockFileValue.KEY);
     assertThat(value.getModuleDepGraph()).isEqualTo(depGraph);
     assertThat(value.getFlags().ignoreDevDependency()).isTrue();
-    assertThat(value.getFlags().getAllowedYankedVersions()).isEqualTo(yankedVersions);
-    assertThat(value.getFlags().getDirectDependenciesMode())
+    assertThat(value.getFlags().cmdRegistries()).isEqualTo(registries);
+    assertThat(value.getFlags().cmdModuleOverrides()).isEqualTo(moduleOverride);
+    assertThat(value.getFlags().allowedYankedVersions()).isEqualTo(yankedVersions);
+    assertThat(value.getFlags().directDependenciesMode())
         .isEqualTo(CheckDirectDepsMode.ERROR.toString());
-    assertThat(value.getFlags().getCompatibilityMode())
+    assertThat(value.getFlags().compatibilityMode())
         .isEqualTo(BazelCompatibilityMode.ERROR.toString());
   }