Skip to content

Making Confluence polling to include the last polling time #5629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
san81 merged 1 commit into from
Apr 19, 2025
Merged

Making Confluence polling to include the last polling time #5629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...src/main/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)))
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/opensearch/dataprepper/plugins/source/confluence/utils/CqlConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (";
Expand Down
4 changes: 2 additions & 2 deletions ...test/java/org/opensearch/dataprepper/plugins/source/confluence/ConfluenceServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}


Expand Down
Loading