Improve UserInfo serialization to handle absent values

trinodb · Sep 9, 2024 · 23e8320 · 23e8320
1 parent 56e33c5
commit 23e8320
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/gateway-ha/src/main/java/io/trino/gateway/ha/router/TrinoRequestUser.java b/gateway-ha/src/main/java/io/trino/gateway/ha/router/TrinoRequestUser.java
@@ -267,14 +267,23 @@ public UserInfoJsonSerializer(Class<Optional<UserInfo>> t)
         public void serialize(Optional<UserInfo> userInfo, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
                 throws IOException
         {
-            userInfo.ifPresent(u -> {
-                try {
-                    jsonGenerator.writeString(u.toJSONString());
-                }
-                catch (IOException e) {
-                    log.error(e, "Error serializing userInfo");
-                }
-            });
+            userInfo.ifPresentOrElse(
+                    u -> {
+                        try {
+                            jsonGenerator.writeString(u.toJSONString());
+                        }
+                        catch (IOException e) {
+                            log.error(e, "Error serializing userInfo");
+                        }
+                    },
+                    () -> {
+                        try {
+                            jsonGenerator.writeNull();
+                        }
+                        catch (IOException e) {
+                            log.error(e, "Error writing null for absent userInfo");
+                        }
+                    });
         }
     }
 }