Skip to content

[Backport 2.0] Update Notifications BaseModel to extend ToXContentObject instead of ToXContent #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qreshi merged 1 commit into from
May 12, 2022
Merged

[Backport 2.0] Update Notifications BaseModel to extend ToXContentObject instead of ToXContent #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/kotlin/org/opensearch/commons/notifications/model/BaseModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
package org.opensearch.commons.notifications.model

import org.opensearch.common.io.stream.Writeable
import org.opensearch.common.xcontent.ToXContent
import org.opensearch.common.xcontent.ToXContentObject

/**
* interface for representing objects.
*/
interface BaseModel : Writeable, ToXContent
interface BaseModel : Writeable, ToXContentObject
1 change: 1 addition & 0 deletions src/main/kotlin/org/opensearch/commons/notifications/model/NotificationEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ data class NotificationEvent(
return try {
XContentHelper.toXContent(this, XContentType.JSON, EMPTY_PARAMS, true).utf8ToString()
} catch (e: IOException) {
log.debug("Failed to convert NotificationEvent to string", e)
super.toString() + " threw " + e.toString()
}
}
Expand Down