diff --git a/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceService.java b/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceService.java index 8b406a10c6..a95be6635b 100644 --- a/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceService.java +++ b/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceService.java @@ -141,7 +141,7 @@ private StringBuilder createContentFilterCriteria(ConfluenceSourceConfig configu if (!CollectionUtils.isEmpty(ConfluenceConfigHelper.getContentTypeIncludeFilter(configuration)) || !CollectionUtils.isEmpty(ConfluenceConfigHelper.getContentTypeExcludeFilter(configuration))) { validatePageTypeFilters(configuration); } - + String formattedTimeStamp = LocalDateTime.ofInstant(ts, ZoneId.systemDefault()) .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")); StringBuilder cQl = new StringBuilder(LAST_MODIFIED + GREATER_THAN_EQUALS + "\"" + formattedTimeStamp + "\""); @@ -187,7 +187,7 @@ private void validatePageTypeFilters(ConfluenceSourceConfig configuration) { includedPageType.add(pageTypeFilter); } }); - ConfluenceConfigHelper.getContentTypeIncludeFilter(configuration).forEach(pageTypeFilter -> { + ConfluenceConfigHelper.getContentTypeExcludeFilter(configuration).forEach(pageTypeFilter -> { if (includedPageType.contains(pageTypeFilter)) { includedAndExcludedPageType.add(pageTypeFilter); } diff --git a/data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceServiceTest.java b/data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceServiceTest.java index c80f5cc78f..37231948a7 100644 --- a/data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceServiceTest.java +++ b/data-prepper-plugins/saas-source-plugins/confluence-source/src/test/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceServiceTest.java @@ -52,7 +52,6 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -102,7 +101,7 @@ public static ConfluenceSourceConfig createConfluenceConfigurationFromYaml(Strin } public static ConfluenceSourceConfig createConfluenceConfiguration(String auth_type, - List issueType, + List pageTypes, List projectKey) throws JsonProcessingException { PluginConfigVariable pcvAccessToken = null; PluginConfigVariable pcvRefreshToken = null; @@ -130,7 +129,7 @@ public static ConfluenceSourceConfig createConfluenceConfiguration(String auth_t Map spacesMap = new HashMap<>(); Map contentTypeMap = new HashMap<>(); - contentTypeMap.put("include", issueType); + contentTypeMap.put("include", pageTypes); filterMap.put("page_type", contentTypeMap); Map nameMap = new HashMap<>(); @@ -178,17 +177,17 @@ void testJiraServiceInitialization() throws JsonProcessingException { public void testGetPages() throws JsonProcessingException { List contentType = new ArrayList<>(); List spaceKey = new ArrayList<>(); - contentType.add("page"); + contentType.add("PAGE"); spaceKey.add("KAN"); ConfluenceSourceConfig confluenceSourceConfig = createConfluenceConfiguration(BASIC, contentType, spaceKey); ConfluenceService confluenceService = spy(new ConfluenceService(confluenceSourceConfig, confluenceRestClient, pluginMetrics)); List mockPages = new ArrayList<>(); - ConfluenceItem issue1 = createConfluenceItemBean(); - mockPages.add(issue1); - ConfluenceItem issue2 = createConfluenceItemBean(); - mockPages.add(issue2); - ConfluenceItem issue3 = createConfluenceItemBean(); - mockPages.add(issue3); + ConfluenceItem item1 = createConfluenceItemBean(); + mockPages.add(item1); + ConfluenceItem item2 = createConfluenceItemBean(); + mockPages.add(item2); + ConfluenceItem item3 = createConfluenceItemBean(); + mockPages.add(item3); ConfluenceSearchResults mockConfluenceSearchResults = mock(ConfluenceSearchResults.class); when(mockConfluenceSearchResults.getResults()).thenReturn(mockPages); @@ -203,10 +202,10 @@ public void testGetPages() throws JsonProcessingException { @Test public void buildIssueItemInfoMultipleFutureThreads() throws JsonProcessingException { - List issueType = new ArrayList<>(); + List pageType = new ArrayList<>(); List projectKey = new ArrayList<>(); - issueType.add("Task"); - ConfluenceSourceConfig confluenceSourceConfig = createConfluenceConfiguration(BASIC, issueType, projectKey); + pageType.add("PAGE"); + ConfluenceSourceConfig confluenceSourceConfig = createConfluenceConfiguration(BASIC, pageType, projectKey); ConfluenceService confluenceService = spy(new ConfluenceService(confluenceSourceConfig, confluenceRestClient, pluginMetrics)); List mockIssues = new ArrayList<>(); Random random = new Random(); @@ -228,17 +227,15 @@ public void buildIssueItemInfoMultipleFutureThreads() throws JsonProcessingExcep @Test public void testBadProjectKeys() throws JsonProcessingException { - List issueType = new ArrayList<>(); - List issueStatus = new ArrayList<>(); + List pageType = new ArrayList<>(); List projectKey = new ArrayList<>(); - issueType.add("Task"); - issueStatus.add("Done"); + pageType.add("PAGE"); projectKey.add("Bad Project Key"); projectKey.add("A"); projectKey.add("!@#$"); projectKey.add("AAAAAAAAAAAAAA"); - ConfluenceSourceConfig confluenceSourceConfig = createConfluenceConfiguration(BASIC, issueType, projectKey); + ConfluenceSourceConfig confluenceSourceConfig = createConfluenceConfiguration(BASIC, pageType, projectKey); ConfluenceService confluenceService = new ConfluenceService(confluenceSourceConfig, confluenceRestClient, pluginMetrics); Instant timestamp = Instant.ofEpochSecond(0); @@ -249,15 +246,12 @@ public void testBadProjectKeys() throws JsonProcessingException { @Test public void testGetPagesException() throws JsonProcessingException { - List issueType = new ArrayList<>(); - List issueStatus = new ArrayList<>(); + List pageType = new ArrayList<>(); List projectKey = new ArrayList<>(); - issueType.add("Task"); - ConfluenceSourceConfig confluenceSourceConfig = createConfluenceConfiguration(BASIC, issueType, projectKey); + pageType.add("Task"); + ConfluenceSourceConfig confluenceSourceConfig = createConfluenceConfiguration(BASIC, pageType, projectKey); ConfluenceService confluenceService = spy(new ConfluenceService(confluenceSourceConfig, confluenceRestClient, pluginMetrics)); - doThrow(RuntimeException.class).when(confluenceRestClient).getAllContent(any(StringBuilder.class), anyInt()); - Instant timestamp = Instant.ofEpochSecond(0); Queue itemInfoQueue = new ConcurrentLinkedQueue<>();