From 3ea8019a7e058387494ea03d4ff93c8c05febc03 Mon Sep 17 00:00:00 2001
From: Roman Lovakov <rlovakov@nota.tech>
Date: Wed, 28 Aug 2024 00:16:02 +0300
Subject: [PATCH] Extend custom error extension

---
 .../graphql/execution/error/ExecutionErrorsService.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/implementation/src/main/java/io/smallrye/graphql/execution/error/ExecutionErrorsService.java b/server/implementation/src/main/java/io/smallrye/graphql/execution/error/ExecutionErrorsService.java
index 6bc78d93e..0a1f97b73 100644
--- a/server/implementation/src/main/java/io/smallrye/graphql/execution/error/ExecutionErrorsService.java
+++ b/server/implementation/src/main/java/io/smallrye/graphql/execution/error/ExecutionErrorsService.java
@@ -112,7 +112,12 @@ private void populateCustomExtensions(JsonObjectBuilder objectBuilder, Map<Strin
                         || (config.getErrorExtensionFields().isPresent()
                                 && config.getErrorExtensionFields().get().contains(entry.getKey()))) {
                     Object value = entry.getValue();
-                    addKeyValue(objectBuilder, entry.getKey(), value != null ? value.toString() : null);
+                    if (value instanceof JsonValue)
+                        addKeyValue(objectBuilder, entry.getKey(), (JsonValue) value);
+                    else if (value instanceof Map)
+                        addKeyValue(objectBuilder, entry.getKey(), JSON_PROVIDER.createObjectBuilder((Map) value).build());
+                    else
+                        addKeyValue(objectBuilder, entry.getKey(), value != null ? value.toString() : null);
                 }
             }
         }