From 566c36b7f3f0b589c6eab85bf33f989815b1063b Mon Sep 17 00:00:00 2001 From: Mohit Yadav <105265192+mohityadav766@users.noreply.github.com> Date: Wed, 6 Dec 2023 18:21:44 +0530 Subject: [PATCH] USer password appears in failing entities (#14269) --- .../org/openmetadata/service/jdbi3/EntityRepository.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java index 9c8c56bb55c..bcacdeb61e0 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java @@ -615,14 +615,17 @@ public abstract class EntityRepository { List jsons = dao.listAfterWithOffset(limitParam, currentOffset); for (String json : jsons) { + T parsedEntity = JsonUtils.readValue(json, entityClass); try { - T entity = setFieldsInternal(JsonUtils.readValue(json, entityClass), fields); + T entity = setFieldsInternal(parsedEntity, fields); entity = setInheritedFields(entity, fields); entity = clearFieldsInternal(entity, fields); entities.add(withHref(uriInfo, entity)); } catch (Exception e) { - LOG.error("Failed in Set Fields for Entity with Json : {}", json); - errors.add(String.format("Error Message : %s , %n Entity Json : %s", e.getMessage(), json)); + parsedEntity = clearFieldsInternal(parsedEntity, fields); + String errorEntity = JsonUtils.pojoToJson(parsedEntity); + LOG.error("Failed in Set Fields for Entity with Json : {}", JsonUtils.pojoToJson(errorEntity)); + errors.add(String.format("Error Message : %s , %n Entity Json : %s", e.getMessage(), errorEntity)); } } currentOffset = currentOffset + limitParam;