From 2cd2aa910a5c5d2928bbb4a391c9c7a14acdf015 Mon Sep 17 00:00:00 2001 From: Riya Saxena Date: Wed, 13 Mar 2024 11:49:04 -0700 Subject: [PATCH] fix conflixt errors Signed-off-by: Riya Saxena --- .../securityanalytics/findings/FindingsService.java | 1 + .../securityanalytics/findings/SecureFindingRestApiIT.java | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opensearch/securityanalytics/findings/FindingsService.java b/src/main/java/org/opensearch/securityanalytics/findings/FindingsService.java index b644a5180..78a3d574a 100644 --- a/src/main/java/org/opensearch/securityanalytics/findings/FindingsService.java +++ b/src/main/java/org/opensearch/securityanalytics/findings/FindingsService.java @@ -147,6 +147,7 @@ public void getFindingsByMonitorIds( ActionListener listener ) { BoolQueryBuilder queryBuilder = getBoolQueryBuilder(detectionType, severity, findingIds, startTime, endTime); + org.opensearch.commons.alerting.action.GetFindingsRequest req = new org.opensearch.commons.alerting.action.GetFindingsRequest( null, diff --git a/src/test/java/org/opensearch/securityanalytics/findings/SecureFindingRestApiIT.java b/src/test/java/org/opensearch/securityanalytics/findings/SecureFindingRestApiIT.java index ab68eabe7..65b3045e4 100644 --- a/src/test/java/org/opensearch/securityanalytics/findings/SecureFindingRestApiIT.java +++ b/src/test/java/org/opensearch/securityanalytics/findings/SecureFindingRestApiIT.java @@ -31,12 +31,7 @@ import java.util.Map; import java.util.stream.Collectors; -import static org.opensearch.securityanalytics.TestHelpers.netFlowMappings; -import static org.opensearch.securityanalytics.TestHelpers.randomDetectorType; -import static org.opensearch.securityanalytics.TestHelpers.randomDetectorWithTriggers; -import static org.opensearch.securityanalytics.TestHelpers.randomDoc; -import static org.opensearch.securityanalytics.TestHelpers.randomIndex; -import static org.opensearch.securityanalytics.TestHelpers.windowsIndexMapping; +import static org.opensearch.securityanalytics.TestHelpers.*; public class SecureFindingRestApiIT extends SecurityAnalyticsRestTestCase {