From 055034e99c6ded3ea7875a705c1fb93bb9cbddde Mon Sep 17 00:00:00 2001 From: Riya Saxena Date: Wed, 26 Jun 2024 18:03:52 -0700 Subject: [PATCH] fixed imports Signed-off-by: Riya Saxena --- .../SecurityAnalyticsRestTestCase.java | 27 ++++++++++++++----- .../securityanalytics/TestHelpers.java | 11 ++++++-- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/test/java/org/opensearch/securityanalytics/SecurityAnalyticsRestTestCase.java b/src/test/java/org/opensearch/securityanalytics/SecurityAnalyticsRestTestCase.java index ef105c677..14a21e3d9 100644 --- a/src/test/java/org/opensearch/securityanalytics/SecurityAnalyticsRestTestCase.java +++ b/src/test/java/org/opensearch/securityanalytics/SecurityAnalyticsRestTestCase.java @@ -35,7 +35,6 @@ import org.opensearch.commons.alerting.model.action.Action; import org.opensearch.core.common.Strings; import org.opensearch.common.UUIDs; - import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentFactory; @@ -64,11 +63,18 @@ import org.opensearch.securityanalytics.correlation.CorrelationEngineRestApiIT; import org.opensearch.securityanalytics.correlation.index.query.CorrelationQueryBuilder; import org.opensearch.securityanalytics.mapper.MappingsTraverser; -import org.opensearch.securityanalytics.model.*; +import org.opensearch.securityanalytics.model.CorrelationQuery; +import org.opensearch.securityanalytics.model.CorrelationRule; +import org.opensearch.securityanalytics.model.CorrelationRuleTrigger; +import org.opensearch.securityanalytics.model.CustomLogType; +import org.opensearch.securityanalytics.model.Detector; +import org.opensearch.securityanalytics.model.DetectorInput; +import org.opensearch.securityanalytics.model.DetectorTrigger; +import org.opensearch.securityanalytics.model.DetectorRule; +import org.opensearch.securityanalytics.model.Rule; +import org.opensearch.securityanalytics.model.ThreatIntelFeedData; import org.opensearch.securityanalytics.util.CorrelationIndices; import org.opensearch.test.rest.OpenSearchRestTestCase; - - import javax.management.MBeanServerInvocationHandler; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; @@ -85,10 +91,19 @@ import java.util.Locale; import java.util.Map; import java.util.stream.Collectors; - import static org.opensearch.action.admin.indices.create.CreateIndexRequest.MAPPINGS; import static org.opensearch.securityanalytics.SecurityAnalyticsPlugin.MAPPER_BASE_URI; -import static org.opensearch.securityanalytics.TestHelpers.*; +import static org.opensearch.securityanalytics.TestHelpers.adLdapLogMappings; +import static org.opensearch.securityanalytics.TestHelpers.appLogMappings; +import static org.opensearch.securityanalytics.TestHelpers.productIndexAvgAggRule; +import static org.opensearch.securityanalytics.TestHelpers.randomIndex; +import static org.opensearch.securityanalytics.TestHelpers.randomDetectorWithInputsAndTriggers; +import static org.opensearch.securityanalytics.TestHelpers.randomDetectorWithInputsAndTriggersAndType; +import static org.opensearch.securityanalytics.TestHelpers.randomDetectorType; +import static org.opensearch.securityanalytics.TestHelpers.sumAggregationTestRule; +import static org.opensearch.securityanalytics.TestHelpers.s3AccessLogMappings; +import static org.opensearch.securityanalytics.TestHelpers.vpcFlowMappings; +import static org.opensearch.securityanalytics.TestHelpers.windowsIndexMapping; import static org.opensearch.securityanalytics.settings.SecurityAnalyticsSettings.ALERT_HISTORY_INDEX_MAX_AGE; import static org.opensearch.securityanalytics.settings.SecurityAnalyticsSettings.ALERT_HISTORY_MAX_DOCS; import static org.opensearch.securityanalytics.settings.SecurityAnalyticsSettings.ALERT_HISTORY_RETENTION_PERIOD; diff --git a/src/test/java/org/opensearch/securityanalytics/TestHelpers.java b/src/test/java/org/opensearch/securityanalytics/TestHelpers.java index 774a064b6..3f1cfb4e8 100644 --- a/src/test/java/org/opensearch/securityanalytics/TestHelpers.java +++ b/src/test/java/org/opensearch/securityanalytics/TestHelpers.java @@ -5,7 +5,6 @@ package org.opensearch.securityanalytics; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; -import kotlin.collections.EmptyList; import org.apache.lucene.tests.util.LuceneTestCase; import org.opensearch.core.common.bytes.BytesReference; import org.opensearch.common.xcontent.LoggingDeprecationHandler; @@ -22,7 +21,15 @@ import org.opensearch.commons.authuser.User; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; -import org.opensearch.securityanalytics.model.*; +import org.opensearch.securityanalytics.model.CorrelationQuery; +import org.opensearch.securityanalytics.model.CorrelationRule; +import org.opensearch.securityanalytics.model.CorrelationRuleTrigger; +import org.opensearch.securityanalytics.model.CustomLogType; +import org.opensearch.securityanalytics.model.Detector; +import org.opensearch.securityanalytics.model.DetectorInput; +import org.opensearch.securityanalytics.model.DetectorRule; +import org.opensearch.securityanalytics.model.DetectorTrigger; +import org.opensearch.securityanalytics.model.ThreatIntelFeedData; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.rest.OpenSearchRestTestCase;