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 f644814af2..ec437ac25d 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 @@ -91,7 +91,7 @@ public String getProject() { @JsonIgnore public String getProjectName() { if (fields != null && Objects.nonNull(((Map) fields.get(PROJECT)).get(NAME))) { - ((Map) fields.get(PROJECT)).get(NAME).toString(); + return ((Map) fields.get(PROJECT)).get(NAME).toString(); } return null; } 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 220c8e1c42..0f99ddccbf 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 @@ -6,11 +6,15 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.util.HashMap; import java.util.Map; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.KEY; +import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.NAME; +import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.PROJECT; @ExtendWith(MockitoExtension.class) public class IssueBeanTest { @@ -51,6 +55,23 @@ public void testNull() { assertNull(issueBean.getFields()); } + @Test + void testNullCases() { + assertNull(issueBean.getProject()); + assertNull(issueBean.getProjectName()); + assertEquals(issueBean.getUpdatedTimeMillis(), 0); + } + + @Test + void testGivenDateField() { + Map fieldsTestObject = new HashMap<>(); + 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); + } + @Test public void testStringSettersAndGetters() { String self = "selfTest"; @@ -81,4 +102,19 @@ public void testMapSettersAndGetters() { assertEquals(issueBean.getFields(), fieldsTestObject); } + @Test + public void testFieldPropertyGetters() { + Map fieldsTestObject = new HashMap<>(); + Map projectTestObject = new HashMap<>(); + String projectName = "name of project"; + String projectKey = "PROJKEY"; + projectTestObject.put(KEY, projectKey); + projectTestObject.put(NAME, projectName); + fieldsTestObject.put(PROJECT, projectTestObject); + + issueBean.setFields(fieldsTestObject); + assertEquals(projectKey, issueBean.getProject()); + assertEquals(projectName, issueBean.getProjectName()); + } + }