diff --git a/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/jira/models/IssueBean.java b/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/jira/models/IssueBean.java index 5f2769883f..0cef94cede 100644 --- a/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/jira/models/IssueBean.java +++ b/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/jira/models/IssueBean.java @@ -17,7 +17,6 @@ import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; -import java.util.Date; import java.util.Map; import java.util.Objects; import java.util.regex.Pattern; @@ -31,12 +30,6 @@ public class IssueBean { - @JsonIgnore - private final Pattern JiraDateTimePattern = Pattern.compile( - "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}[-+]\\d{4}$"); - @JsonIgnore - private final DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); - /** * Expand options that include additional issue details in the response. */ @@ -44,7 +37,6 @@ public class IssueBean { @Setter @JsonProperty("expand") private String expand = null; - /** * The ID of the issue. */ @@ -52,7 +44,6 @@ public class IssueBean { @Setter @JsonProperty("id") private String id = null; - /** * The URL of the issue details. */ @@ -60,7 +51,6 @@ public class IssueBean { @Setter @JsonProperty("self") private String self = null; - /** * The key of the issue. */ @@ -88,7 +78,12 @@ public class IssueBean { @Setter @JsonProperty("fields") private Map fields = null; - + + @JsonIgnore + private final Pattern JiraDateTimePattern = Pattern.compile( + "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}[-+]\\d{4}$"); + @JsonIgnore + private final DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); @JsonIgnore public String getProject() { @@ -124,8 +119,7 @@ private long getGivenDateField(String dateTimeFieldToPull) { .toString()).matches()) { String charSequence = fields.get(dateTimeFieldToPull).toString(); OffsetDateTime offsetDateTime = OffsetDateTime.parse(charSequence, offsetDateTimeFormatter); - new Date(offsetDateTime.toInstant().toEpochMilli()); - dateTimeField = offsetDateTime.toEpochSecond() * 1000; + dateTimeField = offsetDateTime.toInstant().toEpochMilli(); } return dateTimeField; } diff --git a/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/models/IssueBeanTest.java b/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/models/IssueBeanTest.java index 812c59c1f7..a806ed23c1 100644 --- a/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/models/IssueBeanTest.java +++ b/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/models/IssueBeanTest.java @@ -78,8 +78,8 @@ void testGivenDateField() { fieldsTestObject.put("created", "2024-07-06T21:12:23.437-0700"); fieldsTestObject.put("updated", "2022-07-06T21:12:23.106-0700"); issueBean.setFields(fieldsTestObject); - assertEquals(issueBean.getCreatedTimeMillis(), 1720325543000L); - assertEquals(issueBean.getUpdatedTimeMillis(), 1657167143000L); + assertEquals(1720325543437L, issueBean.getCreatedTimeMillis()); + assertEquals(1657167143106L, issueBean.getUpdatedTimeMillis()); } @Test