From 45b1f2062c35dc45bc0ac8eef2bc2a25dbaa04d3 Mon Sep 17 00:00:00 2001 From: smirnovaae Date: Mon, 27 Jan 2025 10:42:02 -0800 Subject: [PATCH] revert @JsonTypeInfo for LoggableEvent and SQSMessages --- .../ab2d/eventclient/events/LoggableEvent.java | 18 ------------------ .../ab2d/eventclient/messages/SQSMessages.java | 13 +------------ build.gradle | 2 +- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/ab2d-events-client/src/main/java/gov/cms/ab2d/eventclient/events/LoggableEvent.java b/ab2d-events-client/src/main/java/gov/cms/ab2d/eventclient/events/LoggableEvent.java index bd855b59..94c4d68b 100644 --- a/ab2d-events-client/src/main/java/gov/cms/ab2d/eventclient/events/LoggableEvent.java +++ b/ab2d-events-client/src/main/java/gov/cms/ab2d/eventclient/events/LoggableEvent.java @@ -1,32 +1,14 @@ package gov.cms.ab2d.eventclient.events; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; import gov.cms.ab2d.eventclient.config.Ab2dEnvironment; import java.time.OffsetDateTime; -import gov.cms.ab2d.eventclient.messages.GeneralSQSMessage; -import gov.cms.ab2d.eventclient.messages.KinesisSQSMessage; import lombok.Data; /** * Interface describing a loggable event */ @Data -@JsonTypeInfo( use = JsonTypeInfo.Id.NAME, property = "type") -@JsonSubTypes({ - @JsonSubTypes.Type(value = ApiRequestEvent.class, name = "ApiRequestEvent"), - @JsonSubTypes.Type(value = ApiResponseEvent.class, name = "ApiResponseEvent"), - @JsonSubTypes.Type(value = BeneficiarySearchEvent.class, name = "BeneficiarySearchEvent"), - @JsonSubTypes.Type(value = ContractSearchEvent.class, name = "ContractSearchEvent"), - @JsonSubTypes.Type(value = ErrorEvent.class, name = "ErrorEvent"), - @JsonSubTypes.Type(value = FileEvent.class, name = "FileEvent"), - @JsonSubTypes.Type(value = JobStatusChangeEvent.class, name = "JobStatusChangeEvent"), - @JsonSubTypes.Type(value = JobSummaryEvent.class, name = "JobSummaryEvent"), - @JsonSubTypes.Type(value = MetricsEvent.class, name = "MetricsEvent"), - @JsonSubTypes.Type(value = ReloadEvent.class, name = "ReloadEvent"), - @JsonSubTypes.Type(value = SlackEvents.class, name = "SlackEvents"), -}) public abstract class LoggableEvent { protected LoggableEvent() { } diff --git a/ab2d-events-client/src/main/java/gov/cms/ab2d/eventclient/messages/SQSMessages.java b/ab2d-events-client/src/main/java/gov/cms/ab2d/eventclient/messages/SQSMessages.java index f37c08cb..c3c924ae 100644 --- a/ab2d-events-client/src/main/java/gov/cms/ab2d/eventclient/messages/SQSMessages.java +++ b/ab2d-events-client/src/main/java/gov/cms/ab2d/eventclient/messages/SQSMessages.java @@ -1,23 +1,12 @@ package gov.cms.ab2d.eventclient.messages; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; import lombok.*; import lombok.extern.slf4j.Slf4j; @Slf4j @Data -@JsonTypeInfo( use = JsonTypeInfo.Id.NAME, property = "type") -@JsonSubTypes({ - @JsonSubTypes.Type(value = AlertSQSMessage.class, name = "AlertSQSMessage"), - @JsonSubTypes.Type(value = GeneralSQSMessage.class, name = "GeneralSQSMessage"), - @JsonSubTypes.Type(value = KinesisSQSMessage.class, name = "KinesisSQSMessage"), - @JsonSubTypes.Type(value = LogAndTraceSQSMessage.class, name = "LogAndTraceSQSMessage"), - @JsonSubTypes.Type(value = SlackSQSMessage.class, name = "SlackSQSMessage"), - @JsonSubTypes.Type(value = TraceAndAlertSQSMessage.class, name = "TraceAndAlertSQSMessage"), - @JsonSubTypes.Type(value = TraceSQSMessage.class, name = "TraceSQSMessage"), -}) public abstract class SQSMessages { protected SQSMessages() { } } + diff --git a/build.gradle b/build.gradle index b9e7ca2c..a3789907 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ ext { bfdVersion='3.2.0' aggregatorVersion='2.0.1' filtersVersion='2.1.0' - eventClientVersion='3.2.2' + eventClientVersion='3.2.3' propertiesClientVersion='2.0.0' contractClientVersion='2.0.0' snsClientVersion='1.0.0'