diff --git a/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/jira/JiraService.java b/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/jira/JiraService.java index 760af38ab0..912c3a6048 100644 --- a/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/jira/JiraService.java +++ b/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/jira/JiraService.java @@ -98,7 +98,7 @@ private void searchForNewTicketsAndAddToQueue(JiraSourceConfig configuration, In int total; int startAt = 0; do { - SearchResults searchIssues = jiraRestClient.getAllIssues(jql, startAt, configuration); + SearchResults searchIssues = jiraRestClient.getAllIssues(jql, startAt); List issueList = new ArrayList<>(searchIssues.getIssues()); total = searchIssues.getTotal(); startAt += searchIssues.getIssues().size(); diff --git a/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/jira/rest/JiraRestClient.java b/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/jira/rest/JiraRestClient.java index 44bb296e5f..717ec800a4 100644 --- a/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/jira/rest/JiraRestClient.java +++ b/data-prepper-plugins/saas-source-plugins/jira-source/src/main/java/org/opensearch/dataprepper/plugins/source/jira/rest/JiraRestClient.java @@ -16,7 +16,6 @@ import io.micrometer.core.instrument.Timer; import lombok.extern.slf4j.Slf4j; import org.opensearch.dataprepper.metrics.PluginMetrics; -import org.opensearch.dataprepper.plugins.source.jira.JiraSourceConfig; import org.opensearch.dataprepper.plugins.source.jira.exception.BadRequestException; import org.opensearch.dataprepper.plugins.source.jira.exception.UnAuthorizedException; import org.opensearch.dataprepper.plugins.source.jira.models.SearchResults; @@ -44,7 +43,7 @@ public class JiraRestClient { public static final String REST_API_SEARCH = "rest/api/3/search"; public static final String REST_API_FETCH_ISSUE = "rest/api/3/issue"; - public static final String REST_API_PROJECTS = "/rest/api/3/project/search"; + //public static final String REST_API_PROJECTS = "/rest/api/3/project/search"; public static final String FIFTY = "50"; public static final String START_AT = "startAt"; public static final String MAX_RESULT = "maxResults"; @@ -74,14 +73,12 @@ public JiraRestClient(RestTemplate restTemplate, JiraAuthConfig authConfig, Plug /** * Method to get Issues. * - * @param jql input parameter. - * @param startAt the start at - * @param configuration input parameter. + * @param jql input parameter. + * @param startAt the start at * @return InputStream input stream */ @Timed(SEARCH_CALL_LATENCY_TIMER) - public SearchResults getAllIssues(StringBuilder jql, int startAt, - JiraSourceConfig configuration) { + public SearchResults getAllIssues(StringBuilder jql, int startAt) { String url = authConfig.getUrl() + REST_API_SEARCH; diff --git a/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/JiraIteratorTest.java b/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/JiraIteratorTest.java index 5d61c33a7c..bd73e3e966 100644 --- a/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/JiraIteratorTest.java +++ b/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/JiraIteratorTest.java @@ -73,7 +73,7 @@ void testInitialization() { jiraIterator.initialize(Instant.ofEpochSecond(0)); when(mockSearchResults.getIssues()).thenReturn(new ArrayList<>()); when(mockSearchResults.getTotal()).thenReturn(0); - doReturn(mockSearchResults).when(jiraRestClient).getAllIssues(any(StringBuilder.class), anyInt(), any(JiraSourceConfig.class)); + doReturn(mockSearchResults).when(jiraRestClient).getAllIssues(any(StringBuilder.class), anyInt()); assertFalse(jiraIterator.hasNext()); } @@ -104,7 +104,7 @@ void testItemInfoQueueNotEmpty() { mockIssues.add(issue1); when(mockSearchResults.getIssues()).thenReturn(mockIssues); when(mockSearchResults.getTotal()).thenReturn(0); - doReturn(mockSearchResults).when(jiraRestClient).getAllIssues(any(StringBuilder.class), anyInt(), any(JiraSourceConfig.class)); + doReturn(mockSearchResults).when(jiraRestClient).getAllIssues(any(StringBuilder.class), anyInt()); jiraIterator.initialize(Instant.ofEpochSecond(0)); jiraIterator.setCrawlerQWaitTimeMillis(1); @@ -133,7 +133,7 @@ void testFuturesCompleted() throws InterruptedException { mockIssues.add(issue3); when(mockSearchResults.getIssues()).thenReturn(mockIssues); when(mockSearchResults.getTotal()).thenReturn(0); - doReturn(mockSearchResults).when(jiraRestClient).getAllIssues(any(StringBuilder.class), anyInt(), any(JiraSourceConfig.class)); + doReturn(mockSearchResults).when(jiraRestClient).getAllIssues(any(StringBuilder.class), anyInt()); jiraIterator.initialize(Instant.ofEpochSecond(0)); jiraIterator.setCrawlerQWaitTimeMillis(1); @@ -150,7 +150,7 @@ void testItemInfoQueueEmpty() { List mockIssues = new ArrayList<>(); when(mockSearchResults.getIssues()).thenReturn(mockIssues); when(mockSearchResults.getTotal()).thenReturn(0); - doReturn(mockSearchResults).when(jiraRestClient).getAllIssues(any(StringBuilder.class), anyInt(), any(JiraSourceConfig.class)); + doReturn(mockSearchResults).when(jiraRestClient).getAllIssues(any(StringBuilder.class), anyInt()); jiraIterator.initialize(Instant.ofEpochSecond(0)); jiraIterator.setCrawlerQWaitTimeMillis(1); diff --git a/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/JiraServiceTest.java b/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/JiraServiceTest.java index 7e06c1cd66..80b5c50c71 100644 --- a/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/JiraServiceTest.java +++ b/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/JiraServiceTest.java @@ -206,7 +206,7 @@ public void testGetJiraEntities() throws JsonProcessingException { when(mockSearchResults.getIssues()).thenReturn(mockIssues); when(mockSearchResults.getTotal()).thenReturn(mockIssues.size()); - doReturn(mockSearchResults).when(jiraRestClient).getAllIssues(any(StringBuilder.class), anyInt(), any(JiraSourceConfig.class)); + doReturn(mockSearchResults).when(jiraRestClient).getAllIssues(any(StringBuilder.class), anyInt()); Instant timestamp = Instant.ofEpochSecond(0); Queue itemInfoQueue = new ConcurrentLinkedQueue<>(); @@ -232,7 +232,7 @@ public void buildIssueItemInfoMultipleFutureThreads() throws JsonProcessingExcep when(mockSearchResults.getIssues()).thenReturn(mockIssues); when(mockSearchResults.getTotal()).thenReturn(100); - doReturn(mockSearchResults).when(jiraRestClient).getAllIssues(any(StringBuilder.class), anyInt(), any(JiraSourceConfig.class)); + doReturn(mockSearchResults).when(jiraRestClient).getAllIssues(any(StringBuilder.class), anyInt()); Instant timestamp = Instant.ofEpochSecond(0); Queue itemInfoQueue = new ConcurrentLinkedQueue<>(); @@ -270,7 +270,7 @@ public void testGetJiraEntitiesException() throws JsonProcessingException { JiraSourceConfig jiraSourceConfig = createJiraConfiguration(BASIC, issueType, issueStatus, projectKey); JiraService jiraService = spy(new JiraService(jiraSourceConfig, jiraRestClient, pluginMetrics)); - doThrow(RuntimeException.class).when(jiraRestClient).getAllIssues(any(StringBuilder.class), anyInt(), any(JiraSourceConfig.class)); + doThrow(RuntimeException.class).when(jiraRestClient).getAllIssues(any(StringBuilder.class), anyInt()); Instant timestamp = Instant.ofEpochSecond(0); Queue itemInfoQueue = new ConcurrentLinkedQueue<>(); diff --git a/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/rest/JiraRestClientTest.java b/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/rest/JiraRestClientTest.java index 384fc1e547..a24b582e97 100644 --- a/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/rest/JiraRestClientTest.java +++ b/data-prepper-plugins/saas-source-plugins/jira-source/src/test/java/org/opensearch/dataprepper/plugins/source/jira/rest/JiraRestClientTest.java @@ -44,8 +44,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.BASIC; -import static org.opensearch.dataprepper.plugins.source.jira.utils.Constants.OAUTH2; @ExtendWith(MockitoExtension.class) public class JiraRestClientTest { @@ -113,32 +111,26 @@ void testInvokeRestApiTokenExpiredInterruptException() throws InterruptedExcepti } @Test - public void testGetAllIssuesOauth2() throws JsonProcessingException { + public void testGetAllIssuesOauth2() { List issueType = new ArrayList<>(); - List issueStatus = new ArrayList<>(); - List projectKey = new ArrayList<>(); issueType.add("Task"); - JiraSourceConfig jiraSourceConfig = JiraServiceTest.createJiraConfiguration(OAUTH2, issueType, issueStatus, projectKey); JiraRestClient jiraRestClient = new JiraRestClient(restTemplate, authConfig, pluginMetrics); SearchResults mockSearchResults = mock(SearchResults.class); doReturn("http://mock-service.jira.com/").when(authConfig).getUrl(); doReturn(new ResponseEntity<>(mockSearchResults, HttpStatus.OK)).when(restTemplate).getForEntity(any(URI.class), any(Class.class)); - SearchResults results = jiraRestClient.getAllIssues(jql, 0, jiraSourceConfig); + SearchResults results = jiraRestClient.getAllIssues(jql, 0); assertNotNull(results); } @Test - public void testGetAllIssuesBasic() throws JsonProcessingException { + public void testGetAllIssuesBasic() { List issueType = new ArrayList<>(); - List issueStatus = new ArrayList<>(); - List projectKey = new ArrayList<>(); issueType.add("Task"); - JiraSourceConfig jiraSourceConfig = JiraServiceTest.createJiraConfiguration(BASIC, issueType, issueStatus, projectKey); JiraRestClient jiraRestClient = new JiraRestClient(restTemplate, authConfig, pluginMetrics); SearchResults mockSearchResults = mock(SearchResults.class); when(authConfig.getUrl()).thenReturn("https://example.com/"); doReturn(new ResponseEntity<>(mockSearchResults, HttpStatus.OK)).when(restTemplate).getForEntity(any(URI.class), any(Class.class)); - SearchResults results = jiraRestClient.getAllIssues(jql, 0, jiraSourceConfig); + SearchResults results = jiraRestClient.getAllIssues(jql, 0); assertNotNull(results); }