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 c513568e83..354badb697 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 @@ -42,7 +42,7 @@ import static org.opensearch.dataprepper.plugins.source.confluence.utils.CqlConstants.CONTENT_TYPE_IN; import static org.opensearch.dataprepper.plugins.source.confluence.utils.CqlConstants.CONTENT_TYPE_NOT_IN; import static org.opensearch.dataprepper.plugins.source.confluence.utils.CqlConstants.DELIMITER; -import static org.opensearch.dataprepper.plugins.source.confluence.utils.CqlConstants.GREATER_THAN; +import static org.opensearch.dataprepper.plugins.source.confluence.utils.CqlConstants.GREATER_THAN_OR_EQUALS; import static org.opensearch.dataprepper.plugins.source.confluence.utils.CqlConstants.PREFIX; import static org.opensearch.dataprepper.plugins.source.confluence.utils.CqlConstants.SPACE_IN; import static org.opensearch.dataprepper.plugins.source.confluence.utils.CqlConstants.SPACE_NOT_IN; @@ -160,7 +160,7 @@ StringBuilder createContentFilterCriteria(ConfluenceSourceConfig configuration, } String formattedTimeStamp = ts.atZone(this.confluenceServerZoneId).format(DateTimeFormatter.ofPattern(CQL_LAST_MODIFIED_DATE_FORMAT)); - StringBuilder cQl = new StringBuilder(LAST_MODIFIED + GREATER_THAN + "\"" + formattedTimeStamp + "\""); + StringBuilder cQl = new StringBuilder(LAST_MODIFIED + GREATER_THAN_OR_EQUALS + "\"" + formattedTimeStamp + "\""); if (!CollectionUtils.isEmpty(ConfluenceConfigHelper.getSpacesNameIncludeFilter(configuration))) { cQl.append(SPACE_IN).append(ConfluenceConfigHelper.getSpacesNameIncludeFilter(configuration).stream() .collect(Collectors.joining(DELIMITER, PREFIX, SUFFIX))) diff --git a/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/utils/CqlConstants.java b/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/utils/CqlConstants.java index 01d3308bd4..fde158ab5d 100644 --- a/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/utils/CqlConstants.java +++ b/data-prepper-plugins/saas-source-plugins/confluence-source/src/main/java/org/opensearch/dataprepper/plugins/source/confluence/utils/CqlConstants.java @@ -11,7 +11,7 @@ package org.opensearch.dataprepper.plugins.source.confluence.utils; public class CqlConstants { - public static final String GREATER_THAN = ">"; + public static final String GREATER_THAN_OR_EQUALS = ">="; public static final String CLOSING_ROUND_BRACKET = ")"; public static final String SPACE_IN = " AND space in ("; 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 cd2320d5df..c4f77cbaf0 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 @@ -54,7 +54,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; @@ -291,7 +290,8 @@ public void testCreateContentFilterCriteria(String confluenceServerTimezone) thr .format(DateTimeFormatter.ofPattern(CQL_LAST_MODIFIED_DATE_FORMAT)); StringBuilder contentFilterCriteria = confluenceService.createContentFilterCriteria(confluenceSourceConfig, pollingTime); assertNotNull(contentFilterCriteria); - assertTrue(contentFilterCriteria.toString().contains(formattedZonedPollingTime)); + String cqlToAssert = "lastModified>=\"" + formattedZonedPollingTime + "\" order by lastModified"; + assertEquals(cqlToAssert, contentFilterCriteria.toString()); }