From 48bee94858515dcc74c4bf45f7e50427b937d867 Mon Sep 17 00:00:00 2001 From: "bazel.build machine account" <15028808+bazel-io@users.noreply.github.com> Date: Mon, 2 Oct 2023 08:34:02 -0400 Subject: [PATCH] [6.4.0] Bzlmod lockfile: fix pretty printing for attributes (#19691) This PR contains 1 commit(s). 1)RELNOTES: Commit https://github.com/bazelbuild/bazel/commit/d3577c96bfa3619d87b68e28c1c7fb6980bc1424 PiperOrigin-RevId: 569510142 Change-Id: I46f3db411c720b79f3474da67a5b1614a0b7815f Co-authored-by: Googler --- .../build/lib/bazel/bzlmod/AttributeValuesAdapter.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/AttributeValuesAdapter.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/AttributeValuesAdapter.java index c178ed60717e01..f608becc00851f 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/AttributeValuesAdapter.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/AttributeValuesAdapter.java @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.bazel.bzlmod; import com.google.devtools.build.lib.cmdline.Label; +import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonNull; @@ -39,13 +40,16 @@ /** Helps serialize/deserialize {@link AttributeValues}, which contains Starlark values. */ public class AttributeValuesAdapter extends TypeAdapter { + private final Gson gson = new Gson(); + @Override public void write(JsonWriter out, AttributeValues attributeValues) throws IOException { - JsonObject jsonObject = new JsonObject(); + out.beginObject(); for (Map.Entry entry : attributeValues.attributes().entrySet()) { - jsonObject.add(entry.getKey(), serializeObject(entry.getValue())); + out.name(entry.getKey()); + gson.toJson(serializeObject(entry.getValue()), out); } - out.jsonValue(jsonObject.toString()); + out.endObject(); } @Override