fix merge conflixt

riysaxen-amzn · Mar 9, 2024 · 13f74db · 13f74db
1 parent 5a80380
commit 13f74db
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/src/test/java/org/opensearch/securityanalytics/findings/FindingIT.java b/src/test/java/org/opensearch/securityanalytics/findings/FindingIT.java
@@ -39,18 +39,7 @@
 import org.opensearch.securityanalytics.model.DetectorTrigger;
 
 import static java.util.Collections.emptyList;
-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.randomRuleWithNotConditionBoolAndNum;
-import static org.opensearch.securityanalytics.TestHelpers.randomRuleWithCriticalSeverity;
-import static org.opensearch.securityanalytics.TestHelpers.randomNetworkDoc;
-import static org.opensearch.securityanalytics.TestHelpers.randomDocForNotCondition;
-import static org.opensearch.securityanalytics.TestHelpers.randomDetectorWithInputs;
-import static org.opensearch.securityanalytics.TestHelpers.randomRuleWithNotCondition;
+import static org.opensearch.securityanalytics.TestHelpers.*;
 import static org.opensearch.securityanalytics.settings.SecurityAnalyticsSettings.FINDING_HISTORY_INDEX_MAX_AGE;
 import static org.opensearch.securityanalytics.settings.SecurityAnalyticsSettings.FINDING_HISTORY_MAX_DOCS;
 import static org.opensearch.securityanalytics.settings.SecurityAnalyticsSettings.FINDING_HISTORY_RETENTION_PERIOD;