From 41b7208108d65d789d70baf34ab1d096225cbdff Mon Sep 17 00:00:00 2001
From: sonika-shah <58761340+sonika-shah@users.noreply.github.com>
Date: Tue, 25 Feb 2025 14:48:08 +0530
Subject: [PATCH] Minor : get domain deletion activity feed update (#19961)

---
 .../formatter/field/DomainFormatter.java        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/DomainFormatter.java b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/DomainFormatter.java
index fd92cb23a38..3970fd7f602 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/DomainFormatter.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/formatter/field/DomainFormatter.java
@@ -47,15 +47,18 @@ public class DomainFormatter extends DefaultFieldFormatter {
                 JsonUtils.readOrConvertValue(fieldChange.getOldValue(), EntityReference.class))
             .withUpdatedDomain(
                 JsonUtils.readOrConvertValue(fieldChange.getNewValue(), EntityReference.class));
+
+    String domainUrl = null;
+    // in case of deletion updated domain will be null
+    if (domainFeedInfo.getUpdatedDomain() != null) {
+      domainUrl =
+          messageDecorator.getEntityUrl(
+              Entity.DOMAIN, domainFeedInfo.getUpdatedDomain().getFullyQualifiedName(), "");
+    }
+
     FeedInfo feedInfo =
         new FeedInfo()
-            .withHeaderMessage(
-                getHeaderForOwnerUpdate(
-                    operation.value(),
-                    messageDecorator.getEntityUrl(
-                        Entity.DOMAIN,
-                        domainFeedInfo.getUpdatedDomain().getFullyQualifiedName(),
-                        "")))
+            .withHeaderMessage(getHeaderForOwnerUpdate(operation.value(), domainUrl))
             .withFieldName(FIELD_DOMAIN)
             .withEntitySpecificInfo(domainFeedInfo);
     populateThreadFeedInfo(thread, threadMessage, Thread.CardStyle.DOMAIN, operation, feedInfo);