Created a generic method to centralize the logic for wrapping adjustedStartTime

Signed-off-by: enugraju <enugraju@amazon.com>

Author: enuraju

data-prepper-plugins/saas-source-plugins/microsoft-office365-source/src/main/java/org/opensearch/dataprepper/plugins/source/microsoft_office365/service/Office365Service.java

@@ -64,11 +64,8 @@ public AuditLogsResponse searchAuditLogs(final String logType,
             }
 
             // Adjust start time based on configured lookback period (supports Instant-based granularity)
-            Instant adjustedStartTime = startTime;
-            Instant lookBackDuration = office365SourceConfig.getLookBackDuration(Instant.now());
-            if (startTime.isBefore(lookBackDuration) && lookBackDuration.isBefore(endTime)) {
-                adjustedStartTime = lookBackDuration;
-            }
+            Instant lookBackStartTime = office365SourceConfig.getLookBackDuration(Instant.now());
+            Instant adjustedStartTime = office365SourceConfig.getAdjustedStartTime(startTime, endTime, lookBackStartTime);
 
             AuditLogsResponse response =
                     office365RestClient.searchAuditLogs(logType, adjustedStartTime, endTime, null);

data-prepper-plugins/saas-source-plugins/microsoft-office365-source/src/test/java/org/opensearch/dataprepper/plugins/source/microsoft_office365/Office365SourceConfigTest.java

@@ -111,7 +111,7 @@ void testGetLookBackDuration_withMinuteRange() throws Exception {
         setField(config, "range", fifteenMinutes);
 
         Instant now = Instant.now();
-        Instant lookBackDuration = config.getLookBackDuration(Instant.now());
+        Instant lookBackDuration = config.getLookBackDuration(now);
         // Verify the duration is approximately 15 minutes before now (within 1 second tolerance)
         Duration actualDuration = Duration.between(lookBackDuration, now);
         assertEquals(15, actualDuration.toMinutes());
@@ -123,7 +123,7 @@ void testGetLookBackDuration_with30MinuteRange() throws Exception {
         setField(config, "range", thirtyMinutes);
 
         Instant now = Instant.now();
-        Instant lookBackDuration = config.getLookBackDuration(Instant.now());
+        Instant lookBackDuration = config.getLookBackDuration(now);
         // Verify the duration is approximately 30 minutes before now
         Duration actualDuration = Duration.between(lookBackDuration, now);
         assertEquals(30, actualDuration.toMinutes());
@@ -135,7 +135,7 @@ void testGetLookBackDuration_with45MinuteRange() throws Exception {
         setField(config, "range", fortyFiveMinutes);
 
         Instant now = Instant.now();
-        Instant lookBackDuration = config.getLookBackDuration(Instant.now());
+        Instant lookBackDuration = config.getLookBackDuration(now);
         // Verify the duration is approximately 45 minutes before now
         Duration actualDuration = Duration.between(lookBackDuration, now);
         assertEquals(45, actualDuration.toMinutes());
@@ -147,7 +147,7 @@ void testGetLookBackDuration_withHourRange() throws Exception {
         setField(config, "range", twoHours);
 
         Instant now = Instant.now();
-        Instant lookBackDuration = config.getLookBackDuration(Instant.now());
+        Instant lookBackDuration = config.getLookBackDuration(now);
         Duration actualDuration = Duration.between(lookBackDuration, now);
         assertEquals(2, actualDuration.toHours());
         assertEquals(120, actualDuration.toMinutes());
@@ -159,7 +159,7 @@ void testGetLookBackDuration_withDayRange() throws Exception {
         setField(config, "range", oneDay);
 
         Instant now = Instant.now();
-        Instant lookBackDuration = config.getLookBackDuration(Instant.now());
+        Instant lookBackDuration = config.getLookBackDuration(now);
         Duration actualDuration = Duration.between(lookBackDuration, now);
         assertEquals(24, actualDuration.toHours());
         assertEquals(1440, actualDuration.toMinutes());

data-prepper-plugins/saas-source-plugins/microsoft-office365-source/src/test/java/org/opensearch/dataprepper/plugins/source/microsoft_office365/service/Office365ServiceTest.java

@@ -60,6 +60,7 @@ class Office365ServiceTest {
     void setUp() {
         office365Service = new Office365Service(sourceConfig, office365RestClient, pluginMetrics);
         lenient().when(sourceConfig.getLookBackDuration(any(Instant.class))).thenReturn(Instant.now().minus(Duration.ofDays(365)));
+        lenient().doCallRealMethod().when(sourceConfig).getAdjustedStartTime(any(Instant.class), any(Instant.class), any(Instant.class));
     }
 
     @Test

data-prepper-plugins/saas-source-plugins/source-crawler/src/main/java/org/opensearch/dataprepper/plugins/source/source_crawler/base/CrawlerSourceConfig.java

@@ -1,6 +1,7 @@
 package org.opensearch.dataprepper.plugins.source.source_crawler.base;
 
 import java.time.Duration;
+import java.time.Instant;
 
 /**
  * Marker interface to all the SAAS connectors configuration
@@ -55,4 +56,24 @@ default Duration getDurationToDelayRetry() {
     default Duration getLeaseInterval() {
         return Duration.ofMinutes(1);
     }
+
+    /**
+     * Adjusts the start time based on the configured lookback boundary.
+     * When the requested start time is before the lookback boundary and the lookback boundary
+     * falls within the time window, the start time is adjusted to the lookback boundary to
+     * respect API limitations (e.g., Office 365 API's maximum lookback period).
+     *
+     * @param startTime         the requested start time for the query
+     * @param endTime           the end time for the query
+     * @param lookBackStartTime the earliest time to query from (e.g., from getLookBackDuration(referenceTime))
+     * @return the adjusted start time, or the original start time if no adjustment is needed
+     */
+    default Instant getAdjustedStartTime(final Instant startTime,
+                                         final Instant endTime,
+                                         final Instant lookBackStartTime) {
+        if (startTime.isBefore(lookBackStartTime) && lookBackStartTime.isBefore(endTime)) {
+            return lookBackStartTime;
+        }
+        return startTime;
+    }
 }