From 1c3ed76f3fabd03740e846ee1b8aa30fb01a84f5 Mon Sep 17 00:00:00 2001
From: Mohit Yadav <105265192+mohityadav766@users.noreply.github.com>
Date: Mon, 12 May 2025 10:10:06 +0530
Subject: [PATCH] Fix Rest Util if empty of null om url (#21133)

(cherry picked from commit 2a205d5c35f2300a17abd05ea15ebb3ff34fbb1b)
---
 .../java/org/openmetadata/service/util/RestUtil.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/util/RestUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/util/RestUtil.java
index 355277973fb..ad98c22fd10 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/util/RestUtil.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/util/RestUtil.java
@@ -13,6 +13,7 @@
 
 package org.openmetadata.service.util;
 
+import static org.openmetadata.common.utils.CommonUtil.nullOrEmpty;
 import static org.openmetadata.schema.type.EventType.ENTITY_CREATED;
 import static org.openmetadata.schema.type.EventType.ENTITY_NO_CHANGE;
 import static org.openmetadata.schema.type.EventType.ENTITY_RESTORED;
@@ -70,12 +71,14 @@ public final class RestUtil {
   public static URI getHref(UriInfo uriInfo, String collectionPath) {
     collectionPath = removeSlashes(collectionPath);
     OpenMetadataBaseUrlConfiguration urlConfiguration =
-        SettingsCache.getSettingOrDefault(
+        SettingsCache.getSetting(
             SettingsType.OPEN_METADATA_BASE_URL_CONFIGURATION,
-            new OpenMetadataBaseUrlConfiguration()
-                .withOpenMetadataUrl(uriInfo.getBaseUri().toString()),
             OpenMetadataBaseUrlConfiguration.class);
-    return URI.create(urlConfiguration.getOpenMetadataUrl() + "/" + collectionPath);
+    String url =
+        nullOrEmpty(urlConfiguration.getOpenMetadataUrl())
+            ? uriInfo.getBaseUri().toString()
+            : urlConfiguration.getOpenMetadataUrl();
+    return URI.create(url + "/" + collectionPath);
   }
 
   public static URI getHref(URI parent, String child) {