Skip to content

Optimized RestClient Tests using customized Retry Handler #6359

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
Jan 8, 2026
Merged

Optimized RestClient Tests using customized Retry Handler #6359

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
20 changes: 19 additions & 1 deletion ...rg/opensearch/dataprepper/plugins/source/microsoft_office365/Office365RestClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
import org.opensearch.dataprepper.plugins.source.microsoft_office365.models.AuditLogsResponse;
import org.opensearch.dataprepper.plugins.source.source_crawler.exception.SaaSCrawlerException;
import org.opensearch.dataprepper.plugins.source.source_crawler.metrics.VendorAPIMetricsRecorder;
import org.opensearch.dataprepper.plugins.source.source_crawler.utils.retry.DefaultRetryStrategy;
import org.opensearch.dataprepper.plugins.source.source_crawler.utils.retry.DefaultStatusCodeHandler;
import org.opensearch.dataprepper.plugins.source.source_crawler.utils.retry.RetryHandler;
import org.opensearch.dataprepper.test.helper.ReflectivelySetField;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpEntity;
Expand Down Expand Up @@ -79,6 +82,8 @@ class Office365RestClientTest {

private Office365RestClient office365RestClient;

private static final int CUSTOM_MAX_RETRIES = 1;

@BeforeEach
void setUp() throws NoSuchFieldException, IllegalAccessException {
// Setup VendorAPIMetricsRecorder method mocks - use lenient to avoid unnecessary stubbing errors
Expand Down Expand Up @@ -112,6 +117,12 @@ void setUp() throws NoSuchFieldException, IllegalAccessException {

office365RestClient = new Office365RestClient(authConfig, pluginMetrics, metricsRecorder);
ReflectivelySetField.setField(Office365RestClient.class, office365RestClient, "restTemplate", restTemplate);

// Optionally replace RetryHandler with custom one (1 retry) for faster test execution
RetryHandler customRetryHandler = new RetryHandler(
new DefaultRetryStrategy(CUSTOM_MAX_RETRIES),
new DefaultStatusCodeHandler());
ReflectivelySetField.setField(Office365RestClient.class, office365RestClient, "retryHandler", customRetryHandler);
}

/**
Expand Down Expand Up @@ -365,11 +376,18 @@ void testGetAuditLogFailure() {
* Verifies that failed authentication triggers credential renewal and retry succeeds.
*/
@Test
void testTokenRenewal() {
void testTokenRenewal() throws NoSuchFieldException, IllegalAccessException {
// Setup
Instant startTime = Instant.now().minus(1, ChronoUnit.HOURS);
Instant endTime = Instant.now();

// Override retry handler to allow at least 2 attempts for token renewal test
RetryHandler tokenRenewalRetryHandler = new RetryHandler(
new DefaultRetryStrategy(2), // Need at least 2 attempts for token renewal scenario
new DefaultStatusCodeHandler());
ReflectivelySetField.setField(Office365RestClient.class, office365RestClient, "retryHandler",
tokenRenewalRetryHandler);

List<String> tokensUsed = new ArrayList<>();
List<String> requestTokens = new ArrayList<>();

Expand Down
Loading