yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-11-18 20:03:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Rest Util if empty of null om url

Browse Source
This commit is contained in:
mohitdeuex 2025-05-12 10:18:01 +05:30
parent 1640cf088a
commit f06fc3b37e
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openmetadata-service/src/main/java/org/openmetadata/service/util/RestUtil.java
View File

@ -13,6 +13,7 @@
package org.openmetadata.service.util; 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_CREATED;
import static org.openmetadata.schema.type.EventType.ENTITY_NO_CHANGE; import static org.openmetadata.schema.type.EventType.ENTITY_NO_CHANGE;
import static org.openmetadata.schema.type.EventType.ENTITY_RESTORED; import static org.openmetadata.schema.type.EventType.ENTITY_RESTORED;
@ -74,7 +75,11 @@ public final class RestUtil {
SettingsType.EMAIL_CONFIGURATION, SettingsType.EMAIL_CONFIGURATION,
new SmtpSettings().withOpenMetadataUrl(uriInfo.getBaseUri().toString()), new SmtpSettings().withOpenMetadataUrl(uriInfo.getBaseUri().toString()),
SmtpSettings.class); SmtpSettings.class);
return URI.create(smtpSettings.getOpenMetadataUrl() + "/" + collectionPath); String url =
nullOrEmpty(smtpSettings.getOpenMetadataUrl())
? uriInfo.getBaseUri().toString()
: smtpSettings.getOpenMetadataUrl();
return URI.create(url + "/" + collectionPath);
} }
public static URI getHref(URI parent, String child) { public static URI getHref(URI parent, String child) {

3
openmetadata-spec/src/main/resources/json/schema/email/smtpSettings.json
View File

@ -23,7 +23,8 @@
}, },
"openMetadataUrl": { "openMetadataUrl": {
"description": "Openmetadata Server Endpoint", "description": "Openmetadata Server Endpoint",
"type": "string" "type": "string",
"default": "http://localhost:8585"
}, },
"senderMail": { "senderMail": {
"description": "Mail of the sender", "description": "Mail of the sender",

6
openmetadata-ui/src/main/resources/ui/src/generated/email/smtpSettings.ts
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2024 Collate. * Copyright 2025 Collate.
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
@ -10,9 +10,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
/**
/**
* This schema defines the SMTP Settings for sending Email * This schema defines the SMTP Settings for sending Email
*/ */
export interface SMTPSettings { export interface SMTPSettings {