Skip to content

Commit

Permalink
revert @JsonTypeInfo for LoggableEvent and SQSMessages
Browse files Browse the repository at this point in the history
  • Loading branch information
smirnovaae committed Jan 27, 2025
1 parent 53f5056 commit 45b1f20
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 31 deletions.
Original file line number Diff line number Diff line change
@@ -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() { }

Expand Down
Original file line number Diff line number Diff line change
@@ -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() { }
}

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 45b1f20

Please sign in to comment.