diff --git a/build.gradle b/build.gradle index 2401fced6..38e45235c 100644 --- a/build.gradle +++ b/build.gradle @@ -93,7 +93,7 @@ ext { opensearchplugin { name 'opensearch-anomaly-detection' description 'OpenSearch anomaly detector plugin' - classname 'com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin' + classname 'org.opensearch.ad.AnomalyDetectorPlugin' extendedPlugins = ['lang-painless', 'opensearch-job-scheduler'] } @@ -124,16 +124,16 @@ configurations { } tasks.named('forbiddenApisMain').configure { - // Only enable limited check because AD code has too many violations. - replaceSignatureFiles 'jdk-signatures' - signaturesFiles += files('src/forbidden/ad-signatures.txt') + // Only enable limited check because AD code has too many violations. + replaceSignatureFiles 'jdk-signatures' + signaturesFiles += files('src/forbidden/ad-signatures.txt') } tasks.named('forbiddenApisTest').configure { - // Disable check because AD code has too many violations. - // For example, we have to allow @Test to be used in test classes not inherited from LuceneTestCase. - // see https://github.com/elastic/elasticsearch/blob/master/buildSrc/src/main/resources/forbidden/es-test-signatures.txt - ignoreFailures = true + // Disable check because AD code has too many violations. + // For example, we have to allow @Test to be used in test classes not inherited from LuceneTestCase. + // see https://github.com/elastic/elasticsearch/blob/master/buildSrc/src/main/resources/forbidden/es-test-signatures.txt + ignoreFailures = true } // Allow test cases to be named Tests without having to be inherited from LuceneTestCase. @@ -175,14 +175,14 @@ integTest { // Only rest case can run with remote cluster if (System.getProperty("tests.rest.cluster") != null) { filter { - includeTestsMatching "com.amazon.opendistroforelasticsearch.ad.rest.*IT" - includeTestsMatching "com.amazon.opendistroforelasticsearch.ad.e2e.*IT" + includeTestsMatching "org.opensearch.ad.rest.*IT" + includeTestsMatching "org.opensearch.ad.e2e.*IT" } } if (System.getProperty("https") == null || System.getProperty("https") == "false") { filter { - excludeTestsMatching "com.amazon.opendistroforelasticsearch.ad.rest.SecureADRestIT" + excludeTestsMatching "org.opensearch.ad.rest.SecureADRestIT" } } @@ -286,47 +286,47 @@ task release(type: Copy, group: 'build') { List jacocoExclusions = [ // code for configuration, settings, etc is excluded from coverage - 'com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin', - 'com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings', + 'org.opensearch.ad.AnomalyDetectorPlugin', + 'org.opensearch.ad.settings.AnomalyDetectorSettings', //TODO: add more test cases later for these package - 'com.amazon.opendistroforelasticsearch.ad.model.*', - 'com.amazon.opendistroforelasticsearch.ad.rest.*', - 'com.amazon.opendistroforelasticsearch.ad.transport.handler.DetectionStateHandler', - 'com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorJobRunner', + 'org.opensearch.ad.model.*', + 'org.opensearch.ad.rest.*', + 'org.opensearch.ad.transport.handler.DetectionStateHandler', + 'org.opensearch.ad.AnomalyDetectorJobRunner', // Class containing just constants. Don't need to test - 'com.amazon.opendistroforelasticsearch.ad.constant.*', + 'org.opensearch.ad.constant.*', // mostly skeleton code. Tested major logic in restful api tests - 'com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting', - - 'com.amazon.opendistroforelasticsearch.ad.common.exception.FeatureNotAvailableException', - 'com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException', - 'com.amazon.opendistroforelasticsearch.ad.util.ClientUtil', - - 'com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorRequest', - 'com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorResponse', - 'com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorTransportAction', - 'com.amazon.opendistroforelasticsearch.ad.transport.DeleteDetectorAction', - 'com.amazon.opendistroforelasticsearch.ad.transport.CronTransportAction', - 'com.amazon.opendistroforelasticsearch.ad.transport.CronRequest', - 'com.amazon.opendistroforelasticsearch.ad.transport.ADStatsNodesAction', - 'com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorRunner', - 'com.amazon.opendistroforelasticsearch.ad.util.ParseUtils', + 'org.opensearch.ad.settings.EnabledSetting', + + 'org.opensearch.ad.common.exception.FeatureNotAvailableException', + 'org.opensearch.ad.common.exception.AnomalyDetectionException', + 'org.opensearch.ad.util.ClientUtil', + + 'org.opensearch.ad.transport.StopDetectorRequest', + 'org.opensearch.ad.transport.StopDetectorResponse', + 'org.opensearch.ad.transport.StopDetectorTransportAction', + 'org.opensearch.ad.transport.DeleteDetectorAction', + 'org.opensearch.ad.transport.CronTransportAction', + 'org.opensearch.ad.transport.CronRequest', + 'org.opensearch.ad.transport.ADStatsNodesAction', + 'org.opensearch.ad.AnomalyDetectorRunner', + 'org.opensearch.ad.util.ParseUtils', // related to transport actions added for security - 'com.amazon.opendistroforelasticsearch.ad.transport.StatsAnomalyDetectorTransportAction', - 'com.amazon.opendistroforelasticsearch.ad.transport.DeleteAnomalyDetectorTransportAction*', - 'com.amazon.opendistroforelasticsearch.ad.transport.SearchAnomalyDetectorTransportAction*', - 'com.amazon.opendistroforelasticsearch.ad.transport.GetAnomalyDetectorTransportAction*', - 'com.amazon.opendistroforelasticsearch.ad.transport.SearchAnomalyResultTransportAction*', - 'com.amazon.opendistroforelasticsearch.ad.transport.SearchAnomalyDetectorInfoTransportAction*', + 'org.opensearch.ad.transport.StatsAnomalyDetectorTransportAction', + 'org.opensearch.ad.transport.DeleteAnomalyDetectorTransportAction*', + 'org.opensearch.ad.transport.SearchAnomalyDetectorTransportAction*', + 'org.opensearch.ad.transport.GetAnomalyDetectorTransportAction*', + 'org.opensearch.ad.transport.SearchAnomalyResultTransportAction*', + 'org.opensearch.ad.transport.SearchAnomalyDetectorInfoTransportAction*', // TODO: hc caused coverage to drop - 'com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices', - 'com.amazon.opendistroforelasticsearch.ad.transport.handler.MultiEntityResultHandler', - 'com.amazon.opendistroforelasticsearch.ad.util.ThrowingSupplierWrapper', + 'org.opensearch.ad.indices.AnomalyDetectionIndices', + 'org.opensearch.ad.transport.handler.MultiEntityResultHandler', + 'org.opensearch.ad.util.ThrowingSupplierWrapper', ] jacocoTestCoverageVerification { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/AbstractProfileRunner.java b/src/main/java/org/opensearch/ad/AbstractProfileRunner.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/AbstractProfileRunner.java rename to src/main/java/org/opensearch/ad/AbstractProfileRunner.java index 98e58437a..5f4b302ac 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/AbstractProfileRunner.java +++ b/src/main/java/org/opensearch/ad/AbstractProfileRunner.java @@ -24,11 +24,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import java.util.Locale; -import com.amazon.opendistroforelasticsearch.ad.model.InitProgressProfile; +import org.opensearch.ad.model.InitProgressProfile; public abstract class AbstractProfileRunner { protected long requiredSamples; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorJobRunner.java b/src/main/java/org/opensearch/ad/AnomalyDetectorJobRunner.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorJobRunner.java rename to src/main/java/org/opensearch/ad/AnomalyDetectorJobRunner.java index f840e140e..03aa3f917 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorJobRunner.java +++ b/src/main/java/org/opensearch/ad/AnomalyDetectorJobRunner.java @@ -24,12 +24,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; -import static com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin.AD_THREAD_POOL_NAME; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.XCONTENT_WITH_TYPE; import static org.opensearch.action.DocWriteResponse.Result.CREATED; import static org.opensearch.action.DocWriteResponse.Result.UPDATED; +import static org.opensearch.ad.AnomalyDetectorPlugin.AD_THREAD_POOL_NAME; +import static org.opensearch.ad.util.RestHandlerUtils.XCONTENT_WITH_TYPE; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; @@ -47,6 +47,23 @@ import org.opensearch.action.index.IndexRequest; import org.opensearch.action.index.IndexResponse; import org.opensearch.action.support.WriteRequest; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.common.exception.InternalFailure; +import org.opensearch.ad.indices.ADIndex; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.model.FeatureData; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.transport.AnomalyResultAction; +import org.opensearch.ad.transport.AnomalyResultRequest; +import org.opensearch.ad.transport.AnomalyResultResponse; +import org.opensearch.ad.transport.AnomalyResultTransportAction; +import org.opensearch.ad.transport.handler.AnomalyIndexHandler; +import org.opensearch.ad.transport.handler.DetectionStateHandler; +import org.opensearch.ad.util.ClientUtil; import org.opensearch.client.Client; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.LoggingDeprecationHandler; @@ -56,23 +73,6 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.InternalFailure; -import com.amazon.opendistroforelasticsearch.ad.indices.ADIndex; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.model.FeatureData; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyResultAction; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyResultRequest; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyResultResponse; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyResultTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.AnomalyIndexHandler; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.DetectionStateHandler; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; import com.amazon.opendistroforelasticsearch.commons.InjectSecurity; import com.amazon.opendistroforelasticsearch.commons.authuser.User; import com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobExecutionContext; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorPlugin.java b/src/main/java/org/opensearch/ad/AnomalyDetectorPlugin.java similarity index 76% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorPlugin.java rename to src/main/java/org/opensearch/ad/AnomalyDetectorPlugin.java index 42c82be3b..7ec8521ef 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorPlugin.java +++ b/src/main/java/org/opensearch/ad/AnomalyDetectorPlugin.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import static java.util.Collections.unmodifiableList; @@ -44,6 +44,117 @@ import org.opensearch.SpecialPermission; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; +import org.opensearch.ad.breaker.ADCircuitBreakerService; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.caching.EntityCache; +import org.opensearch.ad.caching.PriorityCache; +import org.opensearch.ad.cluster.ADClusterEventListener; +import org.opensearch.ad.cluster.HashRing; +import org.opensearch.ad.cluster.MasterEventListener; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.dataprocessor.IntegerSensitiveSingleFeatureLinearUniformInterpolator; +import org.opensearch.ad.dataprocessor.Interpolator; +import org.opensearch.ad.dataprocessor.LinearUniformInterpolator; +import org.opensearch.ad.dataprocessor.SingleFeatureLinearUniformInterpolator; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.feature.SearchFeatureDao; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.ml.CheckpointDao; +import org.opensearch.ad.ml.EntityColdStarter; +import org.opensearch.ad.ml.HybridThresholdingModel; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.ModelPartitioner; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.model.DetectorInternalState; +import org.opensearch.ad.rest.RestAnomalyDetectorJobAction; +import org.opensearch.ad.rest.RestDeleteAnomalyDetectorAction; +import org.opensearch.ad.rest.RestExecuteAnomalyDetectorAction; +import org.opensearch.ad.rest.RestGetAnomalyDetectorAction; +import org.opensearch.ad.rest.RestIndexAnomalyDetectorAction; +import org.opensearch.ad.rest.RestPreviewAnomalyDetectorAction; +import org.opensearch.ad.rest.RestSearchADTasksAction; +import org.opensearch.ad.rest.RestSearchAnomalyDetectorAction; +import org.opensearch.ad.rest.RestSearchAnomalyDetectorInfoAction; +import org.opensearch.ad.rest.RestSearchAnomalyResultAction; +import org.opensearch.ad.rest.RestStatsAnomalyDetectorAction; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.settings.EnabledSetting; +import org.opensearch.ad.stats.ADStat; +import org.opensearch.ad.stats.ADStats; +import org.opensearch.ad.stats.StatNames; +import org.opensearch.ad.stats.suppliers.CounterSupplier; +import org.opensearch.ad.stats.suppliers.IndexStatusSupplier; +import org.opensearch.ad.stats.suppliers.ModelsOnNodeSupplier; +import org.opensearch.ad.stats.suppliers.SettableSupplier; +import org.opensearch.ad.task.ADBatchTaskRunner; +import org.opensearch.ad.task.ADTaskCacheManager; +import org.opensearch.ad.task.ADTaskManager; +import org.opensearch.ad.transport.ADBatchAnomalyResultAction; +import org.opensearch.ad.transport.ADBatchAnomalyResultTransportAction; +import org.opensearch.ad.transport.ADBatchTaskRemoteExecutionAction; +import org.opensearch.ad.transport.ADBatchTaskRemoteExecutionTransportAction; +import org.opensearch.ad.transport.ADCancelTaskAction; +import org.opensearch.ad.transport.ADCancelTaskTransportAction; +import org.opensearch.ad.transport.ADResultBulkAction; +import org.opensearch.ad.transport.ADResultBulkTransportAction; +import org.opensearch.ad.transport.ADStatsNodesAction; +import org.opensearch.ad.transport.ADStatsNodesTransportAction; +import org.opensearch.ad.transport.ADTaskProfileAction; +import org.opensearch.ad.transport.ADTaskProfileTransportAction; +import org.opensearch.ad.transport.AnomalyDetectorJobAction; +import org.opensearch.ad.transport.AnomalyDetectorJobTransportAction; +import org.opensearch.ad.transport.AnomalyResultAction; +import org.opensearch.ad.transport.AnomalyResultTransportAction; +import org.opensearch.ad.transport.CronAction; +import org.opensearch.ad.transport.CronTransportAction; +import org.opensearch.ad.transport.DeleteAnomalyDetectorAction; +import org.opensearch.ad.transport.DeleteAnomalyDetectorTransportAction; +import org.opensearch.ad.transport.DeleteModelAction; +import org.opensearch.ad.transport.DeleteModelTransportAction; +import org.opensearch.ad.transport.EntityProfileAction; +import org.opensearch.ad.transport.EntityProfileTransportAction; +import org.opensearch.ad.transport.EntityResultAction; +import org.opensearch.ad.transport.EntityResultTransportAction; +import org.opensearch.ad.transport.ForwardADTaskAction; +import org.opensearch.ad.transport.ForwardADTaskTransportAction; +import org.opensearch.ad.transport.GetAnomalyDetectorAction; +import org.opensearch.ad.transport.GetAnomalyDetectorTransportAction; +import org.opensearch.ad.transport.IndexAnomalyDetectorAction; +import org.opensearch.ad.transport.IndexAnomalyDetectorTransportAction; +import org.opensearch.ad.transport.PreviewAnomalyDetectorAction; +import org.opensearch.ad.transport.PreviewAnomalyDetectorTransportAction; +import org.opensearch.ad.transport.ProfileAction; +import org.opensearch.ad.transport.ProfileTransportAction; +import org.opensearch.ad.transport.RCFPollingAction; +import org.opensearch.ad.transport.RCFPollingTransportAction; +import org.opensearch.ad.transport.RCFResultAction; +import org.opensearch.ad.transport.RCFResultTransportAction; +import org.opensearch.ad.transport.SearchADTasksAction; +import org.opensearch.ad.transport.SearchADTasksTransportAction; +import org.opensearch.ad.transport.SearchAnomalyDetectorAction; +import org.opensearch.ad.transport.SearchAnomalyDetectorInfoAction; +import org.opensearch.ad.transport.SearchAnomalyDetectorInfoTransportAction; +import org.opensearch.ad.transport.SearchAnomalyDetectorTransportAction; +import org.opensearch.ad.transport.SearchAnomalyResultAction; +import org.opensearch.ad.transport.SearchAnomalyResultTransportAction; +import org.opensearch.ad.transport.StatsAnomalyDetectorAction; +import org.opensearch.ad.transport.StatsAnomalyDetectorTransportAction; +import org.opensearch.ad.transport.StopDetectorAction; +import org.opensearch.ad.transport.StopDetectorTransportAction; +import org.opensearch.ad.transport.ThresholdResultAction; +import org.opensearch.ad.transport.ThresholdResultTransportAction; +import org.opensearch.ad.transport.handler.ADSearchHandler; +import org.opensearch.ad.transport.handler.AnomalyIndexHandler; +import org.opensearch.ad.transport.handler.AnomalyResultBulkIndexHandler; +import org.opensearch.ad.transport.handler.DetectionStateHandler; +import org.opensearch.ad.transport.handler.MultiEntityResultHandler; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.DiscoveryNodeFilterer; +import org.opensearch.ad.util.IndexUtils; +import org.opensearch.ad.util.Throttler; +import org.opensearch.ad.util.ThrowingConsumerWrapper; import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNodes; @@ -74,117 +185,6 @@ import org.opensearch.threadpool.ThreadPool; import org.opensearch.watcher.ResourceWatcherService; -import com.amazon.opendistroforelasticsearch.ad.breaker.ADCircuitBreakerService; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.caching.EntityCache; -import com.amazon.opendistroforelasticsearch.ad.caching.PriorityCache; -import com.amazon.opendistroforelasticsearch.ad.cluster.ADClusterEventListener; -import com.amazon.opendistroforelasticsearch.ad.cluster.HashRing; -import com.amazon.opendistroforelasticsearch.ad.cluster.MasterEventListener; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.IntegerSensitiveSingleFeatureLinearUniformInterpolator; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.Interpolator; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.LinearUniformInterpolator; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.SingleFeatureLinearUniformInterpolator; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.feature.SearchFeatureDao; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.ml.CheckpointDao; -import com.amazon.opendistroforelasticsearch.ad.ml.EntityColdStarter; -import com.amazon.opendistroforelasticsearch.ad.ml.HybridThresholdingModel; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelPartitioner; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorInternalState; -import com.amazon.opendistroforelasticsearch.ad.rest.RestAnomalyDetectorJobAction; -import com.amazon.opendistroforelasticsearch.ad.rest.RestDeleteAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.rest.RestExecuteAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.rest.RestGetAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.rest.RestIndexAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.rest.RestPreviewAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.rest.RestSearchADTasksAction; -import com.amazon.opendistroforelasticsearch.ad.rest.RestSearchAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.rest.RestSearchAnomalyDetectorInfoAction; -import com.amazon.opendistroforelasticsearch.ad.rest.RestSearchAnomalyResultAction; -import com.amazon.opendistroforelasticsearch.ad.rest.RestStatsAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStat; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStats; -import com.amazon.opendistroforelasticsearch.ad.stats.StatNames; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.CounterSupplier; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.IndexStatusSupplier; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.ModelsOnNodeSupplier; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.SettableSupplier; -import com.amazon.opendistroforelasticsearch.ad.task.ADBatchTaskRunner; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskCacheManager; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; -import com.amazon.opendistroforelasticsearch.ad.transport.ADBatchAnomalyResultAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADBatchAnomalyResultTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADBatchTaskRemoteExecutionAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADBatchTaskRemoteExecutionTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADCancelTaskAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADCancelTaskTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADResultBulkAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADResultBulkTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADStatsNodesAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADStatsNodesTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADTaskProfileAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADTaskProfileTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyDetectorJobAction; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyDetectorJobTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyResultAction; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyResultTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.CronAction; -import com.amazon.opendistroforelasticsearch.ad.transport.CronTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.DeleteAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.transport.DeleteAnomalyDetectorTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.DeleteModelAction; -import com.amazon.opendistroforelasticsearch.ad.transport.DeleteModelTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.EntityProfileAction; -import com.amazon.opendistroforelasticsearch.ad.transport.EntityProfileTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.EntityResultAction; -import com.amazon.opendistroforelasticsearch.ad.transport.EntityResultTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ForwardADTaskAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ForwardADTaskTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.GetAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.transport.GetAnomalyDetectorTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.IndexAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.transport.IndexAnomalyDetectorTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.PreviewAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.transport.PreviewAnomalyDetectorTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ProfileAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ProfileTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.RCFPollingAction; -import com.amazon.opendistroforelasticsearch.ad.transport.RCFPollingTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.RCFResultAction; -import com.amazon.opendistroforelasticsearch.ad.transport.RCFResultTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.SearchADTasksAction; -import com.amazon.opendistroforelasticsearch.ad.transport.SearchADTasksTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.SearchAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.transport.SearchAnomalyDetectorInfoAction; -import com.amazon.opendistroforelasticsearch.ad.transport.SearchAnomalyDetectorInfoTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.SearchAnomalyDetectorTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.SearchAnomalyResultAction; -import com.amazon.opendistroforelasticsearch.ad.transport.SearchAnomalyResultTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.StatsAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.transport.StatsAnomalyDetectorTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ThresholdResultAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ThresholdResultTransportAction; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.ADSearchHandler; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.AnomalyIndexHandler; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.AnomalyResultBulkIndexHandler; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.DetectionStateHandler; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.MultiEntityResultHandler; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; -import com.amazon.opendistroforelasticsearch.ad.util.Throttler; -import com.amazon.opendistroforelasticsearch.ad.util.ThrowingConsumerWrapper; import com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobSchedulerExtension; import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParser; import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobRunner; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorProfileRunner.java b/src/main/java/org/opensearch/ad/AnomalyDetectorProfileRunner.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorProfileRunner.java rename to src/main/java/org/opensearch/ad/AnomalyDetectorProfileRunner.java index ef6d464f5..1e5ddf037 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorProfileRunner.java +++ b/src/main/java/org/opensearch/ad/AnomalyDetectorProfileRunner.java @@ -24,10 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; +import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; +import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; @@ -45,6 +45,28 @@ import org.opensearch.action.get.GetResponse; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; +import org.opensearch.ad.common.exception.ResourceNotFoundException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.model.DetectorInternalState; +import org.opensearch.ad.model.DetectorProfile; +import org.opensearch.ad.model.DetectorProfileName; +import org.opensearch.ad.model.DetectorState; +import org.opensearch.ad.model.InitProgressProfile; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.task.ADTaskManager; +import org.opensearch.ad.transport.ProfileAction; +import org.opensearch.ad.transport.ProfileRequest; +import org.opensearch.ad.transport.ProfileResponse; +import org.opensearch.ad.transport.RCFPollingAction; +import org.opensearch.ad.transport.RCFPollingRequest; +import org.opensearch.ad.transport.RCFPollingResponse; +import org.opensearch.ad.util.DiscoveryNodeFilterer; +import org.opensearch.ad.util.ExceptionUtil; +import org.opensearch.ad.util.MultiResponsesDelegateActionListener; import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.xcontent.LoggingDeprecationHandler; @@ -62,29 +84,6 @@ import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.common.exception.ResourceNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorInternalState; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfile; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfileName; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorState; -import com.amazon.opendistroforelasticsearch.ad.model.InitProgressProfile; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; -import com.amazon.opendistroforelasticsearch.ad.transport.ProfileAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ProfileRequest; -import com.amazon.opendistroforelasticsearch.ad.transport.ProfileResponse; -import com.amazon.opendistroforelasticsearch.ad.transport.RCFPollingAction; -import com.amazon.opendistroforelasticsearch.ad.transport.RCFPollingRequest; -import com.amazon.opendistroforelasticsearch.ad.transport.RCFPollingResponse; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; -import com.amazon.opendistroforelasticsearch.ad.util.ExceptionUtil; -import com.amazon.opendistroforelasticsearch.ad.util.MultiResponsesDelegateActionListener; - public class AnomalyDetectorProfileRunner extends AbstractProfileRunner { private final Logger logger = LogManager.getLogger(AnomalyDetectorProfileRunner.class); private Client client; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorRunner.java b/src/main/java/org/opensearch/ad/AnomalyDetectorRunner.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorRunner.java rename to src/main/java/org/opensearch/ad/AnomalyDetectorRunner.java index 0aaf36cd4..24e8046c5 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorRunner.java +++ b/src/main/java/org/opensearch/ad/AnomalyDetectorRunner.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import java.io.IOException; import java.time.Instant; @@ -39,19 +39,18 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.feature.Features; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ThresholdingResult; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.model.Entity; -import com.amazon.opendistroforelasticsearch.ad.model.EntityAnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.model.Feature; -import com.amazon.opendistroforelasticsearch.ad.model.FeatureData; -import com.amazon.opendistroforelasticsearch.ad.util.MultiResponsesDelegateActionListener; +import org.opensearch.ad.constant.CommonValue; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.feature.Features; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.ThresholdingResult; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.model.Entity; +import org.opensearch.ad.model.EntityAnomalyResult; +import org.opensearch.ad.model.Feature; +import org.opensearch.ad.model.FeatureData; +import org.opensearch.ad.util.MultiResponsesDelegateActionListener; /** * Runner to trigger an anomaly detector. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/CleanState.java b/src/main/java/org/opensearch/ad/CleanState.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/CleanState.java rename to src/main/java/org/opensearch/ad/CleanState.java index f19801a34..4b0667b5e 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/CleanState.java +++ b/src/main/java/org/opensearch/ad/CleanState.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; /** * Represent a state organized via detectorId. When deleting a detector's state, diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/DetectorModelSize.java b/src/main/java/org/opensearch/ad/DetectorModelSize.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/DetectorModelSize.java rename to src/main/java/org/opensearch/ad/DetectorModelSize.java index 5781eb9d0..fb8adb345 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/DetectorModelSize.java +++ b/src/main/java/org/opensearch/ad/DetectorModelSize.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import java.util.Map; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/EntityModelSize.java b/src/main/java/org/opensearch/ad/EntityModelSize.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/EntityModelSize.java rename to src/main/java/org/opensearch/ad/EntityModelSize.java index 1eef9e3d1..3233fce99 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/EntityModelSize.java +++ b/src/main/java/org/opensearch/ad/EntityModelSize.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; public interface EntityModelSize { /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/EntityProfileRunner.java b/src/main/java/org/opensearch/ad/EntityProfileRunner.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/EntityProfileRunner.java rename to src/main/java/org/opensearch/ad/EntityProfileRunner.java index 4ec3e5e80..1d2d1b623 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/EntityProfileRunner.java +++ b/src/main/java/org/opensearch/ad/EntityProfileRunner.java @@ -24,11 +24,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.CATEGORY_FIELD_LIMIT; +import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; +import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.CATEGORY_FIELD_LIMIT; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.security.InvalidParameterException; @@ -42,6 +42,21 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.get.GetRequest; import org.opensearch.action.search.SearchRequest; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.model.EntityProfile; +import org.opensearch.ad.model.EntityProfileName; +import org.opensearch.ad.model.EntityState; +import org.opensearch.ad.model.InitProgressProfile; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.transport.EntityProfileAction; +import org.opensearch.ad.transport.EntityProfileRequest; +import org.opensearch.ad.transport.EntityProfileResponse; +import org.opensearch.ad.util.MultiResponsesDelegateActionListener; +import org.opensearch.ad.util.ParseUtils; import org.opensearch.client.Client; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.opensearch.common.xcontent.NamedXContentRegistry; @@ -55,22 +70,6 @@ import org.opensearch.search.aggregations.AggregationBuilders; import org.opensearch.search.builder.SearchSourceBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.model.EntityProfile; -import com.amazon.opendistroforelasticsearch.ad.model.EntityProfileName; -import com.amazon.opendistroforelasticsearch.ad.model.EntityState; -import com.amazon.opendistroforelasticsearch.ad.model.InitProgressProfile; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.transport.EntityProfileAction; -import com.amazon.opendistroforelasticsearch.ad.transport.EntityProfileRequest; -import com.amazon.opendistroforelasticsearch.ad.transport.EntityProfileResponse; -import com.amazon.opendistroforelasticsearch.ad.util.MultiResponsesDelegateActionListener; -import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils; - public class EntityProfileRunner extends AbstractProfileRunner { private final Logger logger = LogManager.getLogger(EntityProfileRunner.class); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ExpiringState.java b/src/main/java/org/opensearch/ad/ExpiringState.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/ExpiringState.java rename to src/main/java/org/opensearch/ad/ExpiringState.java index 52eab6dfb..d25134426 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ExpiringState.java +++ b/src/main/java/org/opensearch/ad/ExpiringState.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import java.time.Duration; import java.time.Instant; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/MaintenanceState.java b/src/main/java/org/opensearch/ad/MaintenanceState.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/MaintenanceState.java rename to src/main/java/org/opensearch/ad/MaintenanceState.java index 010cd4fbb..284fda6f9 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/MaintenanceState.java +++ b/src/main/java/org/opensearch/ad/MaintenanceState.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import java.time.Duration; import java.util.Map; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/MemoryTracker.java b/src/main/java/org/opensearch/ad/MemoryTracker.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/MemoryTracker.java rename to src/main/java/org/opensearch/ad/MemoryTracker.java index efcf40540..8904cd13f 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/MemoryTracker.java +++ b/src/main/java/org/opensearch/ad/MemoryTracker.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MODEL_MAX_SIZE_PERCENTAGE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MODEL_MAX_SIZE_PERCENTAGE; import java.util.EnumMap; import java.util.Locale; @@ -34,11 +34,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.cluster.service.ClusterService; import org.opensearch.monitor.jvm.JvmService; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; import com.amazon.randomcutforest.RandomCutForest; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/Name.java b/src/main/java/org/opensearch/ad/Name.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/Name.java rename to src/main/java/org/opensearch/ad/Name.java index f6bbf528e..af0b6b128 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/Name.java +++ b/src/main/java/org/opensearch/ad/Name.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import java.util.Collection; import java.util.HashSet; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/NodeState.java b/src/main/java/org/opensearch/ad/NodeState.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/NodeState.java rename to src/main/java/org/opensearch/ad/NodeState.java index 36647d215..b2b0eaaf1 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/NodeState.java +++ b/src/main/java/org/opensearch/ad/NodeState.java @@ -24,15 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import java.time.Clock; import java.time.Duration; import java.time.Instant; import java.util.Optional; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.model.AnomalyDetector; /** * Storing intermediate state during the execution of transport action diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/NodeStateManager.java b/src/main/java/org/opensearch/ad/NodeStateManager.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/NodeStateManager.java rename to src/main/java/org/opensearch/ad/NodeStateManager.java index 7f47d6f23..915468d7a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/NodeStateManager.java +++ b/src/main/java/org/opensearch/ad/NodeStateManager.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; @@ -40,6 +40,15 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.ml.ModelPartitioner; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.transport.BackPressureRouting; +import org.opensearch.ad.util.ClientUtil; import org.opensearch.client.Client; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Settings; @@ -48,16 +57,6 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelPartitioner; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.transport.BackPressureRouting; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; - /** * NodeStateManager is used to manage states shared by transport and ml components * like AnomalyDetector object diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/annotation/Generated.java b/src/main/java/org/opensearch/ad/annotation/Generated.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/annotation/Generated.java rename to src/main/java/org/opensearch/ad/annotation/Generated.java index 702313e99..b858c9760 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/annotation/Generated.java +++ b/src/main/java/org/opensearch/ad/annotation/Generated.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.annotation; +package org.opensearch.ad.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/ADCircuitBreakerService.java b/src/main/java/org/opensearch/ad/breaker/ADCircuitBreakerService.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/ADCircuitBreakerService.java rename to src/main/java/org/opensearch/ad/breaker/ADCircuitBreakerService.java index 0a0776fc1..21dcda9ed 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/ADCircuitBreakerService.java +++ b/src/main/java/org/opensearch/ad/breaker/ADCircuitBreakerService.java @@ -24,17 +24,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.breaker; +package org.opensearch.ad.breaker; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.ad.settings.EnabledSetting; import org.opensearch.monitor.jvm.JvmService; -import com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting; - /** * Class {@code ADCircuitBreakerService} provide storing, retrieving circuit breakers functions. * diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/BreakerName.java b/src/main/java/org/opensearch/ad/breaker/BreakerName.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/BreakerName.java rename to src/main/java/org/opensearch/ad/breaker/BreakerName.java index f15fce953..cecbbecb0 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/BreakerName.java +++ b/src/main/java/org/opensearch/ad/breaker/BreakerName.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.breaker; +package org.opensearch.ad.breaker; public enum BreakerName { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/CircuitBreaker.java b/src/main/java/org/opensearch/ad/breaker/CircuitBreaker.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/CircuitBreaker.java rename to src/main/java/org/opensearch/ad/breaker/CircuitBreaker.java index dfdb09799..7f7342c17 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/CircuitBreaker.java +++ b/src/main/java/org/opensearch/ad/breaker/CircuitBreaker.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.breaker; +package org.opensearch.ad.breaker; /** * An interface for circuit breaker. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/MemoryCircuitBreaker.java b/src/main/java/org/opensearch/ad/breaker/MemoryCircuitBreaker.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/MemoryCircuitBreaker.java rename to src/main/java/org/opensearch/ad/breaker/MemoryCircuitBreaker.java index ec9812960..9675245f2 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/MemoryCircuitBreaker.java +++ b/src/main/java/org/opensearch/ad/breaker/MemoryCircuitBreaker.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.breaker; +package org.opensearch.ad.breaker; import org.opensearch.monitor.jvm.JvmService; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/ThresholdCircuitBreaker.java b/src/main/java/org/opensearch/ad/breaker/ThresholdCircuitBreaker.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/ThresholdCircuitBreaker.java rename to src/main/java/org/opensearch/ad/breaker/ThresholdCircuitBreaker.java index 276d43f53..a539f09bd 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/breaker/ThresholdCircuitBreaker.java +++ b/src/main/java/org/opensearch/ad/breaker/ThresholdCircuitBreaker.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.breaker; +package org.opensearch.ad.breaker; /** * An abstract class for all breakers with threshold. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/CacheBuffer.java b/src/main/java/org/opensearch/ad/caching/CacheBuffer.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/CacheBuffer.java rename to src/main/java/org/opensearch/ad/caching/CacheBuffer.java index 6c95cacc9..43a668433 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/CacheBuffer.java +++ b/src/main/java/org/opensearch/ad/caching/CacheBuffer.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.caching; +package org.opensearch.ad.caching; import java.time.Clock; import java.time.Duration; @@ -39,15 +39,14 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -import com.amazon.opendistroforelasticsearch.ad.ExpiringState; -import com.amazon.opendistroforelasticsearch.ad.MaintenanceState; -import com.amazon.opendistroforelasticsearch.ad.MemoryTracker; -import com.amazon.opendistroforelasticsearch.ad.MemoryTracker.Origin; -import com.amazon.opendistroforelasticsearch.ad.ml.CheckpointDao; -import com.amazon.opendistroforelasticsearch.ad.ml.EntityModel; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelState; -import com.amazon.opendistroforelasticsearch.ad.model.InitProgressProfile; +import org.opensearch.ad.ExpiringState; +import org.opensearch.ad.MaintenanceState; +import org.opensearch.ad.MemoryTracker; +import org.opensearch.ad.MemoryTracker.Origin; +import org.opensearch.ad.ml.CheckpointDao; +import org.opensearch.ad.ml.EntityModel; +import org.opensearch.ad.ml.ModelState; +import org.opensearch.ad.model.InitProgressProfile; /** * We use a layered cache to manage active entities’ states. We have a two-level diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/CacheProvider.java b/src/main/java/org/opensearch/ad/caching/CacheProvider.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/CacheProvider.java rename to src/main/java/org/opensearch/ad/caching/CacheProvider.java index 0cd610fb9..8fa77d435 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/CacheProvider.java +++ b/src/main/java/org/opensearch/ad/caching/CacheProvider.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.caching; +package org.opensearch.ad.caching; import org.opensearch.common.inject.Provider; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/DoorKeeper.java b/src/main/java/org/opensearch/ad/caching/DoorKeeper.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/DoorKeeper.java rename to src/main/java/org/opensearch/ad/caching/DoorKeeper.java index 494225061..f1f15d2a8 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/DoorKeeper.java +++ b/src/main/java/org/opensearch/ad/caching/DoorKeeper.java @@ -24,14 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.caching; +package org.opensearch.ad.caching; import java.time.Clock; import java.time.Duration; import java.time.Instant; -import com.amazon.opendistroforelasticsearch.ad.ExpiringState; -import com.amazon.opendistroforelasticsearch.ad.MaintenanceState; +import org.opensearch.ad.ExpiringState; +import org.opensearch.ad.MaintenanceState; + import com.google.common.base.Charsets; import com.google.common.hash.BloomFilter; import com.google.common.hash.Funnels; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/EntityCache.java b/src/main/java/org/opensearch/ad/caching/EntityCache.java similarity index 87% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/EntityCache.java rename to src/main/java/org/opensearch/ad/caching/EntityCache.java index e8d4212f4..06b108902 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/EntityCache.java +++ b/src/main/java/org/opensearch/ad/caching/EntityCache.java @@ -24,17 +24,17 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.caching; +package org.opensearch.ad.caching; import java.util.List; -import com.amazon.opendistroforelasticsearch.ad.CleanState; -import com.amazon.opendistroforelasticsearch.ad.DetectorModelSize; -import com.amazon.opendistroforelasticsearch.ad.EntityModelSize; -import com.amazon.opendistroforelasticsearch.ad.MaintenanceState; -import com.amazon.opendistroforelasticsearch.ad.ml.EntityModel; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelState; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; +import org.opensearch.ad.CleanState; +import org.opensearch.ad.DetectorModelSize; +import org.opensearch.ad.EntityModelSize; +import org.opensearch.ad.MaintenanceState; +import org.opensearch.ad.ml.EntityModel; +import org.opensearch.ad.ml.ModelState; +import org.opensearch.ad.model.AnomalyDetector; public interface EntityCache extends MaintenanceState, CleanState, DetectorModelSize, EntityModelSize { /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/PriorityCache.java b/src/main/java/org/opensearch/ad/caching/PriorityCache.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/PriorityCache.java rename to src/main/java/org/opensearch/ad/caching/PriorityCache.java index a96f7d550..d71dfdf18 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/PriorityCache.java +++ b/src/main/java/org/opensearch/ad/caching/PriorityCache.java @@ -24,10 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.caching; +package org.opensearch.ad.caching; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.COOLDOWN_MINUTES; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_CACHE_MISS_HANDLING_PER_SECOND; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.COOLDOWN_MINUTES; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_CACHE_MISS_HANDLING_PER_SECOND; import java.time.Clock; import java.time.Duration; @@ -54,24 +54,24 @@ import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; import org.opensearch.action.support.TransportActions; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.MemoryTracker; +import org.opensearch.ad.MemoryTracker.Origin; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.ml.CheckpointDao; +import org.opensearch.ad.ml.EntityModel; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.ModelManager.ModelType; +import org.opensearch.ad.ml.ModelState; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.index.IndexNotFoundException; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.MemoryTracker; -import com.amazon.opendistroforelasticsearch.ad.MemoryTracker.Origin; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.ml.CheckpointDao; -import com.amazon.opendistroforelasticsearch.ad.ml.EntityModel; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager.ModelType; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelState; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.util.concurrent.RateLimiter; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/PriorityTracker.java b/src/main/java/org/opensearch/ad/caching/PriorityTracker.java similarity index 99% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/PriorityTracker.java rename to src/main/java/org/opensearch/ad/caching/PriorityTracker.java index 4f5cbfbf5..aecdf7ae1 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/caching/PriorityTracker.java +++ b/src/main/java/org/opensearch/ad/caching/PriorityTracker.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.caching; +package org.opensearch.ad.caching; import java.time.Clock; import java.util.AbstractMap.SimpleImmutableEntry; @@ -42,8 +42,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -import com.amazon.opendistroforelasticsearch.ad.annotation.Generated; +import org.opensearch.ad.annotation.Generated; /** * A priority tracker for entities. Read docs/entity-priority.pdf for details. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/ADClusterEventListener.java b/src/main/java/org/opensearch/ad/cluster/ADClusterEventListener.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/ADClusterEventListener.java rename to src/main/java/org/opensearch/ad/cluster/ADClusterEventListener.java index 477acb9bf..a32db44ca 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/ADClusterEventListener.java +++ b/src/main/java/org/opensearch/ad/cluster/ADClusterEventListener.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.cluster; +package org.opensearch.ad.cluster; import java.util.Optional; import java.util.Set; @@ -32,6 +32,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.cluster.ClusterChangedEvent; import org.opensearch.cluster.ClusterStateListener; import org.opensearch.cluster.node.DiscoveryNode; @@ -40,9 +42,6 @@ import org.opensearch.common.inject.Inject; import org.opensearch.gateway.GatewayService; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; - public class ADClusterEventListener implements ClusterStateListener { private static final Logger LOG = LogManager.getLogger(ADClusterEventListener.class); static final String NODE_NOT_APPLIED_MSG = "AD does not use master or ultrawarm nodes"; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/DailyCron.java b/src/main/java/org/opensearch/ad/cluster/DailyCron.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/DailyCron.java rename to src/main/java/org/opensearch/ad/cluster/DailyCron.java index 24ab5978d..097ee3d3f 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/DailyCron.java +++ b/src/main/java/org/opensearch/ad/cluster/DailyCron.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.cluster; +package org.opensearch.ad.cluster; import java.time.Clock; import java.time.Duration; @@ -33,15 +33,14 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; import org.opensearch.action.support.IndicesOptions; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.ml.CheckpointDao; +import org.opensearch.ad.util.ClientUtil; import org.opensearch.index.IndexNotFoundException; import org.opensearch.index.query.QueryBuilders; import org.opensearch.index.reindex.DeleteByQueryAction; import org.opensearch.index.reindex.DeleteByQueryRequest; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.ml.CheckpointDao; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; - @Deprecated public class DailyCron implements Runnable { private static final Logger LOG = LogManager.getLogger(DailyCron.class); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/HashRing.java b/src/main/java/org/opensearch/ad/cluster/HashRing.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/HashRing.java rename to src/main/java/org/opensearch/ad/cluster/HashRing.java index 59f141a24..fe5fc9766 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/HashRing.java +++ b/src/main/java/org/opensearch/ad/cluster/HashRing.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.cluster; +package org.opensearch.ad.cluster; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.COOLDOWN_MINUTES; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.COOLDOWN_MINUTES; import java.time.Clock; import java.util.Map; @@ -37,13 +37,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.routing.Murmur3HashFunction; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; - public class HashRing { private static final Logger LOG = LogManager.getLogger(HashRing.class); static final String REBUILD_MSG = "Rebuild hash ring"; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/HourlyCron.java b/src/main/java/org/opensearch/ad/cluster/HourlyCron.java similarity index 90% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/HourlyCron.java rename to src/main/java/org/opensearch/ad/cluster/HourlyCron.java index df0f61cb6..8c99601ae 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/HourlyCron.java +++ b/src/main/java/org/opensearch/ad/cluster/HourlyCron.java @@ -24,19 +24,18 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.cluster; +package org.opensearch.ad.cluster; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; import org.opensearch.action.FailedNodeException; +import org.opensearch.ad.transport.CronAction; +import org.opensearch.ad.transport.CronRequest; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; -import com.amazon.opendistroforelasticsearch.ad.transport.CronAction; -import com.amazon.opendistroforelasticsearch.ad.transport.CronRequest; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; - public class HourlyCron implements Runnable { private static final Logger LOG = LogManager.getLogger(HourlyCron.class); static final String SUCCEEDS_LOG_MSG = "Hourly maintenance succeeds"; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/MasterEventListener.java b/src/main/java/org/opensearch/ad/cluster/MasterEventListener.java similarity index 89% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/MasterEventListener.java rename to src/main/java/org/opensearch/ad/cluster/MasterEventListener.java index 725f1bbd9..511ed42a8 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/MasterEventListener.java +++ b/src/main/java/org/opensearch/ad/cluster/MasterEventListener.java @@ -24,10 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.cluster; +package org.opensearch.ad.cluster; import java.time.Clock; +import org.opensearch.ad.cluster.diskcleanup.IndexCleanup; +import org.opensearch.ad.cluster.diskcleanup.ModelCheckpointIndexRetention; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.client.Client; import org.opensearch.cluster.LocalNodeMasterListener; import org.opensearch.cluster.service.ClusterService; @@ -36,11 +41,6 @@ import org.opensearch.threadpool.Scheduler.Cancellable; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.cluster.diskcleanup.IndexCleanup; -import com.amazon.opendistroforelasticsearch.ad.cluster.diskcleanup.ModelCheckpointIndexRetention; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; import com.google.common.annotations.VisibleForTesting; public class MasterEventListener implements LocalNodeMasterListener { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/diskcleanup/IndexCleanup.java b/src/main/java/org/opensearch/ad/cluster/diskcleanup/IndexCleanup.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/diskcleanup/IndexCleanup.java rename to src/main/java/org/opensearch/ad/cluster/diskcleanup/IndexCleanup.java index afb8172b4..9a454b198 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/diskcleanup/IndexCleanup.java +++ b/src/main/java/org/opensearch/ad/cluster/diskcleanup/IndexCleanup.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.cluster.diskcleanup; +package org.opensearch.ad.cluster.diskcleanup; import java.util.Arrays; import java.util.Objects; @@ -37,6 +37,7 @@ import org.opensearch.action.admin.indices.stats.IndicesStatsResponse; import org.opensearch.action.admin.indices.stats.ShardStats; import org.opensearch.action.support.IndicesOptions; +import org.opensearch.ad.util.ClientUtil; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.util.concurrent.ThreadContext; @@ -45,8 +46,6 @@ import org.opensearch.index.reindex.DeleteByQueryRequest; import org.opensearch.index.store.StoreStats; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; - /** * Clean up the old docs for indices. */ diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetention.java b/src/main/java/org/opensearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetention.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetention.java rename to src/main/java/org/opensearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetention.java index 1bb9c5083..57468f4d5 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetention.java +++ b/src/main/java/org/opensearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetention.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.cluster.diskcleanup; +package org.opensearch.ad.cluster.diskcleanup; import java.time.Clock; import java.time.Duration; @@ -32,11 +32,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.ml.CheckpointDao; import org.opensearch.index.query.QueryBuilders; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.ml.CheckpointDao; - /** * Model checkpoints cleanup of multi-entity detectors. *

Problem: diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/ADTaskCancelledException.java b/src/main/java/org/opensearch/ad/common/exception/ADTaskCancelledException.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/ADTaskCancelledException.java rename to src/main/java/org/opensearch/ad/common/exception/ADTaskCancelledException.java index efba560ae..d7612caaa 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/ADTaskCancelledException.java +++ b/src/main/java/org/opensearch/ad/common/exception/ADTaskCancelledException.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.common.exception; +package org.opensearch.ad.common.exception; public class ADTaskCancelledException extends AnomalyDetectionException { private String cancelledBy; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/AnomalyDetectionException.java b/src/main/java/org/opensearch/ad/common/exception/AnomalyDetectionException.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/AnomalyDetectionException.java rename to src/main/java/org/opensearch/ad/common/exception/AnomalyDetectionException.java index 21d7b6bb9..f19f7f0fb 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/AnomalyDetectionException.java +++ b/src/main/java/org/opensearch/ad/common/exception/AnomalyDetectionException.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.common.exception; +package org.opensearch.ad.common.exception; /** * Base exception for exceptions thrown from Anomaly Detection. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/ClientException.java b/src/main/java/org/opensearch/ad/common/exception/ClientException.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/ClientException.java rename to src/main/java/org/opensearch/ad/common/exception/ClientException.java index 0ec972e82..61e465f25 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/ClientException.java +++ b/src/main/java/org/opensearch/ad/common/exception/ClientException.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.common.exception; +package org.opensearch.ad.common.exception; /** * All exception visible to AD transport layer's client is under ClientException. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/DuplicateTaskException.java b/src/main/java/org/opensearch/ad/common/exception/DuplicateTaskException.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/DuplicateTaskException.java rename to src/main/java/org/opensearch/ad/common/exception/DuplicateTaskException.java index f1a4797ff..42ea39e1b 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/DuplicateTaskException.java +++ b/src/main/java/org/opensearch/ad/common/exception/DuplicateTaskException.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.common.exception; +package org.opensearch.ad.common.exception; public class DuplicateTaskException extends AnomalyDetectionException { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/EndRunException.java b/src/main/java/org/opensearch/ad/common/exception/EndRunException.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/EndRunException.java rename to src/main/java/org/opensearch/ad/common/exception/EndRunException.java index fefa84df2..ade1de4de 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/EndRunException.java +++ b/src/main/java/org/opensearch/ad/common/exception/EndRunException.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.common.exception; +package org.opensearch.ad.common.exception; /** * Exception for failures that might impact the customer. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/InternalFailure.java b/src/main/java/org/opensearch/ad/common/exception/InternalFailure.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/InternalFailure.java rename to src/main/java/org/opensearch/ad/common/exception/InternalFailure.java index 7983502a9..c857bbe42 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/InternalFailure.java +++ b/src/main/java/org/opensearch/ad/common/exception/InternalFailure.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.common.exception; +package org.opensearch.ad.common.exception; /** * Exception for root cause unknown failure. Maybe transient. Client can continue the detector running. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/LimitExceededException.java b/src/main/java/org/opensearch/ad/common/exception/LimitExceededException.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/LimitExceededException.java rename to src/main/java/org/opensearch/ad/common/exception/LimitExceededException.java index ca947779f..0d348328e 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/LimitExceededException.java +++ b/src/main/java/org/opensearch/ad/common/exception/LimitExceededException.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.common.exception; +package org.opensearch.ad.common.exception; /** * This exception is thrown when a user/system limit is exceeded. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/ResourceNotFoundException.java b/src/main/java/org/opensearch/ad/common/exception/ResourceNotFoundException.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/ResourceNotFoundException.java rename to src/main/java/org/opensearch/ad/common/exception/ResourceNotFoundException.java index 6553714e9..f1dbcb28e 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/common/exception/ResourceNotFoundException.java +++ b/src/main/java/org/opensearch/ad/common/exception/ResourceNotFoundException.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.common.exception; +package org.opensearch.ad.common.exception; /** * This exception is thrown when a resource is not found. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/constant/CommonErrorMessages.java b/src/main/java/org/opensearch/ad/constant/CommonErrorMessages.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/constant/CommonErrorMessages.java rename to src/main/java/org/opensearch/ad/constant/CommonErrorMessages.java index 851fa8721..1dad91cf3 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/constant/CommonErrorMessages.java +++ b/src/main/java/org/opensearch/ad/constant/CommonErrorMessages.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.constant; +package org.opensearch.ad.constant; public class CommonErrorMessages { public static final String AD_ID_MISSING_MSG = "AD ID is missing"; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/constant/CommonMessageAttributes.java b/src/main/java/org/opensearch/ad/constant/CommonMessageAttributes.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/constant/CommonMessageAttributes.java rename to src/main/java/org/opensearch/ad/constant/CommonMessageAttributes.java index 1f2ab972f..ed8840d6f 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/constant/CommonMessageAttributes.java +++ b/src/main/java/org/opensearch/ad/constant/CommonMessageAttributes.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.constant; +package org.opensearch.ad.constant; public class CommonMessageAttributes { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/constant/CommonName.java b/src/main/java/org/opensearch/ad/constant/CommonName.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/constant/CommonName.java rename to src/main/java/org/opensearch/ad/constant/CommonName.java index e984bf2b2..e29e56e76 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/constant/CommonName.java +++ b/src/main/java/org/opensearch/ad/constant/CommonName.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.constant; +package org.opensearch.ad.constant; public class CommonName { // ====================================== diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/constant/CommonValue.java b/src/main/java/org/opensearch/ad/constant/CommonValue.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/constant/CommonValue.java rename to src/main/java/org/opensearch/ad/constant/CommonValue.java index f523742b9..2512a9f46 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/constant/CommonValue.java +++ b/src/main/java/org/opensearch/ad/constant/CommonValue.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.constant; +package org.opensearch.ad.constant; public class CommonValue { // unknown or no schema version diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/IntegerSensitiveSingleFeatureLinearUniformInterpolator.java b/src/main/java/org/opensearch/ad/dataprocessor/IntegerSensitiveSingleFeatureLinearUniformInterpolator.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/IntegerSensitiveSingleFeatureLinearUniformInterpolator.java rename to src/main/java/org/opensearch/ad/dataprocessor/IntegerSensitiveSingleFeatureLinearUniformInterpolator.java index 23138716f..79bfe7d8e 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/IntegerSensitiveSingleFeatureLinearUniformInterpolator.java +++ b/src/main/java/org/opensearch/ad/dataprocessor/IntegerSensitiveSingleFeatureLinearUniformInterpolator.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.dataprocessor; +package org.opensearch.ad.dataprocessor; import java.util.Arrays; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/Interpolator.java b/src/main/java/org/opensearch/ad/dataprocessor/Interpolator.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/Interpolator.java rename to src/main/java/org/opensearch/ad/dataprocessor/Interpolator.java index 0831cc3c8..4734f947f 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/Interpolator.java +++ b/src/main/java/org/opensearch/ad/dataprocessor/Interpolator.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.dataprocessor; +package org.opensearch.ad.dataprocessor; /* * An object for interpolating feature vectors. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/LinearUniformInterpolator.java b/src/main/java/org/opensearch/ad/dataprocessor/LinearUniformInterpolator.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/LinearUniformInterpolator.java rename to src/main/java/org/opensearch/ad/dataprocessor/LinearUniformInterpolator.java index e469d1b97..5319176de 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/LinearUniformInterpolator.java +++ b/src/main/java/org/opensearch/ad/dataprocessor/LinearUniformInterpolator.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.dataprocessor; +package org.opensearch.ad.dataprocessor; /* * A piecewise linear interpolator with uniformly spaced points. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/SingleFeatureLinearUniformInterpolator.java b/src/main/java/org/opensearch/ad/dataprocessor/SingleFeatureLinearUniformInterpolator.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/SingleFeatureLinearUniformInterpolator.java rename to src/main/java/org/opensearch/ad/dataprocessor/SingleFeatureLinearUniformInterpolator.java index ab7060d84..b920982d7 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/SingleFeatureLinearUniformInterpolator.java +++ b/src/main/java/org/opensearch/ad/dataprocessor/SingleFeatureLinearUniformInterpolator.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.dataprocessor; +package org.opensearch.ad.dataprocessor; import java.util.Arrays; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/feature/FeatureManager.java b/src/main/java/org/opensearch/ad/feature/FeatureManager.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/feature/FeatureManager.java rename to src/main/java/org/opensearch/ad/feature/FeatureManager.java index 1515c35d4..f076c04a3 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/feature/FeatureManager.java +++ b/src/main/java/org/opensearch/ad/feature/FeatureManager.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.feature; +package org.opensearch.ad.feature; import static java.util.Arrays.copyOfRange; import static org.apache.commons.math3.linear.MatrixUtils.createRealMatrix; @@ -55,15 +55,14 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ThreadedActionListener; +import org.opensearch.ad.CleanState; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.dataprocessor.Interpolator; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.Entity; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.CleanState; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.Interpolator; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.Entity; - /** * A facade managing feature data operations and buffers. */ diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/feature/Features.java b/src/main/java/org/opensearch/ad/feature/Features.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/feature/Features.java rename to src/main/java/org/opensearch/ad/feature/Features.java index 1982ae698..1366a63d0 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/feature/Features.java +++ b/src/main/java/org/opensearch/ad/feature/Features.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.feature; +package org.opensearch.ad.feature; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/feature/SearchFeatureDao.java b/src/main/java/org/opensearch/ad/feature/SearchFeatureDao.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/feature/SearchFeatureDao.java rename to src/main/java/org/opensearch/ad/feature/SearchFeatureDao.java index 2da725fe2..2e70de334 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/feature/SearchFeatureDao.java +++ b/src/main/java/org/opensearch/ad/feature/SearchFeatureDao.java @@ -24,13 +24,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.feature; +package org.opensearch.ad.feature; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonName.DATE_HISTOGRAM; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_ENTITIES_FOR_PREVIEW; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_ENTITIES_PER_QUERY; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.batchFeatureQuery; import static org.apache.commons.math3.linear.MatrixUtils.createRealMatrix; +import static org.opensearch.ad.constant.CommonName.DATE_HISTOGRAM; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_ENTITIES_FOR_PREVIEW; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_ENTITIES_PER_QUERY; +import static org.opensearch.ad.util.ParseUtils.batchFeatureQuery; import java.io.IOException; import java.util.AbstractMap.SimpleEntry; @@ -54,6 +54,17 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.ThreadedActionListener; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.dataprocessor.Interpolator; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.Entity; +import org.opensearch.ad.model.Feature; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.ParseUtils; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; @@ -80,18 +91,6 @@ import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.Interpolator; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.Entity; -import com.amazon.opendistroforelasticsearch.ad.model.Feature; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils; - /** * DAO for features from search. */ diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/feature/SinglePointFeatures.java b/src/main/java/org/opensearch/ad/feature/SinglePointFeatures.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/feature/SinglePointFeatures.java rename to src/main/java/org/opensearch/ad/feature/SinglePointFeatures.java index db57cf3d0..1d553d84e 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/feature/SinglePointFeatures.java +++ b/src/main/java/org/opensearch/ad/feature/SinglePointFeatures.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.feature; +package org.opensearch.ad.feature; import java.util.Optional; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/indices/ADIndex.java b/src/main/java/org/opensearch/ad/indices/ADIndex.java similarity index 88% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/indices/ADIndex.java rename to src/main/java/org/opensearch/ad/indices/ADIndex.java index a900aee33..03368e624 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/indices/ADIndex.java +++ b/src/main/java/org/opensearch/ad/indices/ADIndex.java @@ -24,14 +24,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.indices; +package org.opensearch.ad.indices; import java.util.function.Supplier; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.util.ThrowingSupplierWrapper; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.util.ThrowingSupplierWrapper; /** * Represent an AD index diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/indices/AnomalyDetectionIndices.java b/src/main/java/org/opensearch/ad/indices/AnomalyDetectionIndices.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/indices/AnomalyDetectionIndices.java rename to src/main/java/org/opensearch/ad/indices/AnomalyDetectionIndices.java index 69574d999..9b495be4c 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/indices/AnomalyDetectionIndices.java +++ b/src/main/java/org/opensearch/ad/indices/AnomalyDetectionIndices.java @@ -24,17 +24,17 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.indices; - -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.AD_RESULT_HISTORY_MAX_DOCS; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.AD_RESULT_HISTORY_RETENTION_PERIOD; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.AD_RESULT_HISTORY_ROLLOVER_PERIOD; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.ANOMALY_DETECTION_STATE_INDEX_MAPPING_FILE; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.ANOMALY_DETECTORS_INDEX_MAPPING_FILE; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.ANOMALY_DETECTOR_JOBS_INDEX_MAPPING_FILE; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.ANOMALY_RESULTS_INDEX_MAPPING_FILE; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.CHECKPOINT_INDEX_MAPPING_FILE; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_PRIMARY_SHARDS; +package org.opensearch.ad.indices; + +import static org.opensearch.ad.settings.AnomalyDetectorSettings.AD_RESULT_HISTORY_MAX_DOCS; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.AD_RESULT_HISTORY_RETENTION_PERIOD; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.AD_RESULT_HISTORY_ROLLOVER_PERIOD; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.ANOMALY_DETECTION_STATE_INDEX_MAPPING_FILE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.ANOMALY_DETECTORS_INDEX_MAPPING_FILE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.ANOMALY_DETECTOR_JOBS_INDEX_MAPPING_FILE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.ANOMALY_RESULTS_INDEX_MAPPING_FILE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.CHECKPOINT_INDEX_MAPPING_FILE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_PRIMARY_SHARDS; import java.io.IOException; import java.net.URL; @@ -62,6 +62,12 @@ import org.opensearch.action.admin.indices.rollover.RolloverRequest; import org.opensearch.action.support.GroupedActionListener; import org.opensearch.action.support.IndicesOptions; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.constant.CommonValue; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.client.AdminClient; import org.opensearch.client.Client; import org.opensearch.cluster.LocalNodeMasterListener; @@ -80,12 +86,6 @@ import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; import com.carrotsearch.hppc.cursors.ObjectCursor; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.google.common.base.Charsets; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/CheckpointDao.java b/src/main/java/org/opensearch/ad/ml/CheckpointDao.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/CheckpointDao.java rename to src/main/java/org/opensearch/ad/ml/CheckpointDao.java index 707d8973e..aae0e3974 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/CheckpointDao.java +++ b/src/main/java/org/opensearch/ad/ml/CheckpointDao.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import java.security.AccessController; import java.security.PrivilegedAction; @@ -63,6 +63,11 @@ import org.opensearch.action.index.IndexRequest; import org.opensearch.action.index.IndexResponse; import org.opensearch.action.support.IndicesOptions; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.indices.ADIndex; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.util.BulkUtil; +import org.opensearch.ad.util.ClientUtil; import org.opensearch.client.Client; import org.opensearch.index.IndexNotFoundException; import org.opensearch.index.query.MatchQueryBuilder; @@ -71,11 +76,6 @@ import org.opensearch.index.reindex.DeleteByQueryRequest; import org.opensearch.index.reindex.ScrollableHitSource; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.indices.ADIndex; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.util.BulkUtil; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; import com.amazon.randomcutforest.RandomCutForest; import com.amazon.randomcutforest.serialize.RandomCutForestSerDe; import com.google.common.util.concurrent.RateLimiter; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/EntityColdStarter.java b/src/main/java/org/opensearch/ad/ml/EntityColdStarter.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/EntityColdStarter.java rename to src/main/java/org/opensearch/ad/ml/EntityColdStarter.java index 78bd0fb17..08e33007a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/EntityColdStarter.java +++ b/src/main/java/org/opensearch/ad/ml/EntityColdStarter.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.COOLDOWN_MINUTES; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.COOLDOWN_MINUTES; import java.time.Clock; import java.time.Duration; @@ -51,19 +51,19 @@ import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ThreadedActionListener; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.dataprocessor.Interpolator; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.feature.SearchFeatureDao; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.IntervalTimeConfiguration; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Settings; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.Interpolator; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.feature.SearchFeatureDao; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; import com.amazon.randomcutforest.RandomCutForest; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/EntityModel.java b/src/main/java/org/opensearch/ad/ml/EntityModel.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/EntityModel.java rename to src/main/java/org/opensearch/ad/ml/EntityModel.java index c2d4d44ff..2a3c5330b 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/EntityModel.java +++ b/src/main/java/org/opensearch/ad/ml/EntityModel.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import java.util.Queue; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/HybridThresholdingModel.java b/src/main/java/org/opensearch/ad/ml/HybridThresholdingModel.java similarity index 99% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/HybridThresholdingModel.java rename to src/main/java/org/opensearch/ad/ml/HybridThresholdingModel.java index 77cc4e4b4..e2345750a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/HybridThresholdingModel.java +++ b/src/main/java/org/opensearch/ad/ml/HybridThresholdingModel.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import org.apache.commons.math3.special.Erf; import org.apache.commons.math3.stat.descriptive.SummaryStatistics; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/KllFloatsSketchSerDe.java b/src/main/java/org/opensearch/ad/ml/KllFloatsSketchSerDe.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/KllFloatsSketchSerDe.java rename to src/main/java/org/opensearch/ad/ml/KllFloatsSketchSerDe.java index b5116014f..e76980a08 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/KllFloatsSketchSerDe.java +++ b/src/main/java/org/opensearch/ad/ml/KllFloatsSketchSerDe.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import java.lang.reflect.Type; import java.util.Base64; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ModelManager.java b/src/main/java/org/opensearch/ad/ml/ModelManager.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ModelManager.java rename to src/main/java/org/opensearch/ad/ml/ModelManager.java index e4cdf9f86..6f10ed4ca 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ModelManager.java +++ b/src/main/java/org/opensearch/ad/ml/ModelManager.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import java.security.AccessController; import java.security.PrivilegedAction; @@ -53,15 +53,15 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; +import org.opensearch.ad.DetectorModelSize; +import org.opensearch.ad.MemoryTracker; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.common.exception.ResourceNotFoundException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.ml.rcf.CombinedRcfResult; +import org.opensearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.DetectorModelSize; -import com.amazon.opendistroforelasticsearch.ad.MemoryTracker; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.ResourceNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.ml.rcf.CombinedRcfResult; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; import com.amazon.randomcutforest.RandomCutForest; import com.amazon.randomcutforest.returntypes.DiVector; import com.amazon.randomcutforest.serialize.RandomCutForestSerDe; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ModelPartitioner.java b/src/main/java/org/opensearch/ad/ml/ModelPartitioner.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ModelPartitioner.java rename to src/main/java/org/opensearch/ad/ml/ModelPartitioner.java index 9ceabbbd1..2a84f7e35 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ModelPartitioner.java +++ b/src/main/java/org/opensearch/ad/ml/ModelPartitioner.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import java.util.AbstractMap.SimpleImmutableEntry; import java.util.Locale; @@ -32,12 +32,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.ad.MemoryTracker; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.util.DiscoveryNodeFilterer; -import com.amazon.opendistroforelasticsearch.ad.MemoryTracker; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; import com.amazon.randomcutforest.RandomCutForest; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ModelState.java b/src/main/java/org/opensearch/ad/ml/ModelState.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ModelState.java rename to src/main/java/org/opensearch/ad/ml/ModelState.java index b58384970..e77a3b5f1 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ModelState.java +++ b/src/main/java/org/opensearch/ad/ml/ModelState.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import java.time.Clock; import java.time.Duration; @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.Map; -import com.amazon.opendistroforelasticsearch.ad.ExpiringState; +import org.opensearch.ad.ExpiringState; /** * A ML model and states such as usage. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/RCFMemoryAwareConcurrentHashmap.java b/src/main/java/org/opensearch/ad/ml/RCFMemoryAwareConcurrentHashmap.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/RCFMemoryAwareConcurrentHashmap.java rename to src/main/java/org/opensearch/ad/ml/RCFMemoryAwareConcurrentHashmap.java index bedb76ff9..0a75d4110 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/RCFMemoryAwareConcurrentHashmap.java +++ b/src/main/java/org/opensearch/ad/ml/RCFMemoryAwareConcurrentHashmap.java @@ -24,12 +24,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import java.util.concurrent.ConcurrentHashMap; -import com.amazon.opendistroforelasticsearch.ad.MemoryTracker; -import com.amazon.opendistroforelasticsearch.ad.MemoryTracker.Origin; +import org.opensearch.ad.MemoryTracker; +import org.opensearch.ad.MemoryTracker.Origin; + import com.amazon.randomcutforest.RandomCutForest; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/RcfResult.java b/src/main/java/org/opensearch/ad/ml/RcfResult.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/RcfResult.java rename to src/main/java/org/opensearch/ad/ml/RcfResult.java index e4c89275e..1d00f3eee 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/RcfResult.java +++ b/src/main/java/org/opensearch/ad/ml/RcfResult.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ThresholdingModel.java b/src/main/java/org/opensearch/ad/ml/ThresholdingModel.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ThresholdingModel.java rename to src/main/java/org/opensearch/ad/ml/ThresholdingModel.java index 30f021747..1205f02aa 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ThresholdingModel.java +++ b/src/main/java/org/opensearch/ad/ml/ThresholdingModel.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; /** * A model for converting raw anomaly scores into anomaly grades. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ThresholdingResult.java b/src/main/java/org/opensearch/ad/ml/ThresholdingResult.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ThresholdingResult.java rename to src/main/java/org/opensearch/ad/ml/ThresholdingResult.java index e89002a45..d9df2644f 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/ThresholdingResult.java +++ b/src/main/java/org/opensearch/ad/ml/ThresholdingResult.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import java.util.Objects; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/rcf/CombinedRcfResult.java b/src/main/java/org/opensearch/ad/ml/rcf/CombinedRcfResult.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/rcf/CombinedRcfResult.java rename to src/main/java/org/opensearch/ad/ml/rcf/CombinedRcfResult.java index 71393f1fb..4eb1e157f 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/ml/rcf/CombinedRcfResult.java +++ b/src/main/java/org/opensearch/ad/ml/rcf/CombinedRcfResult.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml.rcf; +package org.opensearch.ad.ml.rcf; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTask.java b/src/main/java/org/opensearch/ad/model/ADTask.java similarity index 99% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTask.java rename to src/main/java/org/opensearch/ad/model/ADTask.java index 1d25c2c9f..d9f4b48fd 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTask.java +++ b/src/main/java/org/opensearch/ad/model/ADTask.java @@ -24,13 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; import java.time.Instant; +import org.opensearch.ad.annotation.Generated; +import org.opensearch.ad.util.ParseUtils; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; @@ -38,8 +40,6 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import com.amazon.opendistroforelasticsearch.ad.annotation.Generated; -import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils; import com.amazon.opendistroforelasticsearch.commons.authuser.User; import com.google.common.base.Objects; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskAction.java b/src/main/java/org/opensearch/ad/model/ADTaskAction.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskAction.java rename to src/main/java/org/opensearch/ad/model/ADTaskAction.java index c865833a5..1e54f5672 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskAction.java +++ b/src/main/java/org/opensearch/ad/model/ADTaskAction.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; public enum ADTaskAction { START, diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskProfile.java b/src/main/java/org/opensearch/ad/model/ADTaskProfile.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskProfile.java rename to src/main/java/org/opensearch/ad/model/ADTaskProfile.java index b9f9fa43a..7e977df98 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskProfile.java +++ b/src/main/java/org/opensearch/ad/model/ADTaskProfile.java @@ -24,12 +24,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; +import org.opensearch.ad.annotation.Generated; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; @@ -37,7 +38,6 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import com.amazon.opendistroforelasticsearch.ad.annotation.Generated; import com.google.common.base.Objects; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskState.java b/src/main/java/org/opensearch/ad/model/ADTaskState.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskState.java rename to src/main/java/org/opensearch/ad/model/ADTaskState.java index 226b6a921..5abf19d0b 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskState.java +++ b/src/main/java/org/opensearch/ad/model/ADTaskState.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; /** * AD task states. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskType.java b/src/main/java/org/opensearch/ad/model/ADTaskType.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskType.java rename to src/main/java/org/opensearch/ad/model/ADTaskType.java index 972d5cfd7..69384f634 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskType.java +++ b/src/main/java/org/opensearch/ad/model/ADTaskType.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; public enum ADTaskType { REALTIME, diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetector.java b/src/main/java/org/opensearch/ad/model/AnomalyDetector.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetector.java rename to src/main/java/org/opensearch/ad/model/AnomalyDetector.java index 6844a2935..ee429e1f6 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetector.java +++ b/src/main/java/org/opensearch/ad/model/AnomalyDetector.java @@ -24,11 +24,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.CATEGORY_FIELD_LIMIT; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.DEFAULT_MULTI_ENTITY_SHINGLE; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.DEFAULT_SHINGLE_SIZE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.CATEGORY_FIELD_LIMIT; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.DEFAULT_MULTI_ENTITY_SHINGLE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.DEFAULT_SHINGLE_SIZE; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import static org.opensearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder; @@ -42,6 +42,11 @@ import java.util.stream.Collectors; import org.apache.logging.log4j.util.Strings; +import org.opensearch.ad.annotation.Generated; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.constant.CommonValue; +import org.opensearch.ad.util.ParseUtils; import org.opensearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; @@ -55,11 +60,6 @@ import org.opensearch.index.query.QueryBuilder; import org.opensearch.index.query.QueryBuilders; -import com.amazon.opendistroforelasticsearch.ad.annotation.Generated; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; -import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils; import com.amazon.opendistroforelasticsearch.commons.authuser.User; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorExecutionInput.java b/src/main/java/org/opensearch/ad/model/AnomalyDetectorExecutionInput.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorExecutionInput.java rename to src/main/java/org/opensearch/ad/model/AnomalyDetectorExecutionInput.java index c2a23cf28..adcc6a2c6 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorExecutionInput.java +++ b/src/main/java/org/opensearch/ad/model/AnomalyDetectorExecutionInput.java @@ -24,19 +24,19 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; import java.time.Instant; +import org.opensearch.ad.annotation.Generated; +import org.opensearch.ad.util.ParseUtils; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import com.amazon.opendistroforelasticsearch.ad.annotation.Generated; -import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils; import com.google.common.base.Objects; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorJob.java b/src/main/java/org/opensearch/ad/model/AnomalyDetectorJob.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorJob.java rename to src/main/java/org/opensearch/ad/model/AnomalyDetectorJob.java index 0789c29d9..fc5f28dea 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorJob.java +++ b/src/main/java/org/opensearch/ad/model/AnomalyDetectorJob.java @@ -24,14 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.DEFAULT_AD_JOB_LOC_DURATION_SECONDS; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.DEFAULT_AD_JOB_LOC_DURATION_SECONDS; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; import java.time.Instant; +import org.opensearch.ad.util.ParseUtils; import org.opensearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; @@ -41,7 +42,6 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils; import com.amazon.opendistroforelasticsearch.commons.authuser.User; import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParameter; import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.CronSchedule; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorType.java b/src/main/java/org/opensearch/ad/model/AnomalyDetectorType.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorType.java rename to src/main/java/org/opensearch/ad/model/AnomalyDetectorType.java index 52ee1250f..e86c135fa 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorType.java +++ b/src/main/java/org/opensearch/ad/model/AnomalyDetectorType.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; public enum AnomalyDetectorType { REALTIME_SINGLE_ENTITY, diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyResult.java b/src/main/java/org/opensearch/ad/model/AnomalyResult.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyResult.java rename to src/main/java/org/opensearch/ad/model/AnomalyResult.java index 0cd2b26b2..76577d27d 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyResult.java +++ b/src/main/java/org/opensearch/ad/model/AnomalyResult.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; @@ -34,6 +34,10 @@ import java.util.List; import org.apache.commons.lang.builder.ToStringBuilder; +import org.opensearch.ad.annotation.Generated; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.constant.CommonValue; +import org.opensearch.ad.util.ParseUtils; import org.opensearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; @@ -43,10 +47,6 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import com.amazon.opendistroforelasticsearch.ad.annotation.Generated; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; -import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils; import com.amazon.opendistroforelasticsearch.commons.authuser.User; import com.google.common.base.Objects; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectionDateRange.java b/src/main/java/org/opensearch/ad/model/DetectionDateRange.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectionDateRange.java rename to src/main/java/org/opensearch/ad/model/DetectionDateRange.java index 109b0da55..8f6a3c249 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectionDateRange.java +++ b/src/main/java/org/opensearch/ad/model/DetectionDateRange.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; @@ -32,6 +32,8 @@ import java.time.Instant; import org.apache.commons.lang.builder.ToStringBuilder; +import org.opensearch.ad.annotation.Generated; +import org.opensearch.ad.util.ParseUtils; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; @@ -39,8 +41,6 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import com.amazon.opendistroforelasticsearch.ad.annotation.Generated; -import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils; import com.google.common.base.Objects; public class DetectionDateRange implements ToXContentObject, Writeable { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectorInternalState.java b/src/main/java/org/opensearch/ad/model/DetectorInternalState.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectorInternalState.java rename to src/main/java/org/opensearch/ad/model/DetectorInternalState.java index 8062829f7..0c6b37628 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectorInternalState.java +++ b/src/main/java/org/opensearch/ad/model/DetectorInternalState.java @@ -24,21 +24,21 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; import java.time.Instant; +import org.opensearch.ad.annotation.Generated; +import org.opensearch.ad.util.ParseUtils; import org.opensearch.common.ParseField; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import com.amazon.opendistroforelasticsearch.ad.annotation.Generated; -import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils; import com.google.common.base.Objects; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectorProfile.java b/src/main/java/org/opensearch/ad/model/DetectorProfile.java similarity index 99% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectorProfile.java rename to src/main/java/org/opensearch/ad/model/DetectorProfile.java index d13a05f96..b0d2c2fba 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectorProfile.java +++ b/src/main/java/org/opensearch/ad/model/DetectorProfile.java @@ -24,13 +24,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.io.IOException; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import org.opensearch.ad.constant.CommonName; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; @@ -38,8 +39,6 @@ import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; - public class DetectorProfile implements Writeable, ToXContentObject, Mergeable { private DetectorState state; private String error; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectorProfileName.java b/src/main/java/org/opensearch/ad/model/DetectorProfileName.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectorProfileName.java rename to src/main/java/org/opensearch/ad/model/DetectorProfileName.java index 5500c95cc..ca2623673 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectorProfileName.java +++ b/src/main/java/org/opensearch/ad/model/DetectorProfileName.java @@ -24,13 +24,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.util.Collection; import java.util.Set; -import com.amazon.opendistroforelasticsearch.ad.Name; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; +import org.opensearch.ad.Name; +import org.opensearch.ad.constant.CommonName; public enum DetectorProfileName implements Name { STATE(CommonName.STATE), diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectorState.java b/src/main/java/org/opensearch/ad/model/DetectorState.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectorState.java rename to src/main/java/org/opensearch/ad/model/DetectorState.java index 4e7228cac..a3c527c84 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/DetectorState.java +++ b/src/main/java/org/opensearch/ad/model/DetectorState.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; public enum DetectorState { DISABLED, diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/Entity.java b/src/main/java/org/opensearch/ad/model/Entity.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/Entity.java rename to src/main/java/org/opensearch/ad/model/Entity.java index dcf7ec2f1..f7d76b145 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/Entity.java +++ b/src/main/java/org/opensearch/ad/model/Entity.java @@ -24,12 +24,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; +import org.opensearch.ad.annotation.Generated; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; @@ -37,7 +38,6 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import com.amazon.opendistroforelasticsearch.ad.annotation.Generated; import com.google.common.base.Objects; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/EntityAnomalyResult.java b/src/main/java/org/opensearch/ad/model/EntityAnomalyResult.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/EntityAnomalyResult.java rename to src/main/java/org/opensearch/ad/model/EntityAnomalyResult.java index 19119f1cd..0d94187d4 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/EntityAnomalyResult.java +++ b/src/main/java/org/opensearch/ad/model/EntityAnomalyResult.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.util.List; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/EntityProfile.java b/src/main/java/org/opensearch/ad/model/EntityProfile.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/EntityProfile.java rename to src/main/java/org/opensearch/ad/model/EntityProfile.java index beb91d8a3..bc89b2e62 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/EntityProfile.java +++ b/src/main/java/org/opensearch/ad/model/EntityProfile.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.io.IOException; import java.util.Optional; @@ -32,14 +32,13 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import org.opensearch.ad.constant.CommonName; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; - /** * Profile output for detector entity. */ diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/EntityProfileName.java b/src/main/java/org/opensearch/ad/model/EntityProfileName.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/EntityProfileName.java rename to src/main/java/org/opensearch/ad/model/EntityProfileName.java index 2778cdd13..4e73bf4f0 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/EntityProfileName.java +++ b/src/main/java/org/opensearch/ad/model/EntityProfileName.java @@ -24,13 +24,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.util.Collection; import java.util.Set; -import com.amazon.opendistroforelasticsearch.ad.Name; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; +import org.opensearch.ad.Name; +import org.opensearch.ad.constant.CommonName; public enum EntityProfileName implements Name { INIT_PROGRESS(CommonName.INIT_PROGRESS), diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/EntityState.java b/src/main/java/org/opensearch/ad/model/EntityState.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/EntityState.java rename to src/main/java/org/opensearch/ad/model/EntityState.java index b895186a7..5c5efeb4b 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/EntityState.java +++ b/src/main/java/org/opensearch/ad/model/EntityState.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; public enum EntityState { UNKNOWN, diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/Feature.java b/src/main/java/org/opensearch/ad/model/Feature.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/Feature.java rename to src/main/java/org/opensearch/ad/model/Feature.java index eab0623b2..b04d7f800 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/Feature.java +++ b/src/main/java/org/opensearch/ad/model/Feature.java @@ -24,13 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; import org.apache.logging.log4j.util.Strings; +import org.opensearch.ad.annotation.Generated; +import org.opensearch.ad.util.ParseUtils; import org.opensearch.common.UUIDs; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; @@ -40,8 +42,6 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.search.aggregations.AggregationBuilder; -import com.amazon.opendistroforelasticsearch.ad.annotation.Generated; -import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils; import com.google.common.base.Objects; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/FeatureData.java b/src/main/java/org/opensearch/ad/model/FeatureData.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/FeatureData.java rename to src/main/java/org/opensearch/ad/model/FeatureData.java index 264fda46d..65b61721c 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/FeatureData.java +++ b/src/main/java/org/opensearch/ad/model/FeatureData.java @@ -24,12 +24,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; +import org.opensearch.ad.annotation.Generated; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; @@ -37,7 +38,6 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import com.amazon.opendistroforelasticsearch.ad.annotation.Generated; import com.google.common.base.Objects; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/InitProgressProfile.java b/src/main/java/org/opensearch/ad/model/InitProgressProfile.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/InitProgressProfile.java rename to src/main/java/org/opensearch/ad/model/InitProgressProfile.java index cc2b536b7..f0a52b7ce 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/InitProgressProfile.java +++ b/src/main/java/org/opensearch/ad/model/InitProgressProfile.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; /* * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/IntervalTimeConfiguration.java b/src/main/java/org/opensearch/ad/model/IntervalTimeConfiguration.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/IntervalTimeConfiguration.java rename to src/main/java/org/opensearch/ad/model/IntervalTimeConfiguration.java index 117365772..47974527d 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/IntervalTimeConfiguration.java +++ b/src/main/java/org/opensearch/ad/model/IntervalTimeConfiguration.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.io.IOException; import java.time.Duration; @@ -32,11 +32,11 @@ import java.util.Locale; import java.util.Set; +import org.opensearch.ad.annotation.Generated; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.annotation.Generated; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/Mergeable.java b/src/main/java/org/opensearch/ad/model/Mergeable.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/Mergeable.java rename to src/main/java/org/opensearch/ad/model/Mergeable.java index 7e9d9cc82..35ad4050c 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/Mergeable.java +++ b/src/main/java/org/opensearch/ad/model/Mergeable.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; public interface Mergeable { void merge(Mergeable other); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ModelProfile.java b/src/main/java/org/opensearch/ad/model/ModelProfile.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ModelProfile.java rename to src/main/java/org/opensearch/ad/model/ModelProfile.java index 099683985..725400363 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/ModelProfile.java +++ b/src/main/java/org/opensearch/ad/model/ModelProfile.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; /* * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/TimeConfiguration.java b/src/main/java/org/opensearch/ad/model/TimeConfiguration.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/model/TimeConfiguration.java rename to src/main/java/org/opensearch/ad/model/TimeConfiguration.java index c50f2ebd8..d86e705bf 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/model/TimeConfiguration.java +++ b/src/main/java/org/opensearch/ad/model/TimeConfiguration.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/AbstractSearchAction.java b/src/main/java/org/opensearch/ad/rest/AbstractSearchAction.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/AbstractSearchAction.java rename to src/main/java/org/opensearch/ad/rest/AbstractSearchAction.java index 5630003ca..be9e26bb0 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/AbstractSearchAction.java +++ b/src/main/java/org/opensearch/ad/rest/AbstractSearchAction.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; +package org.opensearch.ad.rest; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.getSourceContext; +import static org.opensearch.ad.util.RestHandlerUtils.getSourceContext; import static org.opensearch.common.xcontent.ToXContent.EMPTY_PARAMS; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; @@ -41,6 +41,9 @@ import org.opensearch.action.ActionType; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.settings.EnabledSetting; import org.opensearch.client.node.NodeClient; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.LoggingDeprecationHandler; @@ -58,10 +61,6 @@ import org.opensearch.search.SearchHit; import org.opensearch.search.builder.SearchSourceBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting; - /** * Abstract class to handle search request. */ diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestAnomalyDetectorJobAction.java b/src/main/java/org/opensearch/ad/rest/RestAnomalyDetectorJobAction.java similarity index 80% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestAnomalyDetectorJobAction.java rename to src/main/java/org/opensearch/ad/rest/RestAnomalyDetectorJobAction.java index 7ec91e886..cda96dbfc 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestAnomalyDetectorJobAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestAnomalyDetectorJobAction.java @@ -24,19 +24,24 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; +package org.opensearch.ad.rest; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.DETECTOR_ID; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.IF_PRIMARY_TERM; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.IF_SEQ_NO; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.START_JOB; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.STOP_JOB; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; +import static org.opensearch.ad.util.RestHandlerUtils.DETECTOR_ID; +import static org.opensearch.ad.util.RestHandlerUtils.IF_PRIMARY_TERM; +import static org.opensearch.ad.util.RestHandlerUtils.IF_SEQ_NO; +import static org.opensearch.ad.util.RestHandlerUtils.START_JOB; +import static org.opensearch.ad.util.RestHandlerUtils.STOP_JOB; import java.io.IOException; import java.util.List; import java.util.Locale; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.settings.EnabledSetting; +import org.opensearch.ad.transport.AnomalyDetectorJobAction; +import org.opensearch.ad.transport.AnomalyDetectorJobRequest; import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; @@ -46,11 +51,6 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyDetectorJobAction; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyDetectorJobRequest; import com.google.common.collect.ImmutableList; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestDeleteAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestDeleteAnomalyDetectorAction.java similarity index 83% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestDeleteAnomalyDetectorAction.java rename to src/main/java/org/opensearch/ad/rest/RestDeleteAnomalyDetectorAction.java index cf4d2839e..bd62578a5 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestDeleteAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestDeleteAnomalyDetectorAction.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; +package org.opensearch.ad.rest; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.DETECTOR_ID; +import static org.opensearch.ad.util.RestHandlerUtils.DETECTOR_ID; import java.io.IOException; import java.util.List; @@ -34,17 +34,17 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.rest.handler.AnomalyDetectorActionHandler; +import org.opensearch.ad.settings.EnabledSetting; +import org.opensearch.ad.transport.DeleteAnomalyDetectorAction; +import org.opensearch.ad.transport.DeleteAnomalyDetectorRequest; import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.rest.handler.AnomalyDetectorActionHandler; -import com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting; -import com.amazon.opendistroforelasticsearch.ad.transport.DeleteAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.transport.DeleteAnomalyDetectorRequest; import com.google.common.collect.ImmutableList; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestExecuteAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestExecuteAnomalyDetectorAction.java similarity index 87% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestExecuteAnomalyDetectorAction.java rename to src/main/java/org/opensearch/ad/rest/RestExecuteAnomalyDetectorAction.java index a5abb23fd..98707e137 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestExecuteAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestExecuteAnomalyDetectorAction.java @@ -24,11 +24,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; +package org.opensearch.ad.rest; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.DETECTOR_ID; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.RUN; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; +import static org.opensearch.ad.util.RestHandlerUtils.DETECTOR_ID; +import static org.opensearch.ad.util.RestHandlerUtils.RUN; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; @@ -38,6 +38,12 @@ import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.model.AnomalyDetectorExecutionInput; +import org.opensearch.ad.settings.EnabledSetting; +import org.opensearch.ad.transport.AnomalyResultAction; +import org.opensearch.ad.transport.AnomalyResultRequest; import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; @@ -49,12 +55,6 @@ import org.opensearch.rest.RestStatus; import org.opensearch.rest.action.RestToXContentListener; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorExecutionInput; -import com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyResultAction; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyResultRequest; import com.google.common.collect.ImmutableList; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestGetAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestGetAnomalyDetectorAction.java similarity index 84% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestGetAnomalyDetectorAction.java rename to src/main/java/org/opensearch/ad/rest/RestGetAnomalyDetectorAction.java index 78edd28ff..b1be4e362 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestGetAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestGetAnomalyDetectorAction.java @@ -24,12 +24,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; +package org.opensearch.ad.rest; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.DETECTOR_ID; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.ENTITY; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.PROFILE; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.TYPE; +import static org.opensearch.ad.util.RestHandlerUtils.DETECTOR_ID; +import static org.opensearch.ad.util.RestHandlerUtils.ENTITY; +import static org.opensearch.ad.util.RestHandlerUtils.PROFILE; +import static org.opensearch.ad.util.RestHandlerUtils.TYPE; import java.io.IOException; import java.util.List; @@ -37,17 +37,17 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.settings.EnabledSetting; +import org.opensearch.ad.transport.GetAnomalyDetectorAction; +import org.opensearch.ad.transport.GetAnomalyDetectorRequest; import org.opensearch.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestActions; import org.opensearch.rest.action.RestToXContentListener; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting; -import com.amazon.opendistroforelasticsearch.ad.transport.GetAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.transport.GetAnomalyDetectorRequest; import com.google.common.collect.ImmutableList; /** @@ -112,7 +112,7 @@ public List replacedRoutes() { String.format(Locale.ROOT, "%s/{%s}/%s", AnomalyDetectorPlugin.LEGACY_OPENDISTRO_AD_BASE_URI, DETECTOR_ID, PROFILE) ), // types is a profile names. See a complete list of supported profiles names in - // com.amazon.opendistroforelasticsearch.ad.model.ProfileName. + // org.opensearch.ad.model.ProfileName. new ReplacedRoute( RestRequest.Method.GET, String.format(Locale.ROOT, "%s/{%s}/%s/{%s}", AnomalyDetectorPlugin.AD_BASE_DETECTORS_URI, DETECTOR_ID, PROFILE, TYPE), diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestIndexAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestIndexAnomalyDetectorAction.java similarity index 82% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestIndexAnomalyDetectorAction.java rename to src/main/java/org/opensearch/ad/rest/RestIndexAnomalyDetectorAction.java index e5ce11985..5c44f4038 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestIndexAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestIndexAnomalyDetectorAction.java @@ -24,18 +24,18 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; - -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.DETECTION_INTERVAL; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.DETECTION_WINDOW_DELAY; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_ANOMALY_FEATURES; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_MULTI_ENTITY_ANOMALY_DETECTORS; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_SINGLE_ENTITY_ANOMALY_DETECTORS; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.DETECTOR_ID; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.IF_PRIMARY_TERM; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.IF_SEQ_NO; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.REFRESH; +package org.opensearch.ad.rest; + +import static org.opensearch.ad.settings.AnomalyDetectorSettings.DETECTION_INTERVAL; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.DETECTION_WINDOW_DELAY; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_ANOMALY_FEATURES; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_MULTI_ENTITY_ANOMALY_DETECTORS; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_SINGLE_ENTITY_ANOMALY_DETECTORS; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; +import static org.opensearch.ad.util.RestHandlerUtils.DETECTOR_ID; +import static org.opensearch.ad.util.RestHandlerUtils.IF_PRIMARY_TERM; +import static org.opensearch.ad.util.RestHandlerUtils.IF_SEQ_NO; +import static org.opensearch.ad.util.RestHandlerUtils.REFRESH; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; @@ -45,6 +45,13 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.support.WriteRequest; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.settings.EnabledSetting; +import org.opensearch.ad.transport.IndexAnomalyDetectorAction; +import org.opensearch.ad.transport.IndexAnomalyDetectorRequest; +import org.opensearch.ad.transport.IndexAnomalyDetectorResponse; import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; @@ -60,13 +67,6 @@ import org.opensearch.rest.RestStatus; import org.opensearch.rest.action.RestResponseListener; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting; -import com.amazon.opendistroforelasticsearch.ad.transport.IndexAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.transport.IndexAnomalyDetectorRequest; -import com.amazon.opendistroforelasticsearch.ad.transport.IndexAnomalyDetectorResponse; import com.google.common.collect.ImmutableList; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestPreviewAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestPreviewAnomalyDetectorAction.java similarity index 88% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestPreviewAnomalyDetectorAction.java rename to src/main/java/org/opensearch/ad/rest/RestPreviewAnomalyDetectorAction.java index ad1094e62..83aab1aa5 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestPreviewAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestPreviewAnomalyDetectorAction.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; +package org.opensearch.ad.rest; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.PREVIEW; +import static org.opensearch.ad.util.RestHandlerUtils.PREVIEW; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; @@ -36,6 +36,13 @@ import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.model.AnomalyDetectorExecutionInput; +import org.opensearch.ad.settings.EnabledSetting; +import org.opensearch.ad.transport.PreviewAnomalyDetectorAction; +import org.opensearch.ad.transport.PreviewAnomalyDetectorRequest; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; @@ -44,13 +51,6 @@ import org.opensearch.rest.RestStatus; import org.opensearch.rest.action.RestToXContentListener; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorExecutionInput; -import com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting; -import com.amazon.opendistroforelasticsearch.ad.transport.PreviewAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.transport.PreviewAnomalyDetectorRequest; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; import com.google.common.collect.ImmutableList; public class RestPreviewAnomalyDetectorAction extends BaseRestHandler { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestSearchADTasksAction.java b/src/main/java/org/opensearch/ad/rest/RestSearchADTasksAction.java similarity index 84% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestSearchADTasksAction.java rename to src/main/java/org/opensearch/ad/rest/RestSearchADTasksAction.java index 1eda84295..7e1b51655 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestSearchADTasksAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestSearchADTasksAction.java @@ -24,14 +24,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; +package org.opensearch.ad.rest; import org.apache.commons.lang3.tuple.Pair; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.transport.SearchADTasksAction; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.transport.SearchADTasksAction; import com.google.common.collect.ImmutableList; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestSearchAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyDetectorAction.java similarity index 82% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestSearchAnomalyDetectorAction.java rename to src/main/java/org/opensearch/ad/rest/RestSearchAnomalyDetectorAction.java index f586171b7..e24cc26d6 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestSearchAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyDetectorAction.java @@ -24,15 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; +package org.opensearch.ad.rest; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; +import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; import org.apache.commons.lang3.tuple.Pair; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.transport.SearchAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.transport.SearchAnomalyDetectorAction; import com.google.common.collect.ImmutableList; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestSearchAnomalyDetectorInfoAction.java b/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyDetectorInfoAction.java similarity index 84% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestSearchAnomalyDetectorInfoAction.java rename to src/main/java/org/opensearch/ad/rest/RestSearchAnomalyDetectorInfoAction.java index c71f4acaf..294eb02b3 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestSearchAnomalyDetectorInfoAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyDetectorInfoAction.java @@ -24,10 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; +package org.opensearch.ad.rest; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.COUNT; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.MATCH; +import static org.opensearch.ad.util.RestHandlerUtils.COUNT; +import static org.opensearch.ad.util.RestHandlerUtils.MATCH; import java.io.IOException; import java.util.List; @@ -35,16 +35,16 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.settings.EnabledSetting; +import org.opensearch.ad.transport.SearchAnomalyDetectorInfoAction; +import org.opensearch.ad.transport.SearchAnomalyDetectorInfoRequest; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting; -import com.amazon.opendistroforelasticsearch.ad.transport.SearchAnomalyDetectorInfoAction; -import com.amazon.opendistroforelasticsearch.ad.transport.SearchAnomalyDetectorInfoRequest; import com.google.common.collect.ImmutableList; public class RestSearchAnomalyDetectorInfoAction extends BaseRestHandler { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestSearchAnomalyResultAction.java b/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyResultAction.java similarity index 82% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestSearchAnomalyResultAction.java rename to src/main/java/org/opensearch/ad/rest/RestSearchAnomalyResultAction.java index 47b9b4fe0..704d2e31e 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestSearchAnomalyResultAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestSearchAnomalyResultAction.java @@ -24,15 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; +package org.opensearch.ad.rest; -import static com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices.ALL_AD_RESULTS_INDEX_PATTERN; +import static org.opensearch.ad.indices.AnomalyDetectionIndices.ALL_AD_RESULTS_INDEX_PATTERN; import org.apache.commons.lang3.tuple.Pair; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.transport.SearchAnomalyResultAction; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.transport.SearchAnomalyResultAction; import com.google.common.collect.ImmutableList; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestStatsAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/rest/RestStatsAnomalyDetectorAction.java similarity index 89% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestStatsAnomalyDetectorAction.java rename to src/main/java/org/opensearch/ad/rest/RestStatsAnomalyDetectorAction.java index c6c12aea6..b75ef8c9a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/RestStatsAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/rest/RestStatsAnomalyDetectorAction.java @@ -24,10 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; +package org.opensearch.ad.rest; -import static com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin.AD_BASE_URI; -import static com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin.LEGACY_AD_BASE; +import static org.opensearch.ad.AnomalyDetectorPlugin.AD_BASE_URI; +import static org.opensearch.ad.AnomalyDetectorPlugin.LEGACY_AD_BASE; import java.util.Arrays; import java.util.HashSet; @@ -35,6 +35,12 @@ import java.util.Set; import java.util.TreeSet; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.settings.EnabledSetting; +import org.opensearch.ad.stats.ADStats; +import org.opensearch.ad.transport.ADStatsRequest; +import org.opensearch.ad.transport.StatsAnomalyDetectorAction; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; @@ -43,12 +49,6 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStats; -import com.amazon.opendistroforelasticsearch.ad.transport.ADStatsRequest; -import com.amazon.opendistroforelasticsearch.ad.transport.StatsAnomalyDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; import com.google.common.collect.ImmutableList; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/AnomalyDetectorActionHandler.java b/src/main/java/org/opensearch/ad/rest/handler/AnomalyDetectorActionHandler.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/AnomalyDetectorActionHandler.java rename to src/main/java/org/opensearch/ad/rest/handler/AnomalyDetectorActionHandler.java index 415ec5adf..4f2bb5863 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/AnomalyDetectorActionHandler.java +++ b/src/main/java/org/opensearch/ad/rest/handler/AnomalyDetectorActionHandler.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest.handler; +package org.opensearch.ad.rest.handler; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; +import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; @@ -37,15 +37,14 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.rest.RestStatus; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; - /** * Common handler to process AD request. */ diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/AnomalyDetectorFunction.java b/src/main/java/org/opensearch/ad/rest/handler/AnomalyDetectorFunction.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/AnomalyDetectorFunction.java rename to src/main/java/org/opensearch/ad/rest/handler/AnomalyDetectorFunction.java index 59ba30c21..dc4697998 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/AnomalyDetectorFunction.java +++ b/src/main/java/org/opensearch/ad/rest/handler/AnomalyDetectorFunction.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest.handler; +package org.opensearch.ad.rest.handler; @FunctionalInterface public interface AnomalyDetectorFunction { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java b/src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java rename to src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java index 57ad1862c..8c477e418 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java +++ b/src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorActionHandler.java @@ -24,10 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest.handler; +package org.opensearch.ad.rest.handler; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.XCONTENT_WITH_TYPE; +import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; +import static org.opensearch.ad.util.RestHandlerUtils.XCONTENT_WITH_TYPE; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; @@ -57,6 +57,12 @@ import org.opensearch.action.support.IndicesOptions; import org.opensearch.action.support.WriteRequest; import org.opensearch.action.support.replication.ReplicationResponse; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.task.ADTaskManager; +import org.opensearch.ad.transport.IndexAnomalyDetectorResponse; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.unit.TimeValue; @@ -71,12 +77,6 @@ import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; -import com.amazon.opendistroforelasticsearch.ad.transport.IndexAnomalyDetectorResponse; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; import com.amazon.opendistroforelasticsearch.commons.authuser.User; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandler.java b/src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandler.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandler.java rename to src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandler.java index 9982c0234..0d6d61b0f 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandler.java +++ b/src/main/java/org/opensearch/ad/rest/handler/IndexAnomalyDetectorJobActionHandler.java @@ -24,12 +24,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest.handler; +package org.opensearch.ad.rest.handler; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; -import static com.amazon.opendistroforelasticsearch.ad.util.ExceptionUtil.getShardsFailure; import static org.opensearch.action.DocWriteResponse.Result.CREATED; import static org.opensearch.action.DocWriteResponse.Result.UPDATED; +import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; +import static org.opensearch.ad.util.ExceptionUtil.getShardsFailure; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; @@ -45,6 +45,15 @@ import org.opensearch.action.index.IndexRequest; import org.opensearch.action.index.IndexResponse; import org.opensearch.action.support.WriteRequest; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.transport.AnomalyDetectorJobResponse; +import org.opensearch.ad.transport.StopDetectorAction; +import org.opensearch.ad.transport.StopDetectorRequest; +import org.opensearch.ad.transport.StopDetectorResponse; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.NamedXContentRegistry; @@ -52,15 +61,6 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.rest.RestStatus; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyDetectorJobResponse; -import com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorAction; -import com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorRequest; -import com.amazon.opendistroforelasticsearch.ad.transport.StopDetectorResponse; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.IntervalSchedule; import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.Schedule; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/settings/AnomalyDetectorSettings.java b/src/main/java/org/opensearch/ad/settings/AnomalyDetectorSettings.java similarity index 99% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/settings/AnomalyDetectorSettings.java rename to src/main/java/org/opensearch/ad/settings/AnomalyDetectorSettings.java index f7156e53c..3b572c4d6 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/settings/AnomalyDetectorSettings.java +++ b/src/main/java/org/opensearch/ad/settings/AnomalyDetectorSettings.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.settings; +package org.opensearch.ad.settings; import java.time.Duration; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/settings/EnabledSetting.java b/src/main/java/org/opensearch/ad/settings/EnabledSetting.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/settings/EnabledSetting.java rename to src/main/java/org/opensearch/ad/settings/EnabledSetting.java index c1a69604b..ac65c1b1a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/settings/EnabledSetting.java +++ b/src/main/java/org/opensearch/ad/settings/EnabledSetting.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.settings; +package org.opensearch.ad.settings; import static java.util.Collections.unmodifiableMap; import static org.opensearch.common.settings.Setting.Property.Dynamic; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStat.java b/src/main/java/org/opensearch/ad/stats/ADStat.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStat.java rename to src/main/java/org/opensearch/ad/stats/ADStat.java index c35696d34..ee0963996 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStat.java +++ b/src/main/java/org/opensearch/ad/stats/ADStat.java @@ -24,12 +24,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats; +package org.opensearch.ad.stats; import java.util.function.Supplier; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.CounterSupplier; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.SettableSupplier; +import org.opensearch.ad.stats.suppliers.CounterSupplier; +import org.opensearch.ad.stats.suppliers.SettableSupplier; /** * Class represents a stat the plugin keeps track of diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStats.java b/src/main/java/org/opensearch/ad/stats/ADStats.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStats.java rename to src/main/java/org/opensearch/ad/stats/ADStats.java index bcea2e382..b9337f03c 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStats.java +++ b/src/main/java/org/opensearch/ad/stats/ADStats.java @@ -24,13 +24,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats; +package org.opensearch.ad.stats; import java.util.HashMap; import java.util.Map; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.util.IndexUtils; /** * This class is the main entry-point for access to the stats that the AD plugin keeps track of. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStatsResponse.java b/src/main/java/org/opensearch/ad/stats/ADStatsResponse.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStatsResponse.java rename to src/main/java/org/opensearch/ad/stats/ADStatsResponse.java index 19f6231c0..f93371620 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStatsResponse.java +++ b/src/main/java/org/opensearch/ad/stats/ADStatsResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats; +package org.opensearch.ad.stats; import java.io.IOException; import java.util.Map; @@ -32,15 +32,14 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; +import org.opensearch.ad.model.Mergeable; +import org.opensearch.ad.transport.ADStatsNodesResponse; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.model.Mergeable; -import com.amazon.opendistroforelasticsearch.ad.transport.ADStatsNodesResponse; - /** * ADStatsResponse contains logic to merge the node stats and cluster stats together and return them to user */ diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/InternalStatNames.java b/src/main/java/org/opensearch/ad/stats/InternalStatNames.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/InternalStatNames.java rename to src/main/java/org/opensearch/ad/stats/InternalStatNames.java index c95dd0ca6..2e89551d7 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/InternalStatNames.java +++ b/src/main/java/org/opensearch/ad/stats/InternalStatNames.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats; +package org.opensearch.ad.stats; /** * Enum containing names of all internal stats which will not be returned diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/StatNames.java b/src/main/java/org/opensearch/ad/stats/StatNames.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/StatNames.java rename to src/main/java/org/opensearch/ad/stats/StatNames.java index 202ed49a4..1115562d6 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/StatNames.java +++ b/src/main/java/org/opensearch/ad/stats/StatNames.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats; +package org.opensearch.ad.stats; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/CounterSupplier.java b/src/main/java/org/opensearch/ad/stats/suppliers/CounterSupplier.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/CounterSupplier.java rename to src/main/java/org/opensearch/ad/stats/suppliers/CounterSupplier.java index 0a06e75e9..aa6a0de0d 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/CounterSupplier.java +++ b/src/main/java/org/opensearch/ad/stats/suppliers/CounterSupplier.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats.suppliers; +package org.opensearch.ad.stats.suppliers; import java.util.concurrent.atomic.LongAdder; import java.util.function.Supplier; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/IndexStatusSupplier.java b/src/main/java/org/opensearch/ad/stats/suppliers/IndexStatusSupplier.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/IndexStatusSupplier.java rename to src/main/java/org/opensearch/ad/stats/suppliers/IndexStatusSupplier.java index 3fbbd36bc..2ebf11bc3 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/IndexStatusSupplier.java +++ b/src/main/java/org/opensearch/ad/stats/suppliers/IndexStatusSupplier.java @@ -24,11 +24,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats.suppliers; +package org.opensearch.ad.stats.suppliers; import java.util.function.Supplier; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; +import org.opensearch.ad.util.IndexUtils; /** * IndexStatusSupplier provides the status of an index as the value diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/ModelsOnNodeSupplier.java b/src/main/java/org/opensearch/ad/stats/suppliers/ModelsOnNodeSupplier.java similarity index 85% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/ModelsOnNodeSupplier.java rename to src/main/java/org/opensearch/ad/stats/suppliers/ModelsOnNodeSupplier.java index 51e8c7471..65cbb37fa 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/ModelsOnNodeSupplier.java +++ b/src/main/java/org/opensearch/ad/stats/suppliers/ModelsOnNodeSupplier.java @@ -24,11 +24,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats.suppliers; +package org.opensearch.ad.stats.suppliers; -import static com.amazon.opendistroforelasticsearch.ad.ml.ModelState.DETECTOR_ID_KEY; -import static com.amazon.opendistroforelasticsearch.ad.ml.ModelState.MODEL_ID_KEY; -import static com.amazon.opendistroforelasticsearch.ad.ml.ModelState.MODEL_TYPE_KEY; +import static org.opensearch.ad.ml.ModelState.DETECTOR_ID_KEY; +import static org.opensearch.ad.ml.ModelState.MODEL_ID_KEY; +import static org.opensearch.ad.ml.ModelState.MODEL_TYPE_KEY; import java.util.ArrayList; import java.util.Arrays; @@ -40,8 +40,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.ml.ModelManager; /** * ModelsOnNodeSupplier provides a List of ModelStates info for the models the nodes contains diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/SettableSupplier.java b/src/main/java/org/opensearch/ad/stats/suppliers/SettableSupplier.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/SettableSupplier.java rename to src/main/java/org/opensearch/ad/stats/suppliers/SettableSupplier.java index bd3e23c92..34e1cdb34 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/SettableSupplier.java +++ b/src/main/java/org/opensearch/ad/stats/suppliers/SettableSupplier.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats.suppliers; +package org.opensearch.ad.stats.suppliers; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Supplier; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADBatchTaskCache.java b/src/main/java/org/opensearch/ad/task/ADBatchTaskCache.java similarity index 83% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADBatchTaskCache.java rename to src/main/java/org/opensearch/ad/task/ADBatchTaskCache.java index 51bb83dcf..6f3ed2817 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADBatchTaskCache.java +++ b/src/main/java/org/opensearch/ad/task/ADBatchTaskCache.java @@ -24,13 +24,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.task; +package org.opensearch.ad.task; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.NUM_MIN_SAMPLES; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.NUM_SAMPLES_PER_TREE; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.NUM_TREES; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.THRESHOLD_MODEL_TRAINING_SIZE; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.TIME_DECAY; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.NUM_MIN_SAMPLES; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.NUM_SAMPLES_PER_TREE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.NUM_TREES; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.THRESHOLD_MODEL_TRAINING_SIZE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.TIME_DECAY; import java.util.ArrayDeque; import java.util.Deque; @@ -40,11 +40,12 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import com.amazon.opendistroforelasticsearch.ad.ml.HybridThresholdingModel; -import com.amazon.opendistroforelasticsearch.ad.ml.ThresholdingModel; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.ml.HybridThresholdingModel; +import org.opensearch.ad.ml.ThresholdingModel; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.settings.AnomalyDetectorSettings; + import com.amazon.randomcutforest.RandomCutForest; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADBatchTaskRunner.java b/src/main/java/org/opensearch/ad/task/ADBatchTaskRunner.java similarity index 88% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADBatchTaskRunner.java rename to src/main/java/org/opensearch/ad/task/ADBatchTaskRunner.java index b91e1e5cb..f7b81d64b 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADBatchTaskRunner.java +++ b/src/main/java/org/opensearch/ad/task/ADBatchTaskRunner.java @@ -24,25 +24,25 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.task; - -import static com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin.AD_BATCH_TASK_THREAD_POOL_NAME; -import static com.amazon.opendistroforelasticsearch.ad.breaker.MemoryCircuitBreaker.DEFAULT_JVM_HEAP_USAGE_THRESHOLD; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonName.AGG_NAME_MAX_TIME; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonName.AGG_NAME_MIN_TIME; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.CURRENT_PIECE_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.EXECUTION_END_TIME_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.INIT_PROGRESS_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.STATE_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.TASK_PROGRESS_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.WORKER_NODE_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_SIZE; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.NUM_MIN_SAMPLES; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.THRESHOLD_MODEL_TRAINING_SIZE; -import static com.amazon.opendistroforelasticsearch.ad.stats.InternalStatNames.JVM_HEAP_USAGE; -import static com.amazon.opendistroforelasticsearch.ad.stats.StatNames.AD_EXECUTING_BATCH_TASK_COUNT; +package org.opensearch.ad.task; + +import static org.opensearch.ad.AnomalyDetectorPlugin.AD_BATCH_TASK_THREAD_POOL_NAME; +import static org.opensearch.ad.breaker.MemoryCircuitBreaker.DEFAULT_JVM_HEAP_USAGE_THRESHOLD; +import static org.opensearch.ad.constant.CommonName.AGG_NAME_MAX_TIME; +import static org.opensearch.ad.constant.CommonName.AGG_NAME_MIN_TIME; +import static org.opensearch.ad.model.ADTask.CURRENT_PIECE_FIELD; +import static org.opensearch.ad.model.ADTask.EXECUTION_END_TIME_FIELD; +import static org.opensearch.ad.model.ADTask.INIT_PROGRESS_FIELD; +import static org.opensearch.ad.model.ADTask.STATE_FIELD; +import static org.opensearch.ad.model.ADTask.TASK_PROGRESS_FIELD; +import static org.opensearch.ad.model.ADTask.WORKER_NODE_FIELD; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_SIZE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.NUM_MIN_SAMPLES; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.THRESHOLD_MODEL_TRAINING_SIZE; +import static org.opensearch.ad.stats.InternalStatNames.JVM_HEAP_USAGE; +import static org.opensearch.ad.stats.StatNames.AD_EXECUTING_BATCH_TASK_COUNT; import java.time.Instant; import java.util.ArrayList; @@ -60,6 +60,38 @@ import org.opensearch.action.ActionListenerResponseHandler; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.support.ThreadedActionListener; +import org.opensearch.ad.breaker.ADCircuitBreakerService; +import org.opensearch.ad.common.exception.ADTaskCancelledException; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.common.exception.ResourceNotFoundException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.feature.SinglePointFeatures; +import org.opensearch.ad.indices.ADIndex; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.ml.ThresholdingModel; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.ADTaskState; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.model.DetectionDateRange; +import org.opensearch.ad.model.FeatureData; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.settings.EnabledSetting; +import org.opensearch.ad.stats.ADStats; +import org.opensearch.ad.stats.StatNames; +import org.opensearch.ad.transport.ADBatchAnomalyResultRequest; +import org.opensearch.ad.transport.ADBatchAnomalyResultResponse; +import org.opensearch.ad.transport.ADBatchTaskRemoteExecutionAction; +import org.opensearch.ad.transport.ADStatsNodeResponse; +import org.opensearch.ad.transport.ADStatsNodesAction; +import org.opensearch.ad.transport.ADStatsRequest; +import org.opensearch.ad.transport.handler.AnomalyResultBulkIndexHandler; +import org.opensearch.ad.util.DiscoveryNodeFilterer; +import org.opensearch.ad.util.ExceptionUtil; +import org.opensearch.ad.util.ParseUtils; import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNode; @@ -73,38 +105,6 @@ import org.opensearch.transport.TransportRequestOptions; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.breaker.ADCircuitBreakerService; -import com.amazon.opendistroforelasticsearch.ad.common.exception.ADTaskCancelledException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.ResourceNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.feature.SinglePointFeatures; -import com.amazon.opendistroforelasticsearch.ad.indices.ADIndex; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.ml.ThresholdingModel; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskState; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.model.DetectionDateRange; -import com.amazon.opendistroforelasticsearch.ad.model.FeatureData; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStats; -import com.amazon.opendistroforelasticsearch.ad.stats.StatNames; -import com.amazon.opendistroforelasticsearch.ad.transport.ADBatchAnomalyResultRequest; -import com.amazon.opendistroforelasticsearch.ad.transport.ADBatchAnomalyResultResponse; -import com.amazon.opendistroforelasticsearch.ad.transport.ADBatchTaskRemoteExecutionAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADStatsNodeResponse; -import com.amazon.opendistroforelasticsearch.ad.transport.ADStatsNodesAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADStatsRequest; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.AnomalyResultBulkIndexHandler; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; -import com.amazon.opendistroforelasticsearch.ad.util.ExceptionUtil; -import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils; import com.amazon.randomcutforest.RandomCutForest; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskCacheManager.java b/src/main/java/org/opensearch/ad/task/ADTaskCacheManager.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskCacheManager.java rename to src/main/java/org/opensearch/ad/task/ADTaskCacheManager.java index e2c890118..f9dfedf52 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskCacheManager.java +++ b/src/main/java/org/opensearch/ad/task/ADTaskCacheManager.java @@ -24,14 +24,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.task; +package org.opensearch.ad.task; -import static com.amazon.opendistroforelasticsearch.ad.MemoryTracker.Origin.HISTORICAL_SINGLE_ENTITY_DETECTOR; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages.DETECTOR_IS_RUNNING; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.NUM_SAMPLES_PER_TREE; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.NUM_TREES; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.THRESHOLD_MODEL_TRAINING_SIZE; +import static org.opensearch.ad.MemoryTracker.Origin.HISTORICAL_SINGLE_ENTITY_DETECTOR; +import static org.opensearch.ad.constant.CommonErrorMessages.DETECTOR_IS_RUNNING; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.NUM_SAMPLES_PER_TREE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.NUM_TREES; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.THRESHOLD_MODEL_TRAINING_SIZE; import java.util.Deque; import java.util.List; @@ -45,16 +45,16 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.ad.MemoryTracker; +import org.opensearch.ad.common.exception.DuplicateTaskException; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.ml.ThresholdingModel; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.set.Sets; -import com.amazon.opendistroforelasticsearch.ad.MemoryTracker; -import com.amazon.opendistroforelasticsearch.ad.common.exception.DuplicateTaskException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.ml.ThresholdingModel; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; import com.amazon.randomcutforest.RandomCutForest; public class ADTaskCacheManager { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskCancellationState.java b/src/main/java/org/opensearch/ad/task/ADTaskCancellationState.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskCancellationState.java rename to src/main/java/org/opensearch/ad/task/ADTaskCancellationState.java index b6a29344f..9cd742f17 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskCancellationState.java +++ b/src/main/java/org/opensearch/ad/task/ADTaskCancellationState.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.task; +package org.opensearch.ad.task; public enum ADTaskCancellationState { NOT_FOUND, diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskManager.java b/src/main/java/org/opensearch/ad/task/ADTaskManager.java similarity index 92% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskManager.java rename to src/main/java/org/opensearch/ad/task/ADTaskManager.java index 9fd95e204..af1488e05 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskManager.java +++ b/src/main/java/org/opensearch/ad/task/ADTaskManager.java @@ -24,23 +24,23 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.task; - -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages.DETECTOR_IS_RUNNING; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.DETECTOR_ID_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.ERROR_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.EXECUTION_END_TIME_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.EXECUTION_START_TIME_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.IS_LATEST_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.LAST_UPDATE_TIME_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.STATE_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.STOPPED_BY_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_OLD_AD_TASK_DOCS_PER_DETECTOR; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; -import static com.amazon.opendistroforelasticsearch.ad.util.ExceptionUtil.getErrorMessage; -import static com.amazon.opendistroforelasticsearch.ad.util.ExceptionUtil.getShardsFailure; +package org.opensearch.ad.task; + import static org.opensearch.action.DocWriteResponse.Result.CREATED; +import static org.opensearch.ad.constant.CommonErrorMessages.DETECTOR_IS_RUNNING; +import static org.opensearch.ad.model.ADTask.DETECTOR_ID_FIELD; +import static org.opensearch.ad.model.ADTask.ERROR_FIELD; +import static org.opensearch.ad.model.ADTask.EXECUTION_END_TIME_FIELD; +import static org.opensearch.ad.model.ADTask.EXECUTION_START_TIME_FIELD; +import static org.opensearch.ad.model.ADTask.IS_LATEST_FIELD; +import static org.opensearch.ad.model.ADTask.LAST_UPDATE_TIME_FIELD; +import static org.opensearch.ad.model.ADTask.STATE_FIELD; +import static org.opensearch.ad.model.ADTask.STOPPED_BY_FIELD; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_OLD_AD_TASK_DOCS_PER_DETECTOR; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; +import static org.opensearch.ad.util.ExceptionUtil.getErrorMessage; +import static org.opensearch.ad.util.ExceptionUtil.getShardsFailure; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.time.Instant; @@ -71,6 +71,35 @@ import org.opensearch.action.support.WriteRequest; import org.opensearch.action.update.UpdateRequest; import org.opensearch.action.update.UpdateResponse; +import org.opensearch.ad.cluster.HashRing; +import org.opensearch.ad.common.exception.ADTaskCancelledException; +import org.opensearch.ad.common.exception.DuplicateTaskException; +import org.opensearch.ad.common.exception.InternalFailure; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.common.exception.ResourceNotFoundException; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.ADTaskAction; +import org.opensearch.ad.model.ADTaskProfile; +import org.opensearch.ad.model.ADTaskState; +import org.opensearch.ad.model.ADTaskType; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.DetectorProfile; +import org.opensearch.ad.rest.handler.AnomalyDetectorFunction; +import org.opensearch.ad.rest.handler.IndexAnomalyDetectorJobActionHandler; +import org.opensearch.ad.transport.ADBatchAnomalyResultAction; +import org.opensearch.ad.transport.ADBatchAnomalyResultRequest; +import org.opensearch.ad.transport.ADCancelTaskAction; +import org.opensearch.ad.transport.ADCancelTaskRequest; +import org.opensearch.ad.transport.ADTaskProfileAction; +import org.opensearch.ad.transport.ADTaskProfileNodeResponse; +import org.opensearch.ad.transport.ADTaskProfileRequest; +import org.opensearch.ad.transport.AnomalyDetectorJobResponse; +import org.opensearch.ad.transport.ForwardADTaskAction; +import org.opensearch.ad.transport.ForwardADTaskRequest; +import org.opensearch.ad.util.DiscoveryNodeFilterer; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; @@ -96,35 +125,6 @@ import org.opensearch.transport.TransportRequestOptions; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.cluster.HashRing; -import com.amazon.opendistroforelasticsearch.ad.common.exception.ADTaskCancelledException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.DuplicateTaskException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.InternalFailure; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.ResourceNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskAction; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskProfile; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskState; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskType; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfile; -import com.amazon.opendistroforelasticsearch.ad.rest.handler.AnomalyDetectorFunction; -import com.amazon.opendistroforelasticsearch.ad.rest.handler.IndexAnomalyDetectorJobActionHandler; -import com.amazon.opendistroforelasticsearch.ad.transport.ADBatchAnomalyResultAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADBatchAnomalyResultRequest; -import com.amazon.opendistroforelasticsearch.ad.transport.ADCancelTaskAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADCancelTaskRequest; -import com.amazon.opendistroforelasticsearch.ad.transport.ADTaskProfileAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADTaskProfileNodeResponse; -import com.amazon.opendistroforelasticsearch.ad.transport.ADTaskProfileRequest; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyDetectorJobResponse; -import com.amazon.opendistroforelasticsearch.ad.transport.ForwardADTaskAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ForwardADTaskRequest; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; import com.amazon.opendistroforelasticsearch.commons.authuser.User; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultAction.java b/src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultAction.java similarity index 86% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultAction.java rename to src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultAction.java index 13414665e..02f734c67 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultAction.java @@ -24,13 +24,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonName.AD_TASK; +import static org.opensearch.ad.constant.CommonName.AD_TASK; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class ADBatchAnomalyResultAction extends ActionType { public static final String NAME = CommonValue.INTERNAL_ACTION_PREFIX + "detector/" + AD_TASK; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultRequest.java b/src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultRequest.java similarity index 92% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultRequest.java rename to src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultRequest.java index 32b13abdb..fc57edf16 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultRequest.java +++ b/src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.opensearch.action.ValidateActions.addValidationError; @@ -32,13 +32,12 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; - public class ADBatchAnomalyResultRequest extends ActionRequest { private ADTask adTask; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultResponse.java b/src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultResponse.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultResponse.java rename to src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultResponse.java index b233f9000..df3bcbaa8 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultResponse.java +++ b/src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultTransportAction.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultTransportAction.java rename to src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultTransportAction.java index 778184dc1..c701f19a8 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADBatchAnomalyResultTransportAction.java @@ -24,17 +24,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.task.ADBatchTaskRunner; import org.opensearch.common.inject.Inject; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.task.ADBatchTaskRunner; - public class ADBatchAnomalyResultTransportAction extends HandledTransportAction { private final TransportService transportService; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchTaskRemoteExecutionAction.java b/src/main/java/org/opensearch/ad/transport/ADBatchTaskRemoteExecutionAction.java similarity index 85% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchTaskRemoteExecutionAction.java rename to src/main/java/org/opensearch/ad/transport/ADBatchTaskRemoteExecutionAction.java index 59d1b393e..2b8f63669 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchTaskRemoteExecutionAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADBatchTaskRemoteExecutionAction.java @@ -24,13 +24,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonName.AD_TASK_REMOTE; +import static org.opensearch.ad.constant.CommonName.AD_TASK_REMOTE; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class ADBatchTaskRemoteExecutionAction extends ActionType { public static final String NAME = CommonValue.INTERNAL_ACTION_PREFIX + "detector/" + AD_TASK_REMOTE; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchTaskRemoteExecutionTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADBatchTaskRemoteExecutionTransportAction.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchTaskRemoteExecutionTransportAction.java rename to src/main/java/org/opensearch/ad/transport/ADBatchTaskRemoteExecutionTransportAction.java index a2be0ea06..1603eb402 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchTaskRemoteExecutionTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADBatchTaskRemoteExecutionTransportAction.java @@ -24,17 +24,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.task.ADBatchTaskRunner; import org.opensearch.common.inject.Inject; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.task.ADBatchTaskRunner; - public class ADBatchTaskRemoteExecutionTransportAction extends HandledTransportAction { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskAction.java b/src/main/java/org/opensearch/ad/transport/ADCancelTaskAction.java similarity index 85% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskAction.java rename to src/main/java/org/opensearch/ad/transport/ADCancelTaskAction.java index 71a5eccbb..52318d765 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADCancelTaskAction.java @@ -24,13 +24,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonName.CANCEL_TASK; +import static org.opensearch.ad.constant.CommonName.CANCEL_TASK; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class ADCancelTaskAction extends ActionType { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskNodeRequest.java b/src/main/java/org/opensearch/ad/transport/ADCancelTaskNodeRequest.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskNodeRequest.java rename to src/main/java/org/opensearch/ad/transport/ADCancelTaskNodeRequest.java index f3b19de8d..333085290 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskNodeRequest.java +++ b/src/main/java/org/opensearch/ad/transport/ADCancelTaskNodeRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskNodeResponse.java b/src/main/java/org/opensearch/ad/transport/ADCancelTaskNodeResponse.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskNodeResponse.java rename to src/main/java/org/opensearch/ad/transport/ADCancelTaskNodeResponse.java index 3694224c7..c05f7cbe5 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskNodeResponse.java +++ b/src/main/java/org/opensearch/ad/transport/ADCancelTaskNodeResponse.java @@ -24,17 +24,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import org.opensearch.action.support.nodes.BaseNodeResponse; +import org.opensearch.ad.task.ADTaskCancellationState; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskCancellationState; - public class ADCancelTaskNodeResponse extends BaseNodeResponse { private ADTaskCancellationState state; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskRequest.java b/src/main/java/org/opensearch/ad/transport/ADCancelTaskRequest.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskRequest.java rename to src/main/java/org/opensearch/ad/transport/ADCancelTaskRequest.java index 076b61380..dc22e84d3 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskRequest.java +++ b/src/main/java/org/opensearch/ad/transport/ADCancelTaskRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.opensearch.action.ValidateActions.addValidationError; @@ -32,13 +32,12 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.support.nodes.BaseNodesRequest; +import org.opensearch.ad.constant.CommonErrorMessages; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; - public class ADCancelTaskRequest extends BaseNodesRequest { private String detectorId; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskResponse.java b/src/main/java/org/opensearch/ad/transport/ADCancelTaskResponse.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskResponse.java rename to src/main/java/org/opensearch/ad/transport/ADCancelTaskResponse.java index 51652e4a2..1ce815ab9 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskResponse.java +++ b/src/main/java/org/opensearch/ad/transport/ADCancelTaskResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADCancelTaskTransportAction.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskTransportAction.java rename to src/main/java/org/opensearch/ad/transport/ADCancelTaskTransportAction.java index 7b5d38a40..508887d06 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADCancelTaskTransportAction.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.List; @@ -34,6 +34,8 @@ import org.opensearch.action.FailedNodeException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.nodes.TransportNodesAction; +import org.opensearch.ad.task.ADTaskCancellationState; +import org.opensearch.ad.task.ADTaskManager; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; @@ -41,9 +43,6 @@ import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskCancellationState; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; - public class ADCancelTaskTransportAction extends TransportNodesAction { private final Logger logger = LogManager.getLogger(ADCancelTaskTransportAction.class); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADResultBulkAction.java b/src/main/java/org/opensearch/ad/transport/ADResultBulkAction.java similarity index 92% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADResultBulkAction.java rename to src/main/java/org/opensearch/ad/transport/ADResultBulkAction.java index 6937921b9..f06c02342 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADResultBulkAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADResultBulkAction.java @@ -24,15 +24,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; import org.opensearch.action.bulk.BulkResponse; +import org.opensearch.ad.constant.CommonValue; import org.opensearch.common.settings.Settings; import org.opensearch.transport.TransportRequestOptions; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; - public class ADResultBulkAction extends ActionType { // Internal Action which is not used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADResultBulkRequest.java b/src/main/java/org/opensearch/ad/transport/ADResultBulkRequest.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADResultBulkRequest.java rename to src/main/java/org/opensearch/ad/transport/ADResultBulkRequest.java index 4193b977b..1c27e90d4 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADResultBulkRequest.java +++ b/src/main/java/org/opensearch/ad/transport/ADResultBulkRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.ArrayList; @@ -33,12 +33,11 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.ValidateActions; +import org.opensearch.ad.model.AnomalyResult; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; - public class ADResultBulkRequest extends ActionRequest implements Writeable { private final List anomalyResults; static final String NO_REQUESTS_ADDED_ERR = "no requests added"; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADResultBulkTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADResultBulkTransportAction.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADResultBulkTransportAction.java rename to src/main/java/org/opensearch/ad/transport/ADResultBulkTransportAction.java index 631303669..83d6245ec 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADResultBulkTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADResultBulkTransportAction.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.INDEX_PRESSURE_SOFT_LIMIT; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.INDEX_PRESSURE_SOFT_LIMIT; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; import static org.opensearch.index.IndexingPressure.MAX_INDEXING_BYTES; @@ -43,6 +43,9 @@ import org.opensearch.action.index.IndexRequest; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; @@ -53,10 +56,6 @@ import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; - public class ADResultBulkTransportAction extends HandledTransportAction { private static final Logger LOG = LogManager.getLogger(ADResultBulkTransportAction.class); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodeRequest.java b/src/main/java/org/opensearch/ad/transport/ADStatsNodeRequest.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodeRequest.java rename to src/main/java/org/opensearch/ad/transport/ADStatsNodeRequest.java index ac4ed81e0..6eefc747a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodeRequest.java +++ b/src/main/java/org/opensearch/ad/transport/ADStatsNodeRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodeResponse.java b/src/main/java/org/opensearch/ad/transport/ADStatsNodeResponse.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodeResponse.java rename to src/main/java/org/opensearch/ad/transport/ADStatsNodeResponse.java index 632e9b390..d270bb70c 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodeResponse.java +++ b/src/main/java/org/opensearch/ad/transport/ADStatsNodeResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.Map; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodesAction.java b/src/main/java/org/opensearch/ad/transport/ADStatsNodesAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodesAction.java rename to src/main/java/org/opensearch/ad/transport/ADStatsNodesAction.java index 783e04f42..50837da5a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodesAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADStatsNodesAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; /** * ADStatsNodesAction class diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodesResponse.java b/src/main/java/org/opensearch/ad/transport/ADStatsNodesResponse.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodesResponse.java rename to src/main/java/org/opensearch/ad/transport/ADStatsNodesResponse.java index d10369e47..f7e957658 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodesResponse.java +++ b/src/main/java/org/opensearch/ad/transport/ADStatsNodesResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodesTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADStatsNodesTransportAction.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodesTransportAction.java rename to src/main/java/org/opensearch/ad/transport/ADStatsNodesTransportAction.java index c82b861d5..43f537e9b 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodesTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADStatsNodesTransportAction.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.HashMap; @@ -35,6 +35,8 @@ import org.opensearch.action.FailedNodeException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.nodes.TransportNodesAction; +import org.opensearch.ad.stats.ADStats; +import org.opensearch.ad.stats.InternalStatNames; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; @@ -42,9 +44,6 @@ import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStats; -import com.amazon.opendistroforelasticsearch.ad.stats.InternalStatNames; - /** * ADStatsNodesTransportAction contains the logic to extract the stats from the nodes */ diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsRequest.java b/src/main/java/org/opensearch/ad/transport/ADStatsRequest.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsRequest.java rename to src/main/java/org/opensearch/ad/transport/ADStatsRequest.java index 046b2da78..d9fdc500a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsRequest.java +++ b/src/main/java/org/opensearch/ad/transport/ADStatsRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.HashSet; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileAction.java b/src/main/java/org/opensearch/ad/transport/ADTaskProfileAction.java similarity index 85% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileAction.java rename to src/main/java/org/opensearch/ad/transport/ADTaskProfileAction.java index 56cd85c72..f54f4bb0b 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADTaskProfileAction.java @@ -24,13 +24,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonName.AD_TASK; +import static org.opensearch.ad.constant.CommonName.AD_TASK; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class ADTaskProfileAction extends ActionType { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileNodeRequest.java b/src/main/java/org/opensearch/ad/transport/ADTaskProfileNodeRequest.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileNodeRequest.java rename to src/main/java/org/opensearch/ad/transport/ADTaskProfileNodeRequest.java index 63bedd7f2..bd24f54db 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileNodeRequest.java +++ b/src/main/java/org/opensearch/ad/transport/ADTaskProfileNodeRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileNodeResponse.java b/src/main/java/org/opensearch/ad/transport/ADTaskProfileNodeResponse.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileNodeResponse.java rename to src/main/java/org/opensearch/ad/transport/ADTaskProfileNodeResponse.java index 327ff9a35..20e3ade04 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileNodeResponse.java +++ b/src/main/java/org/opensearch/ad/transport/ADTaskProfileNodeResponse.java @@ -24,17 +24,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import org.opensearch.action.support.nodes.BaseNodeResponse; +import org.opensearch.ad.model.ADTaskProfile; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskProfile; - public class ADTaskProfileNodeResponse extends BaseNodeResponse { private ADTaskProfile adTaskProfile; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileRequest.java b/src/main/java/org/opensearch/ad/transport/ADTaskProfileRequest.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileRequest.java rename to src/main/java/org/opensearch/ad/transport/ADTaskProfileRequest.java index 109b58dc0..22b1d32d3 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileRequest.java +++ b/src/main/java/org/opensearch/ad/transport/ADTaskProfileRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.opensearch.action.ValidateActions.addValidationError; @@ -32,13 +32,12 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.support.nodes.BaseNodesRequest; +import org.opensearch.ad.constant.CommonErrorMessages; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; - public class ADTaskProfileRequest extends BaseNodesRequest { private String detectorId; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileResponse.java b/src/main/java/org/opensearch/ad/transport/ADTaskProfileResponse.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileResponse.java rename to src/main/java/org/opensearch/ad/transport/ADTaskProfileResponse.java index 178da4e22..94a38535c 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileResponse.java +++ b/src/main/java/org/opensearch/ad/transport/ADTaskProfileResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADTaskProfileTransportAction.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileTransportAction.java rename to src/main/java/org/opensearch/ad/transport/ADTaskProfileTransportAction.java index a639cfc62..31726db3a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ADTaskProfileTransportAction.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.List; @@ -32,15 +32,14 @@ import org.opensearch.action.FailedNodeException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.nodes.TransportNodesAction; +import org.opensearch.ad.model.ADTaskProfile; +import org.opensearch.ad.task.ADTaskManager; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskProfile; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; - public class ADTaskProfileTransportAction extends TransportNodesAction { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobAction.java b/src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobAction.java rename to src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobAction.java index e598a0203..8f18c373a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobAction.java +++ b/src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class AnomalyDetectorJobAction extends ActionType { // External Action which used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobRequest.java b/src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobRequest.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobRequest.java rename to src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobRequest.java index 307aa2ffe..9c3d5713a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobRequest.java +++ b/src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobResponse.java b/src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobResponse.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobResponse.java rename to src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobResponse.java index 477f7d904..ada7bb03d 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobResponse.java +++ b/src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobResponse.java @@ -24,19 +24,18 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import org.opensearch.action.ActionResponse; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.rest.RestStatus; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; - public class AnomalyDetectorJobResponse extends ActionResponse implements ToXContentObject { private final String id; private final long version; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobTransportAction.java b/src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportAction.java similarity index 87% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobTransportAction.java rename to src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportAction.java index c502f0d83..5cc1d54dc 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportAction.java @@ -24,18 +24,22 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.getUserContext; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.resolveUserAndExecute; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; +import static org.opensearch.ad.util.ParseUtils.getUserContext; +import static org.opensearch.ad.util.ParseUtils.resolveUserAndExecute; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.rest.handler.IndexAnomalyDetectorJobActionHandler; +import org.opensearch.ad.task.ADTaskManager; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; @@ -46,10 +50,6 @@ import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.rest.handler.IndexAnomalyDetectorJobActionHandler; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; import com.amazon.opendistroforelasticsearch.commons.authuser.User; public class AnomalyDetectorJobTransportAction extends HandledTransportAction { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultAction.java b/src/main/java/org/opensearch/ad/transport/AnomalyResultAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultAction.java rename to src/main/java/org/opensearch/ad/transport/AnomalyResultAction.java index c3f428adc..db8a5595c 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultAction.java +++ b/src/main/java/org/opensearch/ad/transport/AnomalyResultAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class AnomalyResultAction extends ActionType { // External Action which used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultRequest.java b/src/main/java/org/opensearch/ad/transport/AnomalyResultRequest.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultRequest.java rename to src/main/java/org/opensearch/ad/transport/AnomalyResultRequest.java index f0a2f7693..0e255c710 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultRequest.java +++ b/src/main/java/org/opensearch/ad/transport/AnomalyResultRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.opensearch.action.ValidateActions.addValidationError; @@ -35,6 +35,8 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonMessageAttributes; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.InputStreamStreamInput; import org.opensearch.common.io.stream.OutputStreamStreamOutput; @@ -43,9 +45,6 @@ import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; - public class AnomalyResultRequest extends ActionRequest implements ToXContentObject { private String adID; // time range start and end. Unit: epoch milliseconds diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultResponse.java b/src/main/java/org/opensearch/ad/transport/AnomalyResultResponse.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultResponse.java rename to src/main/java/org/opensearch/ad/transport/AnomalyResultResponse.java index 2ade5f549..d53aa8916 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultResponse.java +++ b/src/main/java/org/opensearch/ad/transport/AnomalyResultResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -33,6 +33,7 @@ import java.util.List; import org.opensearch.action.ActionResponse; +import org.opensearch.ad.model.FeatureData; import org.opensearch.common.io.stream.InputStreamStreamInput; import org.opensearch.common.io.stream.OutputStreamStreamOutput; import org.opensearch.common.io.stream.StreamInput; @@ -40,8 +41,6 @@ import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.model.FeatureData; - public class AnomalyResultResponse extends ActionResponse implements ToXContentObject { public static final String ANOMALY_GRADE_JSON_KEY = "anomalyGrade"; public static final String CONFIDENCE_JSON_KEY = "confidence"; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/AnomalyResultTransportAction.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultTransportAction.java rename to src/main/java/org/opensearch/ad/transport/AnomalyResultTransportAction.java index 3a64ee05e..f7fff91e8 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/AnomalyResultTransportAction.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages.INVALID_SEARCH_QUERY_MSG; +import static org.opensearch.ad.constant.CommonErrorMessages.INVALID_SEARCH_QUERY_MSG; import java.net.ConnectException; import java.util.ArrayList; @@ -57,6 +57,34 @@ import org.opensearch.action.support.IndicesOptions; import org.opensearch.action.support.ThreadedActionListener; import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.breaker.ADCircuitBreakerService; +import org.opensearch.ad.cluster.HashRing; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.common.exception.ClientException; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.common.exception.InternalFailure; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.common.exception.ResourceNotFoundException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.feature.SearchFeatureDao; +import org.opensearch.ad.feature.SinglePointFeatures; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.ModelPartitioner; +import org.opensearch.ad.ml.RcfResult; +import org.opensearch.ad.ml.rcf.CombinedRcfResult; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.FeatureData; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.settings.EnabledSetting; +import org.opensearch.ad.stats.ADStats; +import org.opensearch.ad.stats.StatNames; +import org.opensearch.ad.util.ExceptionUtil; +import org.opensearch.ad.util.ParseUtils; import org.opensearch.client.Client; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.block.ClusterBlockLevel; @@ -80,35 +108,6 @@ import org.opensearch.transport.TransportRequestOptions; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.breaker.ADCircuitBreakerService; -import com.amazon.opendistroforelasticsearch.ad.cluster.HashRing; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.ClientException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.InternalFailure; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.ResourceNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.feature.SearchFeatureDao; -import com.amazon.opendistroforelasticsearch.ad.feature.SinglePointFeatures; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelPartitioner; -import com.amazon.opendistroforelasticsearch.ad.ml.RcfResult; -import com.amazon.opendistroforelasticsearch.ad.ml.rcf.CombinedRcfResult; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.FeatureData; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStats; -import com.amazon.opendistroforelasticsearch.ad.stats.StatNames; -import com.amazon.opendistroforelasticsearch.ad.util.ExceptionUtil; -import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils; - public class AnomalyResultTransportAction extends HandledTransportAction { private static final Logger LOG = LogManager.getLogger(AnomalyResultTransportAction.class); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/BackPressureRouting.java b/src/main/java/org/opensearch/ad/transport/BackPressureRouting.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/BackPressureRouting.java rename to src/main/java/org/opensearch/ad/transport/BackPressureRouting.java index 4a140c0c2..8ed7d6de8 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/BackPressureRouting.java +++ b/src/main/java/org/opensearch/ad/transport/BackPressureRouting.java @@ -24,10 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.BACKOFF_MINUTES; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_RETRY_FOR_UNRESPONSIVE_NODE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.BACKOFF_MINUTES; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_RETRY_FOR_UNRESPONSIVE_NODE; import java.time.Clock; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronAction.java b/src/main/java/org/opensearch/ad/transport/CronAction.java similarity index 90% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronAction.java rename to src/main/java/org/opensearch/ad/transport/CronAction.java index 19872a9b1..5e53fd2ea 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronAction.java +++ b/src/main/java/org/opensearch/ad/transport/CronAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class CronAction extends ActionType { // Internal Action which is not used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronNodeRequest.java b/src/main/java/org/opensearch/ad/transport/CronNodeRequest.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronNodeRequest.java rename to src/main/java/org/opensearch/ad/transport/CronNodeRequest.java index 06ad5ea87..7c7a989b2 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronNodeRequest.java +++ b/src/main/java/org/opensearch/ad/transport/CronNodeRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronNodeResponse.java b/src/main/java/org/opensearch/ad/transport/CronNodeResponse.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronNodeResponse.java rename to src/main/java/org/opensearch/ad/transport/CronNodeResponse.java index 19edad194..5665d0ca7 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronNodeResponse.java +++ b/src/main/java/org/opensearch/ad/transport/CronNodeResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronRequest.java b/src/main/java/org/opensearch/ad/transport/CronRequest.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronRequest.java rename to src/main/java/org/opensearch/ad/transport/CronRequest.java index 4d924eaf8..231f4acd3 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronRequest.java +++ b/src/main/java/org/opensearch/ad/transport/CronRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronResponse.java b/src/main/java/org/opensearch/ad/transport/CronResponse.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronResponse.java rename to src/main/java/org/opensearch/ad/transport/CronResponse.java index 8f1404971..a18562faf 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronResponse.java +++ b/src/main/java/org/opensearch/ad/transport/CronResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronTransportAction.java b/src/main/java/org/opensearch/ad/transport/CronTransportAction.java similarity index 92% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronTransportAction.java rename to src/main/java/org/opensearch/ad/transport/CronTransportAction.java index bffd6027b..4150b2e87 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/CronTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/CronTransportAction.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.List; @@ -32,17 +32,16 @@ import org.opensearch.action.FailedNodeException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.nodes.TransportNodesAction; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.ml.ModelManager; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; - public class CronTransportAction extends TransportNodesAction { private NodeStateManager transportStateManager; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorAction.java rename to src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorAction.java index ff206c415..44921671e 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorAction.java @@ -24,12 +24,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; import org.opensearch.action.delete.DeleteResponse; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class DeleteAnomalyDetectorAction extends ActionType { // External Action which used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorRequest.java b/src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorRequest.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorRequest.java rename to src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorRequest.java index e58af5f2e..e59b239bc 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorRequest.java +++ b/src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.opensearch.action.ValidateActions.addValidationError; @@ -32,12 +32,11 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.constant.CommonErrorMessages; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; - public class DeleteAnomalyDetectorRequest extends ActionRequest { private String detectorID; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTransportAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorTransportAction.java rename to src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTransportAction.java index 8c2b616c3..09a4cea6a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTransportAction.java @@ -24,12 +24,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.getUserContext; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.resolveUserAndExecute; +import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; +import static org.opensearch.ad.util.ParseUtils.getUserContext; +import static org.opensearch.ad.util.ParseUtils.resolveUserAndExecute; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; @@ -46,6 +46,13 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; import org.opensearch.action.support.WriteRequest; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.rest.handler.AnomalyDetectorFunction; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.task.ADTaskManager; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; @@ -58,13 +65,6 @@ import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.rest.handler.AnomalyDetectorFunction; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; import com.amazon.opendistroforelasticsearch.commons.authuser.User; public class DeleteAnomalyDetectorTransportAction extends HandledTransportAction { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelAction.java b/src/main/java/org/opensearch/ad/transport/DeleteModelAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelAction.java rename to src/main/java/org/opensearch/ad/transport/DeleteModelAction.java index 59597e71e..574ff7e5a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelAction.java +++ b/src/main/java/org/opensearch/ad/transport/DeleteModelAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class DeleteModelAction extends ActionType { // Internal Action which is not used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelNodeRequest.java b/src/main/java/org/opensearch/ad/transport/DeleteModelNodeRequest.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelNodeRequest.java rename to src/main/java/org/opensearch/ad/transport/DeleteModelNodeRequest.java index 7d0c4f61c..78ef12cd1 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelNodeRequest.java +++ b/src/main/java/org/opensearch/ad/transport/DeleteModelNodeRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelNodeResponse.java b/src/main/java/org/opensearch/ad/transport/DeleteModelNodeResponse.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelNodeResponse.java rename to src/main/java/org/opensearch/ad/transport/DeleteModelNodeResponse.java index 85201a4c3..df0dc7755 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelNodeResponse.java +++ b/src/main/java/org/opensearch/ad/transport/DeleteModelNodeResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelRequest.java b/src/main/java/org/opensearch/ad/transport/DeleteModelRequest.java similarity index 92% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelRequest.java rename to src/main/java/org/opensearch/ad/transport/DeleteModelRequest.java index d66a267b2..a7915a962 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelRequest.java +++ b/src/main/java/org/opensearch/ad/transport/DeleteModelRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.opensearch.action.ValidateActions.addValidationError; @@ -32,6 +32,8 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.support.nodes.BaseNodesRequest; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonMessageAttributes; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; @@ -39,9 +41,6 @@ import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; - /** * Request should be sent from the handler logic of transport delete detector API * diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelResponse.java b/src/main/java/org/opensearch/ad/transport/DeleteModelResponse.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelResponse.java rename to src/main/java/org/opensearch/ad/transport/DeleteModelResponse.java index 73615acf7..333f80c1a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelResponse.java +++ b/src/main/java/org/opensearch/ad/transport/DeleteModelResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelTransportAction.java b/src/main/java/org/opensearch/ad/transport/DeleteModelTransportAction.java similarity index 92% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelTransportAction.java rename to src/main/java/org/opensearch/ad/transport/DeleteModelTransportAction.java index d255136cd..31845c882 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/DeleteModelTransportAction.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.List; @@ -34,17 +34,16 @@ import org.opensearch.action.FailedNodeException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.nodes.TransportNodesAction; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.ml.ModelManager; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; - public class DeleteModelTransportAction extends TransportNodesAction { private static final Logger LOG = LogManager.getLogger(DeleteModelTransportAction.class); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileAction.java b/src/main/java/org/opensearch/ad/transport/EntityProfileAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileAction.java rename to src/main/java/org/opensearch/ad/transport/EntityProfileAction.java index 614bd821f..a8f4d411d 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileAction.java +++ b/src/main/java/org/opensearch/ad/transport/EntityProfileAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class EntityProfileAction extends ActionType { // Internal Action which is not used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileRequest.java b/src/main/java/org/opensearch/ad/transport/EntityProfileRequest.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileRequest.java rename to src/main/java/org/opensearch/ad/transport/EntityProfileRequest.java index 9816ddc07..069d320e8 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileRequest.java +++ b/src/main/java/org/opensearch/ad/transport/EntityProfileRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.opensearch.action.ValidateActions.addValidationError; @@ -34,16 +34,15 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonMessageAttributes; +import org.opensearch.ad.model.EntityProfileName; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; -import com.amazon.opendistroforelasticsearch.ad.model.EntityProfileName; - public class EntityProfileRequest extends ActionRequest implements ToXContentObject { public static final String ENTITY = "entity"; public static final String PROFILES = "profiles"; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileResponse.java b/src/main/java/org/opensearch/ad/transport/EntityProfileResponse.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileResponse.java rename to src/main/java/org/opensearch/ad/transport/EntityProfileResponse.java index 11428dbf3..49998d308 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileResponse.java +++ b/src/main/java/org/opensearch/ad/transport/EntityProfileResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.Optional; @@ -33,14 +33,13 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.opensearch.action.ActionResponse; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.ModelProfile; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.ModelProfile; - public class EntityProfileResponse extends ActionResponse implements ToXContentObject { public static final String ACTIVE = "active"; public static final String LAST_ACTIVE_TS = "last_active_timestamp"; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileTransportAction.java b/src/main/java/org/opensearch/ad/transport/EntityProfileTransportAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileTransportAction.java rename to src/main/java/org/opensearch/ad/transport/EntityProfileTransportAction.java index b0602c79f..226552f01 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/EntityProfileTransportAction.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.Locale; @@ -36,6 +36,14 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.caching.EntityCache; +import org.opensearch.ad.cluster.HashRing; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.model.EntityProfileName; +import org.opensearch.ad.model.ModelProfile; +import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; @@ -48,15 +56,6 @@ import org.opensearch.transport.TransportResponseHandler; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.caching.EntityCache; -import com.amazon.opendistroforelasticsearch.ad.cluster.HashRing; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.model.EntityProfileName; -import com.amazon.opendistroforelasticsearch.ad.model.ModelProfile; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; - /** * Transport action to get entity profile. */ diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityResultAction.java b/src/main/java/org/opensearch/ad/transport/EntityResultAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityResultAction.java rename to src/main/java/org/opensearch/ad/transport/EntityResultAction.java index 8d44383b6..e5c647e1f 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityResultAction.java +++ b/src/main/java/org/opensearch/ad/transport/EntityResultAction.java @@ -24,12 +24,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; import org.opensearch.action.support.master.AcknowledgedResponse; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class EntityResultAction extends ActionType { // Internal Action which is not used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityResultRequest.java b/src/main/java/org/opensearch/ad/transport/EntityResultRequest.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityResultRequest.java rename to src/main/java/org/opensearch/ad/transport/EntityResultRequest.java index c8221a00b..edc099255 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityResultRequest.java +++ b/src/main/java/org/opensearch/ad/transport/EntityResultRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.opensearch.action.ValidateActions.addValidationError; @@ -34,15 +34,14 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonMessageAttributes; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; - public class EntityResultRequest extends ActionRequest implements ToXContentObject { private String detectorId; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/EntityResultTransportAction.java similarity index 85% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityResultTransportAction.java rename to src/main/java/org/opensearch/ad/transport/EntityResultTransportAction.java index f8f86c0dc..79dd48570 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityResultTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/EntityResultTransportAction.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.COOLDOWN_MINUTES; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.COOLDOWN_MINUTES; import java.time.Clock; import java.time.Duration; @@ -42,31 +42,30 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.breaker.ADCircuitBreakerService; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.indices.ADIndex; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.ml.CheckpointDao; +import org.opensearch.ad.ml.EntityModel; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.ModelState; +import org.opensearch.ad.ml.ThresholdingResult; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.model.Entity; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.transport.handler.MultiEntityResultHandler; +import org.opensearch.ad.util.ParseUtils; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.breaker.ADCircuitBreakerService; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.indices.ADIndex; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.ml.CheckpointDao; -import com.amazon.opendistroforelasticsearch.ad.ml.EntityModel; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelState; -import com.amazon.opendistroforelasticsearch.ad.ml.ThresholdingResult; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.model.Entity; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.MultiEntityResultHandler; -import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils; - public class EntityResultTransportAction extends HandledTransportAction { private static final Logger LOG = LogManager.getLogger(EntityResultTransportAction.class); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ForwardADTaskAction.java b/src/main/java/org/opensearch/ad/transport/ForwardADTaskAction.java similarity index 86% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ForwardADTaskAction.java rename to src/main/java/org/opensearch/ad/transport/ForwardADTaskAction.java index 4834bbea7..cd2d55e57 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ForwardADTaskAction.java +++ b/src/main/java/org/opensearch/ad/transport/ForwardADTaskAction.java @@ -24,13 +24,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonName.AD_TASK; +import static org.opensearch.ad.constant.CommonName.AD_TASK; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class ForwardADTaskAction extends ActionType { // Internal Action which is not used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ForwardADTaskRequest.java b/src/main/java/org/opensearch/ad/transport/ForwardADTaskRequest.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ForwardADTaskRequest.java rename to src/main/java/org/opensearch/ad/transport/ForwardADTaskRequest.java index 69b59c256..748761bf1 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ForwardADTaskRequest.java +++ b/src/main/java/org/opensearch/ad/transport/ForwardADTaskRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.opensearch.action.ValidateActions.addValidationError; @@ -32,12 +32,12 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.model.ADTaskAction; +import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskAction; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; import com.amazon.opendistroforelasticsearch.commons.authuser.User; public class ForwardADTaskRequest extends ActionRequest { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ForwardADTaskTransportAction.java b/src/main/java/org/opensearch/ad/transport/ForwardADTaskTransportAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ForwardADTaskTransportAction.java rename to src/main/java/org/opensearch/ad/transport/ForwardADTaskTransportAction.java index f597ad929..f2b496d0b 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ForwardADTaskTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ForwardADTaskTransportAction.java @@ -24,21 +24,20 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.OpenSearchStatusException; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.model.ADTaskAction; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.task.ADTaskManager; import org.opensearch.common.inject.Inject; import org.opensearch.rest.RestStatus; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskAction; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; - public class ForwardADTaskTransportAction extends HandledTransportAction { private final ADTaskManager adTaskManager; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorAction.java rename to src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorAction.java index d0ff91263..88e37d8c1 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class GetAnomalyDetectorAction extends ActionType { // External Action which used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorRequest.java b/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorRequest.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorRequest.java rename to src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorRequest.java index 4e2e0347f..c53775dc0 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorRequest.java +++ b/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorResponse.java b/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorResponse.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorResponse.java rename to src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorResponse.java index 365480915..e9179b4f6 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorResponse.java +++ b/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorResponse.java @@ -24,24 +24,23 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import org.opensearch.action.ActionResponse; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.DetectorProfile; +import org.opensearch.ad.model.EntityProfile; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.rest.RestStatus; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfile; -import com.amazon.opendistroforelasticsearch.ad.model.EntityProfile; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; - public class GetAnomalyDetectorResponse extends ActionResponse implements ToXContentObject { public static final String DETECTOR_PROFILE = "detectorProfile"; public static final String ENTITY_PROFILE = "entityProfile"; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorTransportAction.java rename to src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportAction.java index 26999bff8..49dbdc3f0 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportAction.java @@ -24,14 +24,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.getUserContext; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.resolveUserAndExecute; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.PROFILE; +import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; +import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; +import static org.opensearch.ad.util.ParseUtils.getUserContext; +import static org.opensearch.ad.util.ParseUtils.resolveUserAndExecute; +import static org.opensearch.ad.util.RestHandlerUtils.PROFILE; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.util.Arrays; @@ -51,6 +51,19 @@ import org.opensearch.action.get.MultiGetResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.AnomalyDetectorProfileRunner; +import org.opensearch.ad.EntityProfileRunner; +import org.opensearch.ad.Name; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.DetectorProfile; +import org.opensearch.ad.model.DetectorProfileName; +import org.opensearch.ad.model.EntityProfileName; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.task.ADTaskManager; +import org.opensearch.ad.util.DiscoveryNodeFilterer; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.CheckedConsumer; @@ -64,19 +77,6 @@ import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorProfileRunner; -import com.amazon.opendistroforelasticsearch.ad.EntityProfileRunner; -import com.amazon.opendistroforelasticsearch.ad.Name; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfile; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfileName; -import com.amazon.opendistroforelasticsearch.ad.model.EntityProfileName; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; import com.amazon.opendistroforelasticsearch.commons.authuser.User; import com.google.common.collect.Sets; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorAction.java rename to src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorAction.java index 3da46e42b..957373dfe 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class IndexAnomalyDetectorAction extends ActionType { // External Action which used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorRequest.java b/src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorRequest.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorRequest.java rename to src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorRequest.java index 5dffe5a72..460447e93 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorRequest.java +++ b/src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorRequest.java @@ -24,20 +24,19 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.support.WriteRequest; +import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.unit.TimeValue; import org.opensearch.rest.RestRequest; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; - public class IndexAnomalyDetectorRequest extends ActionRequest { private String detectorID; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorResponse.java b/src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorResponse.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorResponse.java rename to src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorResponse.java index f636ba3dd..8aab08e4d 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorResponse.java +++ b/src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorResponse.java @@ -24,20 +24,19 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import org.opensearch.action.ActionResponse; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.rest.RestStatus; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; - public class IndexAnomalyDetectorResponse extends ActionResponse implements ToXContentObject { private final String id; private final long version; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportAction.java similarity index 90% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorTransportAction.java rename to src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportAction.java index 0ad5e5785..43337a81e 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportAction.java @@ -24,12 +24,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.checkFilterByBackendRoles; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.getDetector; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.getUserContext; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; +import static org.opensearch.ad.util.ParseUtils.checkFilterByBackendRoles; +import static org.opensearch.ad.util.ParseUtils.getDetector; +import static org.opensearch.ad.util.ParseUtils.getUserContext; import java.io.IOException; import java.util.List; @@ -41,6 +41,12 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; import org.opensearch.action.support.WriteRequest; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.rest.handler.AnomalyDetectorFunction; +import org.opensearch.ad.rest.handler.IndexAnomalyDetectorActionHandler; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.task.ADTaskManager; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; @@ -54,12 +60,6 @@ import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.rest.handler.AnomalyDetectorFunction; -import com.amazon.opendistroforelasticsearch.ad.rest.handler.IndexAnomalyDetectorActionHandler; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; import com.amazon.opendistroforelasticsearch.commons.authuser.User; public class IndexAnomalyDetectorTransportAction extends HandledTransportAction { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorAction.java rename to src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorAction.java index d64e1e38d..47ea66fc7 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class PreviewAnomalyDetectorAction extends ActionType { // External Action which used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorRequest.java b/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorRequest.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorRequest.java rename to src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorRequest.java index a2aef2bbb..5b89279de 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorRequest.java +++ b/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorRequest.java @@ -24,18 +24,17 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.time.Instant; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; - public class PreviewAnomalyDetectorRequest extends ActionRequest { private AnomalyDetector detector; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorResponse.java b/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorResponse.java similarity index 92% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorResponse.java rename to src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorResponse.java index 40acacc5e..4f357d87d 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorResponse.java +++ b/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorResponse.java @@ -24,20 +24,19 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.List; import org.opensearch.action.ActionResponse; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyResult; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; - public class PreviewAnomalyDetectorResponse extends ActionResponse implements ToXContentObject { public static final String ANOMALY_RESULT = "anomaly_result"; public static final String ANOMALY_DETECTOR = "anomaly_detector"; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorTransportAction.java rename to src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportAction.java index 6b6839745..719d5d034 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportAction.java @@ -24,12 +24,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_ANOMALY_FEATURES; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.getUserContext; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.resolveUserAndExecute; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_ANOMALY_FEATURES; +import static org.opensearch.ad.util.ParseUtils.getUserContext; +import static org.opensearch.ad.util.ParseUtils.resolveUserAndExecute; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import java.io.IOException; @@ -45,6 +45,11 @@ import org.opensearch.action.get.GetResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.AnomalyDetectorRunner; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.CheckedConsumer; @@ -57,11 +62,6 @@ import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorRunner; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; import com.amazon.opendistroforelasticsearch.commons.authuser.User; public class PreviewAnomalyDetectorTransportAction extends diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileAction.java b/src/main/java/org/opensearch/ad/transport/ProfileAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileAction.java rename to src/main/java/org/opensearch/ad/transport/ProfileAction.java index 6ae3a74d1..033d32363 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileAction.java +++ b/src/main/java/org/opensearch/ad/transport/ProfileAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; /** * Profile transport action diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileNodeRequest.java b/src/main/java/org/opensearch/ad/transport/ProfileNodeRequest.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileNodeRequest.java rename to src/main/java/org/opensearch/ad/transport/ProfileNodeRequest.java index ed6c64b1f..32fe9257d 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileNodeRequest.java +++ b/src/main/java/org/opensearch/ad/transport/ProfileNodeRequest.java @@ -24,17 +24,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.Set; import org.opensearch.action.support.nodes.BaseNodeRequest; +import org.opensearch.ad.model.DetectorProfileName; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfileName; - /** * Class representing a nodes's profile request */ diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileNodeResponse.java b/src/main/java/org/opensearch/ad/transport/ProfileNodeResponse.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileNodeResponse.java rename to src/main/java/org/opensearch/ad/transport/ProfileNodeResponse.java index 3b128ab7b..f02e5c7d5 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileNodeResponse.java +++ b/src/main/java/org/opensearch/ad/transport/ProfileNodeResponse.java @@ -24,20 +24,19 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.Map; import org.opensearch.action.support.nodes.BaseNodeResponse; +import org.opensearch.ad.constant.CommonName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentFragment; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; - /** * Profile response on a node */ diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileRequest.java b/src/main/java/org/opensearch/ad/transport/ProfileRequest.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileRequest.java rename to src/main/java/org/opensearch/ad/transport/ProfileRequest.java index 5f8e11f39..d121d3dc6 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileRequest.java +++ b/src/main/java/org/opensearch/ad/transport/ProfileRequest.java @@ -24,19 +24,18 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.HashSet; import java.util.Set; import org.opensearch.action.support.nodes.BaseNodesRequest; +import org.opensearch.ad.model.DetectorProfileName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfileName; - /** * implements a request to obtain profiles about an AD detector */ diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileResponse.java b/src/main/java/org/opensearch/ad/transport/ProfileResponse.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileResponse.java rename to src/main/java/org/opensearch/ad/transport/ProfileResponse.java index 77a1fd57f..4e77650e7 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileResponse.java +++ b/src/main/java/org/opensearch/ad/transport/ProfileResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.ArrayList; @@ -33,15 +33,14 @@ import org.opensearch.action.FailedNodeException; import org.opensearch.action.support.nodes.BaseNodesResponse; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.ModelProfile; import org.opensearch.cluster.ClusterName; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentFragment; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.ModelProfile; - /** * This class consists of the aggregated responses from the nodes */ diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileTransportAction.java b/src/main/java/org/opensearch/ad/transport/ProfileTransportAction.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileTransportAction.java rename to src/main/java/org/opensearch/ad/transport/ProfileTransportAction.java index d18e057ba..0495552b6 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ProfileTransportAction.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.List; @@ -34,17 +34,16 @@ import org.opensearch.action.FailedNodeException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.nodes.TransportNodesAction; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.model.DetectorProfileName; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfileName; - /** * This class contains the logic to extract the stats from the nodes */ diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingAction.java b/src/main/java/org/opensearch/ad/transport/RCFPollingAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingAction.java rename to src/main/java/org/opensearch/ad/transport/RCFPollingAction.java index 55b10c234..0b0235dfe 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingAction.java +++ b/src/main/java/org/opensearch/ad/transport/RCFPollingAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class RCFPollingAction extends ActionType { // Internal Action which is not used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingRequest.java b/src/main/java/org/opensearch/ad/transport/RCFPollingRequest.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingRequest.java rename to src/main/java/org/opensearch/ad/transport/RCFPollingRequest.java index 2a6f857be..92de00a3d 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingRequest.java +++ b/src/main/java/org/opensearch/ad/transport/RCFPollingRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.opensearch.action.ValidateActions.addValidationError; @@ -32,15 +32,14 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonMessageAttributes; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; - public class RCFPollingRequest extends ActionRequest implements ToXContentObject { private String adID; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingResponse.java b/src/main/java/org/opensearch/ad/transport/RCFPollingResponse.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingResponse.java rename to src/main/java/org/opensearch/ad/transport/RCFPollingResponse.java index d9545a207..dcc57dc3d 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingResponse.java +++ b/src/main/java/org/opensearch/ad/transport/RCFPollingResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingTransportAction.java b/src/main/java/org/opensearch/ad/transport/RCFPollingTransportAction.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingTransportAction.java rename to src/main/java/org/opensearch/ad/transport/RCFPollingTransportAction.java index 59e9cbd6e..1072b640a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/RCFPollingTransportAction.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.Locale; @@ -35,6 +35,11 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.cluster.HashRing; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.ModelPartitioner; +import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; @@ -47,12 +52,6 @@ import org.opensearch.transport.TransportResponseHandler; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.cluster.HashRing; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelPartitioner; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; - /** * Transport action to get total rcf updates from hosted models or checkpoint * diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultAction.java b/src/main/java/org/opensearch/ad/transport/RCFResultAction.java similarity index 90% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultAction.java rename to src/main/java/org/opensearch/ad/transport/RCFResultAction.java index a4f8f97ee..a29809e04 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultAction.java +++ b/src/main/java/org/opensearch/ad/transport/RCFResultAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class RCFResultAction extends ActionType { // Internal Action which is not used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultRequest.java b/src/main/java/org/opensearch/ad/transport/RCFResultRequest.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultRequest.java rename to src/main/java/org/opensearch/ad/transport/RCFResultRequest.java index 3a6441f6a..8c63d0bb3 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultRequest.java +++ b/src/main/java/org/opensearch/ad/transport/RCFResultRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.opensearch.action.ValidateActions.addValidationError; @@ -32,15 +32,14 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonMessageAttributes; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; - public class RCFResultRequest extends ActionRequest implements ToXContentObject { private String adID; private String modelID; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultResponse.java b/src/main/java/org/opensearch/ad/transport/RCFResultResponse.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultResponse.java rename to src/main/java/org/opensearch/ad/transport/RCFResultResponse.java index ecfcf1a37..b18bf8196 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultResponse.java +++ b/src/main/java/org/opensearch/ad/transport/RCFResultResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/RCFResultTransportAction.java similarity index 90% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultTransportAction.java rename to src/main/java/org/opensearch/ad/transport/RCFResultTransportAction.java index dd06494c3..363aede22 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/RCFResultTransportAction.java @@ -24,22 +24,21 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.breaker.ADCircuitBreakerService; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.ml.ModelManager; import org.opensearch.common.inject.Inject; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.breaker.ADCircuitBreakerService; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; - public class RCFResultTransportAction extends HandledTransportAction { private static final Logger LOG = LogManager.getLogger(RCFResultTransportAction.class); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchADTasksAction.java b/src/main/java/org/opensearch/ad/transport/SearchADTasksAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchADTasksAction.java rename to src/main/java/org/opensearch/ad/transport/SearchADTasksAction.java index 2e62b1036..83e9143af 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchADTasksAction.java +++ b/src/main/java/org/opensearch/ad/transport/SearchADTasksAction.java @@ -24,12 +24,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; import org.opensearch.action.search.SearchResponse; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class SearchADTasksAction extends ActionType { // External Action which used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchADTasksTransportAction.java b/src/main/java/org/opensearch/ad/transport/SearchADTasksTransportAction.java similarity index 92% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchADTasksTransportAction.java rename to src/main/java/org/opensearch/ad/transport/SearchADTasksTransportAction.java index 5efb9eeae..211604c55 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchADTasksTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/SearchADTasksTransportAction.java @@ -24,19 +24,18 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionListener; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.transport.handler.ADSearchHandler; import org.opensearch.common.inject.Inject; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.ADSearchHandler; - public class SearchADTasksTransportAction extends HandledTransportAction { private ADSearchHandler searchHandler; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorAction.java rename to src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorAction.java index 987b4f9d4..1b214bcbf 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorAction.java @@ -24,12 +24,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; import org.opensearch.action.search.SearchResponse; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class SearchAnomalyDetectorAction extends ActionType { // External Action which used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoAction.java b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoAction.java rename to src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoAction.java index 91975d41d..cfa220ecc 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoAction.java +++ b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class SearchAnomalyDetectorInfoAction extends ActionType { // External Action which used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoRequest.java b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoRequest.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoRequest.java rename to src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoRequest.java index 992fa5ac9..c569dbe95 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoRequest.java +++ b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoResponse.java b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoResponse.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoResponse.java rename to src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoResponse.java index 42fe17686..59cebd927 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoResponse.java +++ b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoResponse.java @@ -24,18 +24,17 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import org.opensearch.action.ActionResponse; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; - public class SearchAnomalyDetectorInfoResponse extends ActionResponse implements ToXContentObject { private long count; private boolean nameExists; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoTransportAction.java b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoTransportAction.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoTransportAction.java rename to src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoTransportAction.java index 96f90f744..aa6511fb1 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoTransportAction.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; +import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -35,6 +35,7 @@ import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; @@ -46,8 +47,6 @@ import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; - public class SearchAnomalyDetectorInfoTransportAction extends HandledTransportAction { private static final Logger LOG = LogManager.getLogger(SearchAnomalyDetectorInfoTransportAction.class); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorTransportAction.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorTransportAction.java rename to src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorTransportAction.java index 5f51427fd..9043b31ec 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/SearchAnomalyDetectorTransportAction.java @@ -24,19 +24,18 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionListener; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.transport.handler.ADSearchHandler; import org.opensearch.common.inject.Inject; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.ADSearchHandler; - public class SearchAnomalyDetectorTransportAction extends HandledTransportAction { private ADSearchHandler searchHandler; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyResultAction.java b/src/main/java/org/opensearch/ad/transport/SearchAnomalyResultAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyResultAction.java rename to src/main/java/org/opensearch/ad/transport/SearchAnomalyResultAction.java index dc7bba2d9..de895428a 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyResultAction.java +++ b/src/main/java/org/opensearch/ad/transport/SearchAnomalyResultAction.java @@ -24,12 +24,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; import org.opensearch.action.search.SearchResponse; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class SearchAnomalyResultAction extends ActionType { // External Action which used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/SearchAnomalyResultTransportAction.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyResultTransportAction.java rename to src/main/java/org/opensearch/ad/transport/SearchAnomalyResultTransportAction.java index ab74dbca7..f4fe9bacf 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyResultTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/SearchAnomalyResultTransportAction.java @@ -24,19 +24,18 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionListener; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.transport.handler.ADSearchHandler; import org.opensearch.common.inject.Inject; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.ADSearchHandler; - public class SearchAnomalyResultTransportAction extends HandledTransportAction { private ADSearchHandler searchHandler; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorAction.java b/src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorAction.java rename to src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorAction.java index 94023b527..2a43ec216 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorAction.java +++ b/src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class StatsAnomalyDetectorAction extends ActionType { // External Action which used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorResponse.java b/src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorResponse.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorResponse.java rename to src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorResponse.java index 4f811400e..b7fcfd7de 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorResponse.java +++ b/src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorResponse.java @@ -24,18 +24,17 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import org.opensearch.action.ActionResponse; +import org.opensearch.ad.stats.ADStatsResponse; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStatsResponse; - public class StatsAnomalyDetectorResponse extends ActionResponse implements ToXContentObject { private ADStatsResponse adStatsResponse; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportAction.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorTransportAction.java rename to src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportAction.java index 2fb185e6c..65d177675 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportAction.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.util.HashMap; import java.util.List; @@ -38,6 +38,12 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorType; +import org.opensearch.ad.stats.ADStats; +import org.opensearch.ad.stats.ADStatsResponse; +import org.opensearch.ad.stats.StatNames; +import org.opensearch.ad.util.MultiResponsesDelegateActionListener; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; @@ -50,13 +56,6 @@ import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorType; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStats; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStatsResponse; -import com.amazon.opendistroforelasticsearch.ad.stats.StatNames; -import com.amazon.opendistroforelasticsearch.ad.util.MultiResponsesDelegateActionListener; - public class StatsAnomalyDetectorTransportAction extends HandledTransportAction { public static final String DETECTOR_TYPE_AGG = "detector_type_agg"; private final Logger logger = LogManager.getLogger(StatsAnomalyDetectorTransportAction.class); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorAction.java b/src/main/java/org/opensearch/ad/transport/StopDetectorAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorAction.java rename to src/main/java/org/opensearch/ad/transport/StopDetectorAction.java index 27038444b..59e46e7f3 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorAction.java +++ b/src/main/java/org/opensearch/ad/transport/StopDetectorAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class StopDetectorAction extends ActionType { // Internal Action which is not used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorRequest.java b/src/main/java/org/opensearch/ad/transport/StopDetectorRequest.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorRequest.java rename to src/main/java/org/opensearch/ad/transport/StopDetectorRequest.java index 28f7c5626..c02da2ef6 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorRequest.java +++ b/src/main/java/org/opensearch/ad/transport/StopDetectorRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.opensearch.action.ValidateActions.addValidationError; @@ -34,6 +34,8 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonMessageAttributes; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.InputStreamStreamInput; import org.opensearch.common.io.stream.OutputStreamStreamOutput; @@ -42,9 +44,6 @@ import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; - public class StopDetectorRequest extends ActionRequest implements ToXContentObject { private String adID; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorResponse.java b/src/main/java/org/opensearch/ad/transport/StopDetectorResponse.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorResponse.java rename to src/main/java/org/opensearch/ad/transport/StopDetectorResponse.java index 388b3ba00..ae30f9967 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorResponse.java +++ b/src/main/java/org/opensearch/ad/transport/StopDetectorResponse.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorTransportAction.java b/src/main/java/org/opensearch/ad/transport/StopDetectorTransportAction.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorTransportAction.java rename to src/main/java/org/opensearch/ad/transport/StopDetectorTransportAction.java index 6cbad9fcb..54b6d7d4c 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/StopDetectorTransportAction.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -35,15 +35,14 @@ import org.opensearch.action.FailedNodeException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.common.exception.InternalFailure; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.inject.Inject; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.common.exception.InternalFailure; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; - public class StopDetectorTransportAction extends HandledTransportAction { private static final Logger LOG = LogManager.getLogger(StopDetectorTransportAction.class); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultAction.java b/src/main/java/org/opensearch/ad/transport/ThresholdResultAction.java similarity index 91% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultAction.java rename to src/main/java/org/opensearch/ad/transport/ThresholdResultAction.java index bf0c690e9..0d36972f2 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultAction.java +++ b/src/main/java/org/opensearch/ad/transport/ThresholdResultAction.java @@ -24,11 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; +import org.opensearch.ad.constant.CommonValue; public class ThresholdResultAction extends ActionType { // Internal Action which is not used for public facing RestAPIs. diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultRequest.java b/src/main/java/org/opensearch/ad/transport/ThresholdResultRequest.java similarity index 93% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultRequest.java rename to src/main/java/org/opensearch/ad/transport/ThresholdResultRequest.java index ae9c74e4e..b824475b1 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultRequest.java +++ b/src/main/java/org/opensearch/ad/transport/ThresholdResultRequest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.opensearch.action.ValidateActions.addValidationError; @@ -32,15 +32,14 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonMessageAttributes; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; - public class ThresholdResultRequest extends ActionRequest implements ToXContentObject { private String adID; private String modelID; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultResponse.java b/src/main/java/org/opensearch/ad/transport/ThresholdResultResponse.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultResponse.java rename to src/main/java/org/opensearch/ad/transport/ThresholdResultResponse.java index 35073a173..e877c0fa3 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultResponse.java +++ b/src/main/java/org/opensearch/ad/transport/ThresholdResultResponse.java @@ -24,18 +24,17 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import org.opensearch.action.ActionResponse; +import org.opensearch.ad.constant.CommonMessageAttributes; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.XContentBuilder; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; - public class ThresholdResultResponse extends ActionResponse implements ToXContentObject { private double anomalyGrade; private double confidence; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultTransportAction.java b/src/main/java/org/opensearch/ad/transport/ThresholdResultTransportAction.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultTransportAction.java rename to src/main/java/org/opensearch/ad/transport/ThresholdResultTransportAction.java index 4da6d3e1d..cd8329884 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultTransportAction.java +++ b/src/main/java/org/opensearch/ad/transport/ThresholdResultTransportAction.java @@ -24,19 +24,18 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.ml.ModelManager; import org.opensearch.common.inject.Inject; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; - public class ThresholdResultTransportAction extends HandledTransportAction { private static final Logger LOG = LogManager.getLogger(ThresholdResultTransportAction.class); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/ADSearchHandler.java b/src/main/java/org/opensearch/ad/transport/handler/ADSearchHandler.java similarity index 88% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/ADSearchHandler.java rename to src/main/java/org/opensearch/ad/transport/handler/ADSearchHandler.java index 0ee5e2491..2e6e308a5 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/ADSearchHandler.java +++ b/src/main/java/org/opensearch/ad/transport/handler/ADSearchHandler.java @@ -24,23 +24,23 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport.handler; +package org.opensearch.ad.transport.handler; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.addUserBackendRolesFilter; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.getUserContext; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; +import static org.opensearch.ad.util.ParseUtils.addUserBackendRolesFilter; +import static org.opensearch.ad.util.ParseUtils.getUserContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; +import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; import com.amazon.opendistroforelasticsearch.commons.authuser.User; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/AnomalyIndexHandler.java b/src/main/java/org/opensearch/ad/transport/handler/AnomalyIndexHandler.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/AnomalyIndexHandler.java rename to src/main/java/org/opensearch/ad/transport/handler/AnomalyIndexHandler.java index 2c52b74a7..8b6198ae5 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/AnomalyIndexHandler.java +++ b/src/main/java/org/opensearch/ad/transport/handler/AnomalyIndexHandler.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport.handler; +package org.opensearch.ad.transport.handler; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; @@ -42,6 +42,11 @@ import org.opensearch.action.bulk.BackoffPolicy; import org.opensearch.action.index.IndexRequest; import org.opensearch.action.index.IndexResponse; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.IndexUtils; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.cluster.block.ClusterBlockLevel; import org.opensearch.cluster.service.ClusterService; @@ -52,12 +57,6 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; - public class AnomalyIndexHandler { private static final Logger LOG = LogManager.getLogger(AnomalyIndexHandler.class); static final String FAIL_TO_SAVE_ERR_MSG = "Fail to save %s: "; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/AnomalyResultBulkIndexHandler.java b/src/main/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandler.java similarity index 90% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/AnomalyResultBulkIndexHandler.java rename to src/main/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandler.java index 822d9de0c..962936b24 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/AnomalyResultBulkIndexHandler.java +++ b/src/main/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandler.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport.handler; +package org.opensearch.ad.transport.handler; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonName.ANOMALY_RESULT_INDEX_ALIAS; +import static org.opensearch.ad.constant.CommonName.ANOMALY_RESULT_INDEX_ALIAS; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; import java.util.List; @@ -42,19 +42,18 @@ import org.opensearch.action.bulk.BulkRequestBuilder; import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.index.IndexRequest; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.IndexUtils; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; - public class AnomalyResultBulkIndexHandler extends AnomalyIndexHandler { private static final Logger LOG = LogManager.getLogger(AnomalyResultBulkIndexHandler.class); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/DetectionStateHandler.java b/src/main/java/org/opensearch/ad/transport/handler/DetectionStateHandler.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/DetectionStateHandler.java rename to src/main/java/org/opensearch/ad/transport/handler/DetectionStateHandler.java index 0f637fafd..766b47198 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/DetectionStateHandler.java +++ b/src/main/java/org/opensearch/ad/transport/handler/DetectionStateHandler.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport.handler; +package org.opensearch.ad.transport.handler; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; @@ -40,6 +40,11 @@ import org.opensearch.action.admin.indices.create.CreateIndexResponse; import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.DetectorInternalState; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.IndexUtils; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; @@ -50,11 +55,6 @@ import org.opensearch.index.IndexNotFoundException; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorInternalState; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; import com.google.common.base.Objects; public class DetectionStateHandler extends AnomalyIndexHandler { diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/MultiEntityResultHandler.java b/src/main/java/org/opensearch/ad/transport/handler/MultiEntityResultHandler.java similarity index 89% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/MultiEntityResultHandler.java rename to src/main/java/org/opensearch/ad/transport/handler/MultiEntityResultHandler.java index e04749011..22523c9bb 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/MultiEntityResultHandler.java +++ b/src/main/java/org/opensearch/ad/transport/handler/MultiEntityResultHandler.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport.handler; +package org.opensearch.ad.transport.handler; import java.time.Clock; import java.util.Locale; @@ -38,6 +38,16 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.admin.indices.create.CreateIndexResponse; import org.opensearch.action.bulk.BulkResponse; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.transport.ADResultBulkAction; +import org.opensearch.ad.transport.ADResultBulkRequest; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.IndexUtils; +import org.opensearch.ad.util.ThrowingConsumerWrapper; import org.opensearch.client.Client; import org.opensearch.cluster.block.ClusterBlockLevel; import org.opensearch.cluster.service.ClusterService; @@ -45,17 +55,6 @@ import org.opensearch.common.settings.Settings; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.transport.ADResultBulkAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ADResultBulkRequest; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; -import com.amazon.opendistroforelasticsearch.ad.util.ThrowingConsumerWrapper; - /** * EntityResultTransportAction depends on this class. I cannot use * AnomalyIndexHandler < AnomalyResult > . All transport actions diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/BulkUtil.java b/src/main/java/org/opensearch/ad/util/BulkUtil.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/util/BulkUtil.java rename to src/main/java/org/opensearch/ad/util/BulkUtil.java index d1ea382d4..60c7ab3b2 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/BulkUtil.java +++ b/src/main/java/org/opensearch/ad/util/BulkUtil.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ClientUtil.java b/src/main/java/org/opensearch/ad/util/ClientUtil.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ClientUtil.java rename to src/main/java/org/opensearch/ad/util/ClientUtil.java index 4f1c9b8c6..049aad5ae 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ClientUtil.java +++ b/src/main/java/org/opensearch/ad/util/ClientUtil.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; import java.util.List; import java.util.Optional; @@ -52,6 +52,10 @@ import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksAction; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksRequest; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; +import org.opensearch.ad.common.exception.InternalFailure; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.client.Client; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; @@ -62,11 +66,6 @@ import org.opensearch.tasks.TaskInfo; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.common.exception.InternalFailure; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; - public class ClientUtil { private volatile TimeValue requestTimeout; private Client client; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/DiscoveryNodeFilterer.java b/src/main/java/org/opensearch/ad/util/DiscoveryNodeFilterer.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/util/DiscoveryNodeFilterer.java rename to src/main/java/org/opensearch/ad/util/DiscoveryNodeFilterer.java index a09d12f82..8356920f6 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/DiscoveryNodeFilterer.java +++ b/src/main/java/org/opensearch/ad/util/DiscoveryNodeFilterer.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; import java.util.ArrayList; import java.util.List; @@ -32,12 +32,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.opensearch.ad.constant.CommonName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; - /** * Util class to filter unwanted node types * diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ExceptionUtil.java b/src/main/java/org/opensearch/ad/util/ExceptionUtil.java similarity index 94% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ExceptionUtil.java rename to src/main/java/org/opensearch/ad/util/ExceptionUtil.java index 3f4228560..89b4503a9 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ExceptionUtil.java +++ b/src/main/java/org/opensearch/ad/util/ExceptionUtil.java @@ -24,17 +24,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; import org.apache.commons.lang.exception.ExceptionUtils; import org.opensearch.OpenSearchException; import org.opensearch.action.index.IndexResponse; import org.opensearch.action.support.replication.ReplicationResponse; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.common.exception.ResourceNotFoundException; import org.opensearch.common.io.stream.NotSerializableExceptionWrapper; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.ResourceNotFoundException; - public class ExceptionUtil { public static final String RESOURCE_NOT_FOUND_EXCEPTION_NAME_UNDERSCORE = OpenSearchException .getExceptionName(new ResourceNotFoundException("", "")); diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/IndexUtils.java b/src/main/java/org/opensearch/ad/util/IndexUtils.java similarity index 99% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/util/IndexUtils.java rename to src/main/java/org/opensearch/ad/util/IndexUtils.java index 3bbd1d543..87c35af60 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/IndexUtils.java +++ b/src/main/java/org/opensearch/ad/util/IndexUtils.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; import java.util.List; import java.util.Locale; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/MultiResponsesDelegateActionListener.java b/src/main/java/org/opensearch/ad/util/MultiResponsesDelegateActionListener.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/util/MultiResponsesDelegateActionListener.java rename to src/main/java/org/opensearch/ad/util/MultiResponsesDelegateActionListener.java index 7107d089f..84b88b34b 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/MultiResponsesDelegateActionListener.java +++ b/src/main/java/org/opensearch/ad/util/MultiResponsesDelegateActionListener.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; import java.util.ArrayList; import java.util.Collections; @@ -35,8 +35,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; - -import com.amazon.opendistroforelasticsearch.ad.model.Mergeable; +import org.opensearch.ad.model.Mergeable; /** * A listener wrapper to help send multiple requests asynchronously and return one final responses together diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ParseUtils.java b/src/main/java/org/opensearch/ad/util/ParseUtils.java similarity index 96% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ParseUtils.java rename to src/main/java/org/opensearch/ad/util/ParseUtils.java index 1673ddd51..0e5d9cc35 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ParseUtils.java +++ b/src/main/java/org/opensearch/ad/util/ParseUtils.java @@ -24,13 +24,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonName.DATE_HISTOGRAM; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonName.EPOCH_MILLIS_FORMAT; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonName.FEATURE_AGGS; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.QUERY_PARAM_PERIOD_END; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.QUERY_PARAM_PERIOD_START; +import static org.opensearch.ad.constant.CommonName.DATE_HISTOGRAM; +import static org.opensearch.ad.constant.CommonName.EPOCH_MILLIS_FORMAT; +import static org.opensearch.ad.constant.CommonName.FEATURE_AGGS; +import static org.opensearch.ad.model.AnomalyDetector.QUERY_PARAM_PERIOD_END; +import static org.opensearch.ad.model.AnomalyDetector.QUERY_PARAM_PERIOD_START; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import static org.opensearch.search.aggregations.AggregationBuilders.dateRange; import static org.opensearch.search.aggregations.AggregatorFactories.VALID_AGG_NAME; @@ -53,6 +53,14 @@ import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; import org.opensearch.action.search.SearchResponse; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.Feature; +import org.opensearch.ad.model.FeatureData; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.rest.handler.AnomalyDetectorFunction; +import org.opensearch.ad.transport.GetAnomalyDetectorResponse; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.ParsingException; @@ -79,14 +87,6 @@ import org.opensearch.search.aggregations.metrics.Max; import org.opensearch.search.builder.SearchSourceBuilder; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.Feature; -import com.amazon.opendistroforelasticsearch.ad.model.FeatureData; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.rest.handler.AnomalyDetectorFunction; -import com.amazon.opendistroforelasticsearch.ad.transport.GetAnomalyDetectorResponse; import com.amazon.opendistroforelasticsearch.commons.ConfigConstants; import com.amazon.opendistroforelasticsearch.commons.authuser.User; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/RestHandlerUtils.java b/src/main/java/org/opensearch/ad/util/RestHandlerUtils.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/util/RestHandlerUtils.java rename to src/main/java/org/opensearch/ad/util/RestHandlerUtils.java index 111cc1715..a2e21b4b1 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/RestHandlerUtils.java +++ b/src/main/java/org/opensearch/ad/util/RestHandlerUtils.java @@ -24,13 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; import java.io.IOException; import java.util.HashSet; import java.util.List; import java.util.Set; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.Feature; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.LoggingDeprecationHandler; @@ -43,8 +45,6 @@ import org.opensearch.rest.RestRequest; import org.opensearch.search.fetch.subphase.FetchSourceContext; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.Feature; import com.google.common.collect.ImmutableMap; /** diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/Throttler.java b/src/main/java/org/opensearch/ad/util/Throttler.java similarity index 98% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/util/Throttler.java rename to src/main/java/org/opensearch/ad/util/Throttler.java index b2cceb865..e9771e1eb 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/Throttler.java +++ b/src/main/java/org/opensearch/ad/util/Throttler.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; import java.time.Clock; import java.time.Instant; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ThrowingConsumer.java b/src/main/java/org/opensearch/ad/util/ThrowingConsumer.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ThrowingConsumer.java rename to src/main/java/org/opensearch/ad/util/ThrowingConsumer.java index 4471879ce..e7644e75c 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ThrowingConsumer.java +++ b/src/main/java/org/opensearch/ad/util/ThrowingConsumer.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; /** * A consumer that can throw checked exception diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ThrowingConsumerWrapper.java b/src/main/java/org/opensearch/ad/util/ThrowingConsumerWrapper.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ThrowingConsumerWrapper.java rename to src/main/java/org/opensearch/ad/util/ThrowingConsumerWrapper.java index f1b5d27de..4b76107c0 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ThrowingConsumerWrapper.java +++ b/src/main/java/org/opensearch/ad/util/ThrowingConsumerWrapper.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; import java.util.function.Consumer; diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ThrowingSupplier.java b/src/main/java/org/opensearch/ad/util/ThrowingSupplier.java similarity index 95% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ThrowingSupplier.java rename to src/main/java/org/opensearch/ad/util/ThrowingSupplier.java index b13cecbd0..c67485127 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ThrowingSupplier.java +++ b/src/main/java/org/opensearch/ad/util/ThrowingSupplier.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; /** * A supplier that can throw checked exception diff --git a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ThrowingSupplierWrapper.java b/src/main/java/org/opensearch/ad/util/ThrowingSupplierWrapper.java similarity index 97% rename from src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ThrowingSupplierWrapper.java rename to src/main/java/org/opensearch/ad/util/ThrowingSupplierWrapper.java index 38412cbaf..703f86a66 100644 --- a/src/main/java/com/amazon/opendistroforelasticsearch/ad/util/ThrowingSupplierWrapper.java +++ b/src/main/java/org/opensearch/ad/util/ThrowingSupplierWrapper.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; import java.util.function.Supplier; diff --git a/src/main/resources/META-INF/services/com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobSchedulerExtension b/src/main/resources/META-INF/services/com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobSchedulerExtension index b8b4875c4..627699843 100644 --- a/src/main/resources/META-INF/services/com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobSchedulerExtension +++ b/src/main/resources/META-INF/services/com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobSchedulerExtension @@ -1 +1 @@ -com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin +org.opensearch.ad.AnomalyDetectorPlugin diff --git a/src/main/resources/es-plugin.properties b/src/main/resources/es-plugin.properties index acba0928c..13b8d7ace 100644 --- a/src/main/resources/es-plugin.properties +++ b/src/main/resources/es-plugin.properties @@ -22,5 +22,5 @@ # permissions and limitations under the License. # -plugin=com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin +plugin=org.opensearch.ad.AnomalyDetectorPlugin version=${project.version} \ No newline at end of file diff --git a/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java b/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java index 48f5a69d6..d50d8354b 100644 --- a/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java +++ b/src/test/java/org/opensearch/action/admin/indices/mapping/get/IndexAnomalyDetectorActionHandlerTests.java @@ -26,7 +26,6 @@ package org.opensearch.action.admin.indices.mapping.get; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.eq; @@ -36,6 +35,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; import java.io.IOException; import java.util.Arrays; @@ -56,6 +56,14 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.WriteRequest; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.rest.handler.IndexAnomalyDetectorActionHandler; +import org.opensearch.ad.task.ADTaskManager; +import org.opensearch.ad.transport.IndexAnomalyDetectorResponse; import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; @@ -68,15 +76,6 @@ import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.rest.handler.IndexAnomalyDetectorActionHandler; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; -import com.amazon.opendistroforelasticsearch.ad.transport.IndexAnomalyDetectorResponse; - /** * * we need to put the test in the same package of GetFieldMappingsResponse diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ADIntegTestCase.java b/src/test/java/org/opensearch/ad/ADIntegTestCase.java similarity index 93% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/ADIntegTestCase.java rename to src/test/java/org/opensearch/ad/ADIntegTestCase.java index d0f2547cf..a6e7cb4b2 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ADIntegTestCase.java +++ b/src/test/java/org/opensearch/ad/ADIntegTestCase.java @@ -24,10 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; -import static com.amazon.opendistroforelasticsearch.ad.AbstractADTest.LOG; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.XCONTENT_WITH_TYPE; +import static org.opensearch.ad.AbstractADTest.LOG; +import static org.opensearch.ad.util.RestHandlerUtils.XCONTENT_WITH_TYPE; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; import java.io.IOException; @@ -53,6 +53,13 @@ import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.WriteRequest; import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNode; @@ -66,13 +73,6 @@ import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.test.OpenSearchIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; public abstract class ADIntegTestCase extends OpenSearchIntegTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ADUnitTestCase.java b/src/test/java/org/opensearch/ad/ADUnitTestCase.java similarity index 97% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/ADUnitTestCase.java rename to src/test/java/org/opensearch/ad/ADUnitTestCase.java index 90046ec2b..576850380 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ADUnitTestCase.java +++ b/src/test/java/org/opensearch/ad/ADUnitTestCase.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/AbstractADTest.java b/src/test/java/org/opensearch/ad/AbstractADTest.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/AbstractADTest.java rename to src/test/java/org/opensearch/ad/AbstractADTest.java index 88187aeef..22fe58dc9 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/AbstractADTest.java +++ b/src/test/java/org/opensearch/ad/AbstractADTest.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import static org.hamcrest.Matchers.containsString; import static org.mockito.ArgumentMatchers.any; @@ -53,6 +53,10 @@ import org.opensearch.Version; import org.opensearch.action.ActionResponse; import org.opensearch.action.support.PlainActionFuture; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.model.DetectorInternalState; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.bytes.BytesReference; @@ -71,12 +75,7 @@ import org.opensearch.transport.TransportInterceptor; import org.opensearch.transport.TransportService; -import test.com.amazon.opendistroforelasticsearch.ad.util.FakeNode; - -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorInternalState; +import test.org.opensearch.ad.util.FakeNode; public class AbstractADTest extends OpenSearchTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/AbstractProfileRunnerTests.java b/src/test/java/org/opensearch/ad/AbstractProfileRunnerTests.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/AbstractProfileRunnerTests.java rename to src/test/java/org/opensearch/ad/AbstractProfileRunnerTests.java index 9cb035673..6c142e132 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/AbstractProfileRunnerTests.java +++ b/src/test/java/org/opensearch/ad/AbstractProfileRunnerTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; @@ -39,6 +39,10 @@ import org.junit.BeforeClass; import org.opensearch.Version; import org.opensearch.action.get.GetResponse; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.DetectorProfileName; +import org.opensearch.ad.task.ADTaskManager; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; @@ -47,11 +51,6 @@ import org.opensearch.common.transport.TransportAddress; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfileName; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; - public class AbstractProfileRunnerTests extends AbstractADTest { protected enum DetectorStatus { INDEX_NOT_EXIST, diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorJobRunnerTests.java b/src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorJobRunnerTests.java rename to src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java index 20b4372b4..de8ebc5e9 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorJobRunnerTests.java +++ b/src/test/java/org/opensearch/ad/AnomalyDetectorJobRunnerTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -59,6 +59,16 @@ import org.opensearch.action.get.GetResponse; import org.opensearch.action.index.IndexRequest; import org.opensearch.action.index.IndexResponse; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.transport.handler.AnomalyIndexHandler; +import org.opensearch.ad.transport.handler.DetectionStateHandler; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.IndexUtils; +import org.opensearch.ad.util.ThrowingConsumerWrapper; import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; @@ -75,16 +85,6 @@ import org.opensearch.index.shard.ShardId; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.AnomalyIndexHandler; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.DetectionStateHandler; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; -import com.amazon.opendistroforelasticsearch.ad.util.ThrowingConsumerWrapper; import com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobExecutionContext; import com.amazon.opendistroforelasticsearch.jobscheduler.spi.LockModel; import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParameter; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorProfileRunnerTests.java b/src/test/java/org/opensearch/ad/AnomalyDetectorProfileRunnerTests.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorProfileRunnerTests.java rename to src/test/java/org/opensearch/ad/AnomalyDetectorProfileRunnerTests.java index 409a6d305..ba687f2d3 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorProfileRunnerTests.java +++ b/src/test/java/org/opensearch/ad/AnomalyDetectorProfileRunnerTests.java @@ -24,15 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.when; +import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; +import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; import java.io.IOException; import java.time.Instant; @@ -51,6 +51,24 @@ import org.opensearch.action.FailedNodeException; import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.common.exception.ResourceNotFoundException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.DetectorInternalState; +import org.opensearch.ad.model.DetectorProfile; +import org.opensearch.ad.model.DetectorProfileName; +import org.opensearch.ad.model.DetectorState; +import org.opensearch.ad.model.InitProgressProfile; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.model.ModelProfile; +import org.opensearch.ad.transport.ProfileAction; +import org.opensearch.ad.transport.ProfileNodeResponse; +import org.opensearch.ad.transport.ProfileResponse; +import org.opensearch.ad.transport.RCFPollingAction; +import org.opensearch.ad.transport.RCFPollingResponse; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.io.stream.NotSerializableExceptionWrapper; @@ -58,25 +76,6 @@ import org.opensearch.index.IndexNotFoundException; import org.opensearch.transport.RemoteTransportException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.ResourceNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorInternalState; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfile; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfileName; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorState; -import com.amazon.opendistroforelasticsearch.ad.model.InitProgressProfile; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.model.ModelProfile; -import com.amazon.opendistroforelasticsearch.ad.transport.ProfileAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ProfileNodeResponse; -import com.amazon.opendistroforelasticsearch.ad.transport.ProfileResponse; -import com.amazon.opendistroforelasticsearch.ad.transport.RCFPollingAction; -import com.amazon.opendistroforelasticsearch.ad.transport.RCFPollingResponse; - public class AnomalyDetectorProfileRunnerTests extends AbstractProfileRunnerTests { enum RCFPollingStatus { INIT_NOT_EXIT, diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorRestTestCase.java b/src/test/java/org/opensearch/ad/AnomalyDetectorRestTestCase.java similarity index 97% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorRestTestCase.java rename to src/test/java/org/opensearch/ad/AnomalyDetectorRestTestCase.java index 8103ed829..81a66c74b 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/AnomalyDetectorRestTestCase.java +++ b/src/test/java/org/opensearch/ad/AnomalyDetectorRestTestCase.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import static org.apache.http.entity.ContentType.APPLICATION_JSON; import static org.opensearch.common.xcontent.json.JsonXContent.jsonXContent; @@ -38,6 +38,11 @@ import org.apache.http.HttpHeaders; import org.apache.http.entity.StringEntity; import org.apache.http.message.BasicHeader; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorExecutionInput; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Request; import org.opensearch.client.Response; import org.opensearch.client.RestClient; @@ -55,11 +60,6 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.rest.RestStatus; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorExecutionInput; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonArray; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/EntityProfileRunnerTests.java b/src/test/java/org/opensearch/ad/EntityProfileRunnerTests.java similarity index 92% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/EntityProfileRunnerTests.java rename to src/test/java/org/opensearch/ad/EntityProfileRunnerTests.java index e89c8483c..0e74400e8 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/EntityProfileRunnerTests.java +++ b/src/test/java/org/opensearch/ad/EntityProfileRunnerTests.java @@ -24,14 +24,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; import static java.util.Collections.emptyMap; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; +import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; +import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; import java.io.IOException; import java.time.temporal.ChronoUnit; @@ -49,6 +49,18 @@ import org.opensearch.action.search.SearchResponse; import org.opensearch.action.search.SearchResponseSections; import org.opensearch.action.search.ShardSearchFailure; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.EntityProfile; +import org.opensearch.ad.model.EntityProfileName; +import org.opensearch.ad.model.EntityState; +import org.opensearch.ad.model.InitProgressProfile; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.model.ModelProfile; +import org.opensearch.ad.transport.EntityProfileAction; +import org.opensearch.ad.transport.EntityProfileResponse; import org.opensearch.client.Client; import org.opensearch.index.IndexNotFoundException; import org.opensearch.search.DocValueFormat; @@ -57,19 +69,6 @@ import org.opensearch.search.aggregations.InternalAggregations; import org.opensearch.search.aggregations.metrics.InternalMax; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.EntityProfile; -import com.amazon.opendistroforelasticsearch.ad.model.EntityProfileName; -import com.amazon.opendistroforelasticsearch.ad.model.EntityState; -import com.amazon.opendistroforelasticsearch.ad.model.InitProgressProfile; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.model.ModelProfile; -import com.amazon.opendistroforelasticsearch.ad.transport.EntityProfileAction; -import com.amazon.opendistroforelasticsearch.ad.transport.EntityProfileResponse; - public class EntityProfileRunnerTests extends AbstractADTest { private AnomalyDetector detector; private int detectorIntervalMin; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/HistoricalDetectorIntegTestCase.java b/src/test/java/org/opensearch/ad/HistoricalDetectorIntegTestCase.java similarity index 87% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/HistoricalDetectorIntegTestCase.java rename to src/test/java/org/opensearch/ad/HistoricalDetectorIntegTestCase.java index 65b9799be..d446e6071 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/HistoricalDetectorIntegTestCase.java +++ b/src/test/java/org/opensearch/ad/HistoricalDetectorIntegTestCase.java @@ -24,12 +24,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.DETECTOR_ID_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.EXECUTION_START_TIME_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.model.ADTask.IS_LATEST_FIELD; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.START_JOB; +import static org.opensearch.ad.model.ADTask.DETECTOR_ID_FIELD; +import static org.opensearch.ad.model.ADTask.EXECUTION_START_TIME_FIELD; +import static org.opensearch.ad.model.ADTask.IS_LATEST_FIELD; +import static org.opensearch.ad.util.RestHandlerUtils.START_JOB; import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_PRIMARY_TERM; import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; @@ -47,6 +47,18 @@ import org.opensearch.action.get.GetResponse; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.mock.plugin.MockReindexPlugin; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.ADTaskState; +import org.opensearch.ad.model.ADTaskType; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.DetectionDateRange; +import org.opensearch.ad.model.Feature; +import org.opensearch.ad.transport.AnomalyDetectorJobAction; +import org.opensearch.ad.transport.AnomalyDetectorJobRequest; +import org.opensearch.ad.transport.AnomalyDetectorJobResponse; import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.index.query.TermQueryBuilder; import org.opensearch.plugins.Plugin; @@ -57,18 +69,6 @@ import org.opensearch.search.sort.SortOrder; import org.opensearch.test.transport.MockTransportService; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.mock.plugin.MockReindexPlugin; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskState; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskType; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.DetectionDateRange; -import com.amazon.opendistroforelasticsearch.ad.model.Feature; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyDetectorJobAction; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyDetectorJobRequest; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyDetectorJobResponse; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/HistoricalDetectorRestTestCase.java b/src/test/java/org/opensearch/ad/HistoricalDetectorRestTestCase.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/HistoricalDetectorRestTestCase.java rename to src/test/java/org/opensearch/ad/HistoricalDetectorRestTestCase.java index dfcd2112e..16617bef4 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/HistoricalDetectorRestTestCase.java +++ b/src/test/java/org/opensearch/ad/HistoricalDetectorRestTestCase.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; import java.io.IOException; import java.time.Instant; @@ -39,6 +39,11 @@ import org.apache.http.message.BasicHeader; import org.apache.http.util.EntityUtils; import org.junit.Before; +import org.opensearch.ad.mock.model.MockSimpleLog; +import org.opensearch.ad.model.ADTaskProfile; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.DetectionDateRange; +import org.opensearch.ad.model.Feature; import org.opensearch.client.Response; import org.opensearch.client.RestClient; import org.opensearch.common.xcontent.ToXContentObject; @@ -46,11 +51,6 @@ import org.opensearch.rest.RestStatus; import org.opensearch.search.aggregations.AggregationBuilder; -import com.amazon.opendistroforelasticsearch.ad.mock.model.MockSimpleLog; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskProfile; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.DetectionDateRange; -import com.amazon.opendistroforelasticsearch.ad.model.Feature; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/MemoryTrackerTests.java b/src/test/java/org/opensearch/ad/MemoryTrackerTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/MemoryTrackerTests.java rename to src/test/java/org/opensearch/ad/MemoryTrackerTests.java index 3e5ca929f..07f6c275e 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/MemoryTrackerTests.java +++ b/src/test/java/org/opensearch/ad/MemoryTrackerTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -33,6 +33,9 @@ import java.util.Collections; import java.util.HashSet; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; @@ -42,9 +45,6 @@ import org.opensearch.monitor.jvm.JvmService; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; import com.amazon.randomcutforest.RandomCutForest; public class MemoryTrackerTests extends OpenSearchTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/MultiEntityProfileRunnerTests.java b/src/test/java/org/opensearch/ad/MultiEntityProfileRunnerTests.java similarity index 90% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/MultiEntityProfileRunnerTests.java rename to src/test/java/org/opensearch/ad/MultiEntityProfileRunnerTests.java index 6b66369ab..a3b10e71d 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/MultiEntityProfileRunnerTests.java +++ b/src/test/java/org/opensearch/ad/MultiEntityProfileRunnerTests.java @@ -24,15 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; +import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; +import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; import java.time.Instant; import java.util.Arrays; @@ -53,26 +53,25 @@ import org.opensearch.action.get.GetResponse; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.model.DetectorInternalState; +import org.opensearch.ad.model.DetectorProfile; +import org.opensearch.ad.model.DetectorProfileName; +import org.opensearch.ad.model.DetectorState; +import org.opensearch.ad.task.ADTaskManager; +import org.opensearch.ad.transport.ProfileAction; +import org.opensearch.ad.transport.ProfileNodeResponse; +import org.opensearch.ad.transport.ProfileResponse; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.transport.TransportAddress; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorInternalState; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfile; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfileName; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorState; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; -import com.amazon.opendistroforelasticsearch.ad.transport.ProfileAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ProfileNodeResponse; -import com.amazon.opendistroforelasticsearch.ad.transport.ProfileResponse; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; - public class MultiEntityProfileRunnerTests extends AbstractADTest { private AnomalyDetectorProfileRunner runner; private Client client; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/NodeStateManagerTests.java b/src/test/java/org/opensearch/ad/NodeStateManagerTests.java similarity index 97% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/NodeStateManagerTests.java rename to src/test/java/org/opensearch/ad/NodeStateManagerTests.java index 78afc1b34..8d26b87e1 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/NodeStateManagerTests.java +++ b/src/test/java/org/opensearch/ad/NodeStateManagerTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doAnswer; @@ -51,6 +51,10 @@ import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; import org.opensearch.action.search.SearchRequest; +import org.opensearch.ad.ml.ModelPartitioner; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.Throttler; import org.opensearch.client.Client; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; @@ -59,10 +63,6 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelPartitioner; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.Throttler; import com.google.common.collect.ImmutableMap; public class NodeStateManagerTests extends OpenSearchTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/NodeStateTests.java b/src/test/java/org/opensearch/ad/NodeStateTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/NodeStateTests.java rename to src/test/java/org/opensearch/ad/NodeStateTests.java index 6ea1ddec4..6b3c3d6d8 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/NodeStateTests.java +++ b/src/test/java/org/opensearch/ad/NodeStateTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -34,10 +34,9 @@ import java.time.Duration; import java.time.Instant; +import org.opensearch.ad.common.exception.AnomalyDetectionException; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; - public class NodeStateTests extends OpenSearchTestCase { private NodeState state; private Clock clock; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ODFERestTestCase.java b/src/test/java/org/opensearch/ad/ODFERestTestCase.java similarity index 99% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/ODFERestTestCase.java rename to src/test/java/org/opensearch/ad/ODFERestTestCase.java index 820d4199d..edda5359a 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ODFERestTestCase.java +++ b/src/test/java/org/opensearch/ad/ODFERestTestCase.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import static com.amazon.opendistroforelasticsearch.commons.ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_ENABLED; import static com.amazon.opendistroforelasticsearch.commons.ConfigConstants.OPENDISTRO_SECURITY_SSL_HTTP_KEYSTORE_FILEPATH; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/TestHelpers.java b/src/test/java/org/opensearch/ad/TestHelpers.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/TestHelpers.java rename to src/test/java/org/opensearch/ad/TestHelpers.java index 0f34ecf29..3ee749871 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/TestHelpers.java +++ b/src/test/java/org/opensearch/ad/TestHelpers.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad; +package org.opensearch.ad; import static org.apache.http.entity.ContentType.APPLICATION_JSON; import static org.opensearch.cluster.node.DiscoveryNodeRole.BUILT_IN_ROLES; @@ -76,6 +76,25 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.search.ShardSearchFailure; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.constant.CommonValue; +import org.opensearch.ad.feature.Features; +import org.opensearch.ad.ml.ThresholdingResult; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.ADTaskState; +import org.opensearch.ad.model.ADTaskType; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorExecutionInput; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.AnomalyDetectorType; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.model.DetectionDateRange; +import org.opensearch.ad.model.DetectorInternalState; +import org.opensearch.ad.model.Entity; +import org.opensearch.ad.model.Feature; +import org.opensearch.ad.model.FeatureData; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.model.TimeConfiguration; import org.opensearch.client.AdminClient; import org.opensearch.client.Client; import org.opensearch.client.Request; @@ -128,25 +147,6 @@ import org.opensearch.test.rest.OpenSearchRestTestCase; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; -import com.amazon.opendistroforelasticsearch.ad.feature.Features; -import com.amazon.opendistroforelasticsearch.ad.ml.ThresholdingResult; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskState; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskType; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorExecutionInput; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorType; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.model.DetectionDateRange; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorInternalState; -import com.amazon.opendistroforelasticsearch.ad.model.Entity; -import com.amazon.opendistroforelasticsearch.ad.model.Feature; -import com.amazon.opendistroforelasticsearch.ad.model.FeatureData; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.model.TimeConfiguration; import com.amazon.opendistroforelasticsearch.commons.authuser.User; import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.IntervalSchedule; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/breaker/ADCircuitBreakerServiceTests.java b/src/test/java/org/opensearch/ad/breaker/ADCircuitBreakerServiceTests.java similarity index 98% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/breaker/ADCircuitBreakerServiceTests.java rename to src/test/java/org/opensearch/ad/breaker/ADCircuitBreakerServiceTests.java index 36ca0256b..f36394a72 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/breaker/ADCircuitBreakerServiceTests.java +++ b/src/test/java/org/opensearch/ad/breaker/ADCircuitBreakerServiceTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.breaker; +package org.opensearch.ad.breaker; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/breaker/MemoryCircuitBreakerTests.java b/src/test/java/org/opensearch/ad/breaker/MemoryCircuitBreakerTests.java similarity index 97% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/breaker/MemoryCircuitBreakerTests.java rename to src/test/java/org/opensearch/ad/breaker/MemoryCircuitBreakerTests.java index 7acaf4cee..4839452d4 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/breaker/MemoryCircuitBreakerTests.java +++ b/src/test/java/org/opensearch/ad/breaker/MemoryCircuitBreakerTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.breaker; +package org.opensearch.ad.breaker; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/caching/CacheBufferTests.java b/src/test/java/org/opensearch/ad/caching/CacheBufferTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/caching/CacheBufferTests.java rename to src/test/java/org/opensearch/ad/caching/CacheBufferTests.java index b9c9de1e9..0d5831532 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/caching/CacheBufferTests.java +++ b/src/test/java/org/opensearch/ad/caching/CacheBufferTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.caching; +package org.opensearch.ad.caching; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -39,13 +39,12 @@ import org.junit.Before; import org.mockito.ArgumentCaptor; +import org.opensearch.ad.MemoryTracker; +import org.opensearch.ad.ml.CheckpointDao; +import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.test.OpenSearchTestCase; -import test.com.amazon.opendistroforelasticsearch.ad.util.MLUtil; - -import com.amazon.opendistroforelasticsearch.ad.MemoryTracker; -import com.amazon.opendistroforelasticsearch.ad.ml.CheckpointDao; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; +import test.org.opensearch.ad.util.MLUtil; public class CacheBufferTests extends OpenSearchTestCase { CacheBuffer cacheBuffer; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/caching/PriorityCacheTests.java b/src/test/java/org/opensearch/ad/caching/PriorityCacheTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/caching/PriorityCacheTests.java rename to src/test/java/org/opensearch/ad/caching/PriorityCacheTests.java index db20c126d..fbf0d08ee 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/caching/PriorityCacheTests.java +++ b/src/test/java/org/opensearch/ad/caching/PriorityCacheTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.caching; +package org.opensearch.ad.caching; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyBoolean; @@ -57,6 +57,15 @@ import org.mockito.ArgumentCaptor; import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; +import org.opensearch.ad.MemoryTracker; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.ml.CheckpointDao; +import org.opensearch.ad.ml.EntityModel; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.ModelState; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; @@ -66,16 +75,6 @@ import org.opensearch.threadpool.Scheduler.ScheduledCancellable; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.MemoryTracker; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.ml.CheckpointDao; -import com.amazon.opendistroforelasticsearch.ad.ml.EntityModel; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelState; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; - public class PriorityCacheTests extends OpenSearchTestCase { private static final Logger LOG = LogManager.getLogger(PriorityCacheTests.class); diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/caching/PriorityTrackerTests.java b/src/test/java/org/opensearch/ad/caching/PriorityTrackerTests.java similarity index 98% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/caching/PriorityTrackerTests.java rename to src/test/java/org/opensearch/ad/caching/PriorityTrackerTests.java index 7dc9468a2..c802543b0 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/caching/PriorityTrackerTests.java +++ b/src/test/java/org/opensearch/ad/caching/PriorityTrackerTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.caching; +package org.opensearch.ad.caching; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/ADClusterEventListenerTests.java b/src/test/java/org/opensearch/ad/cluster/ADClusterEventListenerTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/ADClusterEventListenerTests.java rename to src/test/java/org/opensearch/ad/cluster/ADClusterEventListenerTests.java index 5c1735311..ae4e885c1 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/ADClusterEventListenerTests.java +++ b/src/test/java/org/opensearch/ad/cluster/ADClusterEventListenerTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.cluster; +package org.opensearch.ad.cluster; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; @@ -46,6 +46,10 @@ import org.junit.Before; import org.junit.BeforeClass; import org.opensearch.Version; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.cluster.ClusterChangedEvent; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; @@ -55,11 +59,6 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.gateway.GatewayService; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; - public class ADClusterEventListenerTests extends AbstractADTest { private final String masterNodeId = "masterNode"; private final String dataNode1Id = "dataNode1"; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/DailyCronTests.java b/src/test/java/org/opensearch/ad/cluster/DailyCronTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/DailyCronTests.java rename to src/test/java/org/opensearch/ad/cluster/DailyCronTests.java index f5fd949ff..f88e62760 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/DailyCronTests.java +++ b/src/test/java/org/opensearch/ad/cluster/DailyCronTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.cluster; +package org.opensearch.ad.cluster; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -38,13 +38,12 @@ import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.util.ClientUtil; import org.opensearch.index.IndexNotFoundException; import org.opensearch.index.reindex.BulkByScrollResponse; import org.opensearch.index.reindex.DeleteByQueryAction; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; - public class DailyCronTests extends AbstractADTest { enum DailyCronTestExecutionMode { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/HashRingTests.java b/src/test/java/org/opensearch/ad/cluster/HashRingTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/HashRingTests.java rename to src/test/java/org/opensearch/ad/cluster/HashRingTests.java index 4c57b5eef..f2ef20f45 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/HashRingTests.java +++ b/src/test/java/org/opensearch/ad/cluster/HashRingTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.cluster; +package org.opensearch.ad.cluster; import static java.util.Collections.emptyMap; import static org.mockito.Mockito.mock; @@ -45,6 +45,9 @@ import org.junit.Before; import org.junit.BeforeClass; import org.opensearch.Version; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; @@ -52,10 +55,6 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; - public class HashRingTests extends AbstractADTest { private ClusterService clusterService; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/HourlyCronTests.java b/src/test/java/org/opensearch/ad/cluster/HourlyCronTests.java similarity index 90% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/HourlyCronTests.java rename to src/test/java/org/opensearch/ad/cluster/HourlyCronTests.java index 3b6f23f1f..3aefc0546 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/HourlyCronTests.java +++ b/src/test/java/org/opensearch/ad/cluster/HourlyCronTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.cluster; +package org.opensearch.ad.cluster; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; @@ -42,6 +42,12 @@ import org.opensearch.Version; import org.opensearch.action.ActionListener; import org.opensearch.action.FailedNodeException; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.transport.CronAction; +import org.opensearch.ad.transport.CronNodeResponse; +import org.opensearch.ad.transport.CronResponse; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; @@ -49,14 +55,7 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import test.com.amazon.opendistroforelasticsearch.ad.util.ClusterCreation; - -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.transport.CronAction; -import com.amazon.opendistroforelasticsearch.ad.transport.CronNodeResponse; -import com.amazon.opendistroforelasticsearch.ad.transport.CronResponse; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; +import test.org.opensearch.ad.util.ClusterCreation; public class HourlyCronTests extends AbstractADTest { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/MasterEventListenerTests.java b/src/test/java/org/opensearch/ad/cluster/MasterEventListenerTests.java similarity index 91% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/MasterEventListenerTests.java rename to src/test/java/org/opensearch/ad/cluster/MasterEventListenerTests.java index db74e3a65..766a4d65f 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/MasterEventListenerTests.java +++ b/src/test/java/org/opensearch/ad/cluster/MasterEventListenerTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.cluster; +package org.opensearch.ad.cluster; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; @@ -39,6 +39,11 @@ import java.util.HashMap; import org.junit.Before; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.cluster.diskcleanup.ModelCheckpointIndexRetention; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.component.LifecycleListener; @@ -46,12 +51,6 @@ import org.opensearch.threadpool.Scheduler.Cancellable; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.cluster.diskcleanup.ModelCheckpointIndexRetention; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; - public class MasterEventListenerTests extends AbstractADTest { private ClusterService clusterService; private ThreadPool threadPool; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/diskcleanup/IndexCleanupTests.java b/src/test/java/org/opensearch/ad/cluster/diskcleanup/IndexCleanupTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/diskcleanup/IndexCleanupTests.java rename to src/test/java/org/opensearch/ad/cluster/diskcleanup/IndexCleanupTests.java index 83a36ed50..800bc6a8f 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/diskcleanup/IndexCleanupTests.java +++ b/src/test/java/org/opensearch/ad/cluster/diskcleanup/IndexCleanupTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.cluster.diskcleanup; +package org.opensearch.ad.cluster.diskcleanup; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -44,6 +44,8 @@ import org.opensearch.action.admin.indices.stats.CommonStats; import org.opensearch.action.admin.indices.stats.IndicesStatsResponse; import org.opensearch.action.admin.indices.stats.ShardStats; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.util.ClientUtil; import org.opensearch.client.Client; import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.service.ClusterService; @@ -52,9 +54,6 @@ import org.opensearch.index.reindex.DeleteByQueryAction; import org.opensearch.index.store.StoreStats; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; - public class IndexCleanupTests extends AbstractADTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetentionTests.java b/src/test/java/org/opensearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetentionTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetentionTests.java rename to src/test/java/org/opensearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetentionTests.java index 22e102fee..6cfd8463a 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetentionTests.java +++ b/src/test/java/org/opensearch/ad/cluster/diskcleanup/ModelCheckpointIndexRetentionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.cluster.diskcleanup; +package org.opensearch.ad.cluster.diskcleanup; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -42,9 +42,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.opensearch.action.ActionListener; - -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.constant.CommonName; public class ModelCheckpointIndexRetentionTests extends AbstractADTest { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/common/exception/ADTaskCancelledExceptionTests.java b/src/test/java/org/opensearch/ad/common/exception/ADTaskCancelledExceptionTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/common/exception/ADTaskCancelledExceptionTests.java rename to src/test/java/org/opensearch/ad/common/exception/ADTaskCancelledExceptionTests.java index aa1cd1b22..38bb8c070 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/common/exception/ADTaskCancelledExceptionTests.java +++ b/src/test/java/org/opensearch/ad/common/exception/ADTaskCancelledExceptionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.common.exception; +package org.opensearch.ad.common.exception; import org.opensearch.test.OpenSearchTestCase; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/common/exception/JsonPathNotFoundException.java b/src/test/java/org/opensearch/ad/common/exception/JsonPathNotFoundException.java similarity index 93% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/common/exception/JsonPathNotFoundException.java rename to src/test/java/org/opensearch/ad/common/exception/JsonPathNotFoundException.java index 1724d4064..d95b41b62 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/common/exception/JsonPathNotFoundException.java +++ b/src/test/java/org/opensearch/ad/common/exception/JsonPathNotFoundException.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.common.exception; +package org.opensearch.ad.common.exception; public class JsonPathNotFoundException extends Exception { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/common/exception/LimitExceededExceptionTests.java b/src/test/java/org/opensearch/ad/common/exception/LimitExceededExceptionTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/common/exception/LimitExceededExceptionTests.java rename to src/test/java/org/opensearch/ad/common/exception/LimitExceededExceptionTests.java index 133f0a6ea..59555b896 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/common/exception/LimitExceededExceptionTests.java +++ b/src/test/java/org/opensearch/ad/common/exception/LimitExceededExceptionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.common.exception; +package org.opensearch.ad.common.exception; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/IntegerSensitiveSingleFeatureLinearUniformInterpolatorTests.java b/src/test/java/org/opensearch/ad/dataprocessor/IntegerSensitiveSingleFeatureLinearUniformInterpolatorTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/IntegerSensitiveSingleFeatureLinearUniformInterpolatorTests.java rename to src/test/java/org/opensearch/ad/dataprocessor/IntegerSensitiveSingleFeatureLinearUniformInterpolatorTests.java index 93c54c732..6dfb628d2 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/IntegerSensitiveSingleFeatureLinearUniformInterpolatorTests.java +++ b/src/test/java/org/opensearch/ad/dataprocessor/IntegerSensitiveSingleFeatureLinearUniformInterpolatorTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.dataprocessor; +package org.opensearch.ad.dataprocessor; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/LinearUniformInterpolatorTests.java b/src/test/java/org/opensearch/ad/dataprocessor/LinearUniformInterpolatorTests.java similarity index 98% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/LinearUniformInterpolatorTests.java rename to src/test/java/org/opensearch/ad/dataprocessor/LinearUniformInterpolatorTests.java index 13252ef3f..c7d596c97 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/LinearUniformInterpolatorTests.java +++ b/src/test/java/org/opensearch/ad/dataprocessor/LinearUniformInterpolatorTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.dataprocessor; +package org.opensearch.ad.dataprocessor; import static org.junit.Assert.assertArrayEquals; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/SingleFeatureLinearUniformInterpolatorTests.java b/src/test/java/org/opensearch/ad/dataprocessor/SingleFeatureLinearUniformInterpolatorTests.java similarity index 97% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/SingleFeatureLinearUniformInterpolatorTests.java rename to src/test/java/org/opensearch/ad/dataprocessor/SingleFeatureLinearUniformInterpolatorTests.java index 882de7a87..c8f1dc3b1 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/dataprocessor/SingleFeatureLinearUniformInterpolatorTests.java +++ b/src/test/java/org/opensearch/ad/dataprocessor/SingleFeatureLinearUniformInterpolatorTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.dataprocessor; +package org.opensearch.ad.dataprocessor; import static org.junit.Assert.assertArrayEquals; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/e2e/DetectionResultEvalutationIT.java b/src/test/java/org/opensearch/ad/e2e/DetectionResultEvalutationIT.java similarity index 97% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/e2e/DetectionResultEvalutationIT.java rename to src/test/java/org/opensearch/ad/e2e/DetectionResultEvalutationIT.java index 715be6510..a2b468e3a 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/e2e/DetectionResultEvalutationIT.java +++ b/src/test/java/org/opensearch/ad/e2e/DetectionResultEvalutationIT.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.e2e; +package org.opensearch.ad.e2e; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.toHttpEntity; +import static org.opensearch.ad.TestHelpers.toHttpEntity; import java.io.File; import java.io.FileReader; @@ -44,13 +44,13 @@ import org.apache.http.HttpHeaders; import org.apache.http.message.BasicHeader; +import org.opensearch.ad.ODFERestTestCase; +import org.opensearch.ad.TestHelpers; import org.opensearch.client.Request; import org.opensearch.client.RequestOptions; import org.opensearch.client.RestClient; import org.opensearch.client.WarningsHandler; -import com.amazon.opendistroforelasticsearch.ad.ODFERestTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; import com.google.common.collect.ImmutableList; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/feature/FeatureManagerTests.java b/src/test/java/org/opensearch/ad/feature/FeatureManagerTests.java similarity index 98% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/feature/FeatureManagerTests.java rename to src/test/java/org/opensearch/ad/feature/FeatureManagerTests.java index ebd1dd37e..c5c4e370c 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/feature/FeatureManagerTests.java +++ b/src/test/java/org/opensearch/ad/feature/FeatureManagerTests.java @@ -24,9 +24,8 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.feature; +package org.opensearch.ad.feature; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_IMPUTATION_NEIGHBOR_DISTANCE; import static java.util.Arrays.asList; import static java.util.Optional.empty; import static java.util.Optional.ofNullable; @@ -47,6 +46,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_IMPUTATION_NEIGHBOR_DISTANCE; import java.io.IOException; import java.time.Clock; @@ -74,18 +74,17 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.opensearch.action.ActionListener; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.dataprocessor.Interpolator; +import org.opensearch.ad.dataprocessor.LinearUniformInterpolator; +import org.opensearch.ad.dataprocessor.SingleFeatureLinearUniformInterpolator; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.Entity; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.util.ArrayEqMatcher; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.Interpolator; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.LinearUniformInterpolator; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.SingleFeatureLinearUniformInterpolator; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.Entity; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.util.ArrayEqMatcher; - @RunWith(JUnitParamsRunner.class) @SuppressWarnings("unchecked") public class FeatureManagerTests { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/feature/FeaturesTests.java b/src/test/java/org/opensearch/ad/feature/FeaturesTests.java similarity index 98% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/feature/FeaturesTests.java rename to src/test/java/org/opensearch/ad/feature/FeaturesTests.java index 732cb1ef1..234ead4f7 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/feature/FeaturesTests.java +++ b/src/test/java/org/opensearch/ad/feature/FeaturesTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.feature; +package org.opensearch.ad.feature; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/feature/SearchFeatureDaoTests.java b/src/test/java/org/opensearch/ad/feature/SearchFeatureDaoTests.java similarity index 97% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/feature/SearchFeatureDaoTests.java rename to src/test/java/org/opensearch/ad/feature/SearchFeatureDaoTests.java index e6dfd8642..33a21dbc1 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/feature/SearchFeatureDaoTests.java +++ b/src/test/java/org/opensearch/ad/feature/SearchFeatureDaoTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.feature; +package org.opensearch.ad.feature; import static java.util.Arrays.asList; import static org.hamcrest.MatcherAssert.assertThat; @@ -87,6 +87,20 @@ import org.opensearch.action.search.SearchResponse; import org.opensearch.action.search.SearchResponseSections; import org.opensearch.action.search.ShardSearchFailure; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.dataprocessor.Interpolator; +import org.opensearch.ad.dataprocessor.LinearUniformInterpolator; +import org.opensearch.ad.dataprocessor.SingleFeatureLinearUniformInterpolator; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.Entity; +import org.opensearch.ad.model.Feature; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.ParseUtils; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; @@ -131,20 +145,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.Interpolator; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.LinearUniformInterpolator; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.SingleFeatureLinearUniformInterpolator; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.Entity; -import com.amazon.opendistroforelasticsearch.ad.model.Feature; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.ParseUtils; import com.google.common.collect.ImmutableList; @PowerMockIgnore("javax.management.*") diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/indices/AnomalyDetectionIndicesTests.java b/src/test/java/org/opensearch/ad/indices/AnomalyDetectionIndicesTests.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/indices/AnomalyDetectionIndicesTests.java rename to src/test/java/org/opensearch/ad/indices/AnomalyDetectionIndicesTests.java index dd2b2c20d..8b522b8e9 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/indices/AnomalyDetectionIndicesTests.java +++ b/src/test/java/org/opensearch/ad/indices/AnomalyDetectionIndicesTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.indices; +package org.opensearch.ad.indices; import java.io.IOException; import java.util.Collection; @@ -33,6 +33,12 @@ import org.junit.Before; import org.opensearch.action.index.IndexRequest; import org.opensearch.action.index.IndexResponse; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.util.DiscoveryNodeFilterer; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.XContentBuilder; @@ -41,13 +47,6 @@ import org.opensearch.rest.RestStatus; import org.opensearch.test.OpenSearchIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; - public class AnomalyDetectionIndicesTests extends OpenSearchIntegTestCase { private AnomalyDetectionIndices indices; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/indices/InitAnomalyDetectionIndicesTests.java b/src/test/java/org/opensearch/ad/indices/InitAnomalyDetectionIndicesTests.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/indices/InitAnomalyDetectionIndicesTests.java rename to src/test/java/org/opensearch/ad/indices/InitAnomalyDetectionIndicesTests.java index 644ae8017..e5da21b13 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/indices/InitAnomalyDetectionIndicesTests.java +++ b/src/test/java/org/opensearch/ad/indices/InitAnomalyDetectionIndicesTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.indices; +package org.opensearch.ad.indices; import static org.hamcrest.Matchers.equalTo; import static org.mockito.ArgumentMatchers.any; @@ -44,6 +44,12 @@ import org.opensearch.action.admin.indices.alias.Alias; import org.opensearch.action.admin.indices.create.CreateIndexRequest; import org.opensearch.action.admin.indices.create.CreateIndexResponse; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.client.AdminClient; import org.opensearch.client.Client; import org.opensearch.client.IndicesAdminClient; @@ -56,13 +62,6 @@ import org.opensearch.common.settings.Settings; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; - public class InitAnomalyDetectionIndicesTests extends AbstractADTest { Client client; ClusterService clusterService; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/indices/RolloverTests.java b/src/test/java/org/opensearch/ad/indices/RolloverTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/indices/RolloverTests.java rename to src/test/java/org/opensearch/ad/indices/RolloverTests.java index b7ecb3ab4..f8d811f79 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/indices/RolloverTests.java +++ b/src/test/java/org/opensearch/ad/indices/RolloverTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.indices; +package org.opensearch.ad.indices; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; @@ -48,6 +48,10 @@ import org.opensearch.action.admin.indices.rollover.MaxDocsCondition; import org.opensearch.action.admin.indices.rollover.RolloverRequest; import org.opensearch.action.admin.indices.rollover.RolloverResponse; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.client.AdminClient; import org.opensearch.client.Client; import org.opensearch.client.ClusterAdminClient; @@ -60,11 +64,6 @@ import org.opensearch.common.settings.Settings; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; - public class RolloverTests extends AbstractADTest { private AnomalyDetectionIndices adIndices; private IndicesAdminClient indicesClient; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/CheckpointDaoTests.java b/src/test/java/org/opensearch/ad/ml/CheckpointDaoTests.java similarity index 98% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/CheckpointDaoTests.java rename to src/test/java/org/opensearch/ad/ml/CheckpointDaoTests.java index 3a2d75593..940efe8d3 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/CheckpointDaoTests.java +++ b/src/test/java/org/opensearch/ad/ml/CheckpointDaoTests.java @@ -24,9 +24,8 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; -import static com.amazon.opendistroforelasticsearch.ad.ml.CheckpointDao.FIELD_MODEL; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -41,6 +40,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ad.ml.CheckpointDao.FIELD_MODEL; import java.io.IOException; import java.time.Clock; @@ -84,6 +84,10 @@ import org.opensearch.action.index.IndexRequest; import org.opensearch.action.index.IndexResponse; import org.opensearch.action.update.UpdateResponse; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.util.ClientUtil; import org.opensearch.client.Client; import org.opensearch.index.engine.VersionConflictEngineException; import org.opensearch.index.shard.ShardId; @@ -91,12 +95,8 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import test.com.amazon.opendistroforelasticsearch.ad.util.MLUtil; +import test.org.opensearch.ad.util.MLUtil; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; import com.amazon.randomcutforest.serialize.RandomCutForestSerDe; import com.google.gson.Gson; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/CheckpointDeleteTests.java b/src/test/java/org/opensearch/ad/ml/CheckpointDeleteTests.java similarity index 93% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/CheckpointDeleteTests.java rename to src/test/java/org/opensearch/ad/ml/CheckpointDeleteTests.java index 2c5fd450b..77a01b66f 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/CheckpointDeleteTests.java +++ b/src/test/java/org/opensearch/ad/ml/CheckpointDeleteTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -40,17 +40,17 @@ import org.junit.Before; import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.util.ClientUtil; import org.opensearch.client.Client; import org.opensearch.index.IndexNotFoundException; import org.opensearch.index.reindex.BulkByScrollResponse; import org.opensearch.index.reindex.DeleteByQueryAction; import org.opensearch.index.reindex.ScrollableHitSource; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; import com.amazon.randomcutforest.serialize.RandomCutForestSerDe; import com.google.gson.Gson; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/EntityColdStarterTests.java b/src/test/java/org/opensearch/ad/ml/EntityColdStarterTests.java similarity index 93% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/EntityColdStarterTests.java rename to src/test/java/org/opensearch/ad/ml/EntityColdStarterTests.java index 5cb3a2b74..97b210466 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/EntityColdStarterTests.java +++ b/src/test/java/org/opensearch/ad/ml/EntityColdStarterTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -50,28 +50,28 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.get.GetRequest; import org.opensearch.action.get.GetResponse; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.dataprocessor.IntegerSensitiveSingleFeatureLinearUniformInterpolator; +import org.opensearch.ad.dataprocessor.Interpolator; +import org.opensearch.ad.dataprocessor.LinearUniformInterpolator; +import org.opensearch.ad.dataprocessor.SingleFeatureLinearUniformInterpolator; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.feature.SearchFeatureDao; +import org.opensearch.ad.ml.ModelManager.ModelType; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.util.ClientUtil; import org.opensearch.client.Client; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.threadpool.ThreadPool; -import test.com.amazon.opendistroforelasticsearch.ad.util.MLUtil; - -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.IntegerSensitiveSingleFeatureLinearUniformInterpolator; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.Interpolator; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.LinearUniformInterpolator; -import com.amazon.opendistroforelasticsearch.ad.dataprocessor.SingleFeatureLinearUniformInterpolator; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.feature.SearchFeatureDao; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager.ModelType; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; +import test.org.opensearch.ad.util.MLUtil; + import com.amazon.randomcutforest.RandomCutForest; public class EntityColdStarterTests extends AbstractADTest { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/HybridThresholdingModelTests.java b/src/test/java/org/opensearch/ad/ml/HybridThresholdingModelTests.java similarity index 99% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/HybridThresholdingModelTests.java rename to src/test/java/org/opensearch/ad/ml/HybridThresholdingModelTests.java index 8220b5bdc..19121832f 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/HybridThresholdingModelTests.java +++ b/src/test/java/org/opensearch/ad/ml/HybridThresholdingModelTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/KllFloatsSketchSerDeTests.java b/src/test/java/org/opensearch/ad/ml/KllFloatsSketchSerDeTests.java similarity index 97% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/KllFloatsSketchSerDeTests.java rename to src/test/java/org/opensearch/ad/ml/KllFloatsSketchSerDeTests.java index 2de52fe1a..c16e2fb18 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/KllFloatsSketchSerDeTests.java +++ b/src/test/java/org/opensearch/ad/ml/KllFloatsSketchSerDeTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/ModelManagerTests.java b/src/test/java/org/opensearch/ad/ml/ModelManagerTests.java similarity index 98% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/ModelManagerTests.java rename to src/test/java/org/opensearch/ad/ml/ModelManagerTests.java index a43a985c8..82b4aae43 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/ModelManagerTests.java +++ b/src/test/java/org/opensearch/ad/ml/ModelManagerTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; @@ -69,6 +69,15 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.opensearch.action.ActionListener; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.MemoryTracker; +import org.opensearch.ad.caching.EntityCache; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.common.exception.ResourceNotFoundException; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.ml.rcf.CombinedRcfResult; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.collect.ImmutableOpenMap; @@ -82,17 +91,8 @@ import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import test.com.amazon.opendistroforelasticsearch.ad.util.MLUtil; - -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.MemoryTracker; -import com.amazon.opendistroforelasticsearch.ad.caching.EntityCache; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.ResourceNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.ml.rcf.CombinedRcfResult; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; +import test.org.opensearch.ad.util.MLUtil; + import com.amazon.randomcutforest.RandomCutForest; import com.amazon.randomcutforest.returntypes.DiVector; import com.amazon.randomcutforest.serialize.RandomCutForestSerDe; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/RcfResultTests.java b/src/test/java/org/opensearch/ad/ml/RcfResultTests.java similarity index 98% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/RcfResultTests.java rename to src/test/java/org/opensearch/ad/ml/RcfResultTests.java index 3db82d59a..5ab194cd2 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/RcfResultTests.java +++ b/src/test/java/org/opensearch/ad/ml/RcfResultTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/ThresholdingResultTests.java b/src/test/java/org/opensearch/ad/ml/ThresholdingResultTests.java similarity index 98% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/ThresholdingResultTests.java rename to src/test/java/org/opensearch/ad/ml/ThresholdingResultTests.java index d15c0efda..3de03c502 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/ThresholdingResultTests.java +++ b/src/test/java/org/opensearch/ad/ml/ThresholdingResultTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml; +package org.opensearch.ad.ml; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/rcf/CombinedRcfResultTests.java b/src/test/java/org/opensearch/ad/ml/rcf/CombinedRcfResultTests.java similarity index 98% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/rcf/CombinedRcfResultTests.java rename to src/test/java/org/opensearch/ad/ml/rcf/CombinedRcfResultTests.java index 4bd3b6d46..94d86392a 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/ml/rcf/CombinedRcfResultTests.java +++ b/src/test/java/org/opensearch/ad/ml/rcf/CombinedRcfResultTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.ml.rcf; +package org.opensearch.ad.ml.rcf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/mock/model/MockSimpleLog.java b/src/test/java/org/opensearch/ad/mock/model/MockSimpleLog.java similarity index 98% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/mock/model/MockSimpleLog.java rename to src/test/java/org/opensearch/ad/mock/model/MockSimpleLog.java index 0795cfda1..221e7b08b 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/mock/model/MockSimpleLog.java +++ b/src/test/java/org/opensearch/ad/mock/model/MockSimpleLog.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.mock.model; +package org.opensearch.ad.mock.model; import java.io.IOException; import java.time.Instant; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/mock/plugin/MockReindexPlugin.java b/src/test/java/org/opensearch/ad/mock/plugin/MockReindexPlugin.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/mock/plugin/MockReindexPlugin.java rename to src/test/java/org/opensearch/ad/mock/plugin/MockReindexPlugin.java index b165a383a..fd73a43cd 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/mock/plugin/MockReindexPlugin.java +++ b/src/test/java/org/opensearch/ad/mock/plugin/MockReindexPlugin.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.mock.plugin; +package org.opensearch.ad.mock.plugin; import java.io.IOException; import java.util.Arrays; @@ -42,6 +42,10 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; import org.opensearch.action.support.WriteRequest; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.mock.transport.MockAnomalyDetectorJobAction; +import org.opensearch.ad.mock.transport.MockAnomalyDetectorJobTransportActionWithUser; import org.opensearch.client.Client; import org.opensearch.common.inject.Inject; import org.opensearch.common.unit.TimeValue; @@ -58,10 +62,6 @@ import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.mock.transport.MockAnomalyDetectorJobAction; -import com.amazon.opendistroforelasticsearch.ad.mock.transport.MockAnomalyDetectorJobTransportActionWithUser; import com.google.common.collect.ImmutableList; public class MockReindexPlugin extends Plugin implements ActionPlugin { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/mock/transport/MockAnomalyDetectorJobAction.java b/src/test/java/org/opensearch/ad/mock/transport/MockAnomalyDetectorJobAction.java similarity index 86% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/mock/transport/MockAnomalyDetectorJobAction.java rename to src/test/java/org/opensearch/ad/mock/transport/MockAnomalyDetectorJobAction.java index 943969347..5eea9a8fc 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/mock/transport/MockAnomalyDetectorJobAction.java +++ b/src/test/java/org/opensearch/ad/mock/transport/MockAnomalyDetectorJobAction.java @@ -24,12 +24,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.mock.transport; +package org.opensearch.ad.mock.transport; import org.opensearch.action.ActionType; - -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyDetectorJobResponse; +import org.opensearch.ad.constant.CommonValue; +import org.opensearch.ad.transport.AnomalyDetectorJobResponse; public class MockAnomalyDetectorJobAction extends ActionType { // External Action which used for public facing RestAPIs. diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/mock/transport/MockAnomalyDetectorJobTransportActionWithUser.java b/src/test/java/org/opensearch/ad/mock/transport/MockAnomalyDetectorJobTransportActionWithUser.java similarity index 84% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/mock/transport/MockAnomalyDetectorJobTransportActionWithUser.java rename to src/test/java/org/opensearch/ad/mock/transport/MockAnomalyDetectorJobTransportActionWithUser.java index 2fcaba63f..867f3f00f 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/mock/transport/MockAnomalyDetectorJobTransportActionWithUser.java +++ b/src/test/java/org/opensearch/ad/mock/transport/MockAnomalyDetectorJobTransportActionWithUser.java @@ -24,17 +24,24 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.mock.transport; +package org.opensearch.ad.mock.transport; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.resolveUserAndExecute; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; +import static org.opensearch.ad.util.ParseUtils.resolveUserAndExecute; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.rest.handler.IndexAnomalyDetectorJobActionHandler; +import org.opensearch.ad.task.ADTaskManager; +import org.opensearch.ad.transport.AnomalyDetectorJobRequest; +import org.opensearch.ad.transport.AnomalyDetectorJobResponse; +import org.opensearch.ad.transport.AnomalyDetectorJobTransportAction; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; @@ -45,13 +52,6 @@ import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.rest.handler.IndexAnomalyDetectorJobActionHandler; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyDetectorJobRequest; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyDetectorJobResponse; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyDetectorJobTransportAction; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; import com.amazon.opendistroforelasticsearch.commons.authuser.User; public class MockAnomalyDetectorJobTransportActionWithUser extends diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskTests.java b/src/test/java/org/opensearch/ad/model/ADTaskTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskTests.java rename to src/test/java/org/opensearch/ad/model/ADTaskTests.java index d76e91abf..a458695e6 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/ADTaskTests.java +++ b/src/test/java/org/opensearch/ad/model/ADTaskTests.java @@ -24,13 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.io.IOException; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.Collection; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.TestHelpers; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; import org.opensearch.common.io.stream.NamedWriteableRegistry; @@ -39,9 +41,6 @@ import org.opensearch.test.InternalSettingsPlugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; - public class ADTaskTests extends OpenSearchSingleNodeTestCase { @Override diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorExecutionInputTests.java b/src/test/java/org/opensearch/ad/model/AnomalyDetectorExecutionInputTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorExecutionInputTests.java rename to src/test/java/org/opensearch/ad/model/AnomalyDetectorExecutionInputTests.java index c47d8faf4..1467603ba 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorExecutionInputTests.java +++ b/src/test/java/org/opensearch/ad/model/AnomalyDetectorExecutionInputTests.java @@ -24,18 +24,17 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.io.IOException; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.Locale; +import org.opensearch.ad.TestHelpers; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; - public class AnomalyDetectorExecutionInputTests extends OpenSearchTestCase { public void testParseAnomalyDetectorExecutionInput() throws IOException { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorJobTests.java b/src/test/java/org/opensearch/ad/model/AnomalyDetectorJobTests.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorJobTests.java rename to src/test/java/org/opensearch/ad/model/AnomalyDetectorJobTests.java index ac9bcf475..d4c3b7511 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorJobTests.java +++ b/src/test/java/org/opensearch/ad/model/AnomalyDetectorJobTests.java @@ -24,16 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.io.IOException; import java.util.Locale; +import org.opensearch.ad.TestHelpers; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; - public class AnomalyDetectorJobTests extends OpenSearchTestCase { public void testParseAnomalyDetectorJob() throws IOException { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorSerializationTests.java b/src/test/java/org/opensearch/ad/model/AnomalyDetectorSerializationTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorSerializationTests.java rename to src/test/java/org/opensearch/ad/model/AnomalyDetectorSerializationTests.java index 2d022cc5e..f63f68653 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorSerializationTests.java +++ b/src/test/java/org/opensearch/ad/model/AnomalyDetectorSerializationTests.java @@ -24,12 +24,14 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.io.IOException; import java.time.Instant; import java.util.Collection; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.TestHelpers; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; import org.opensearch.common.io.stream.NamedWriteableRegistry; @@ -37,8 +39,6 @@ import org.opensearch.test.InternalSettingsPlugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorTests.java b/src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java similarity index 98% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorTests.java rename to src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java index fb4bec38a..d144aeec9 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyDetectorTests.java +++ b/src/test/java/org/opensearch/ad/model/AnomalyDetectorTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.io.IOException; import java.time.Instant; @@ -32,14 +32,14 @@ import java.util.Locale; import java.util.concurrent.TimeUnit; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.common.ParsingException; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.index.query.MatchAllQueryBuilder; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyResultTests.java b/src/test/java/org/opensearch/ad/model/AnomalyResultTests.java similarity index 97% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyResultTests.java rename to src/test/java/org/opensearch/ad/model/AnomalyResultTests.java index c3cc1826e..c06f6cc68 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/AnomalyResultTests.java +++ b/src/test/java/org/opensearch/ad/model/AnomalyResultTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.io.IOException; import java.time.Instant; @@ -32,6 +32,9 @@ import java.util.Collection; import java.util.Locale; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.constant.CommonValue; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; import org.opensearch.common.io.stream.NamedWriteableRegistry; @@ -40,9 +43,6 @@ import org.opensearch.test.InternalSettingsPlugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/DetectionDateRangeTests.java b/src/test/java/org/opensearch/ad/model/DetectionDateRangeTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/model/DetectionDateRangeTests.java rename to src/test/java/org/opensearch/ad/model/DetectionDateRangeTests.java index 597cc2f9c..ee2cc6750 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/DetectionDateRangeTests.java +++ b/src/test/java/org/opensearch/ad/model/DetectionDateRangeTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.io.IOException; import java.time.Instant; @@ -32,6 +32,8 @@ import java.util.Collection; import java.util.Locale; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.TestHelpers; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; import org.opensearch.common.io.stream.NamedWriteableRegistry; @@ -40,9 +42,6 @@ import org.opensearch.test.InternalSettingsPlugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; - public class DetectionDateRangeTests extends OpenSearchSingleNodeTestCase { @Override diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/EntityAnomalyResultTests.java b/src/test/java/org/opensearch/ad/model/EntityAnomalyResultTests.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/model/EntityAnomalyResultTests.java rename to src/test/java/org/opensearch/ad/model/EntityAnomalyResultTests.java index 7a3918db3..5af505f8d 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/EntityAnomalyResultTests.java +++ b/src/test/java/org/opensearch/ad/model/EntityAnomalyResultTests.java @@ -24,19 +24,18 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomMutlEntityAnomalyDetectResult; import static java.util.Arrays.asList; +import static org.opensearch.ad.TestHelpers.randomMutlEntityAnomalyDetectResult; import java.util.ArrayList; import java.util.List; import org.junit.Test; +import org.opensearch.ad.stats.ADStatsResponse; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStatsResponse; - public class EntityAnomalyResultTests extends OpenSearchTestCase { @Test diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/EntityProfileTests.java b/src/test/java/org/opensearch/ad/model/EntityProfileTests.java similarity index 86% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/model/EntityProfileTests.java rename to src/test/java/org/opensearch/ad/model/EntityProfileTests.java index edf6ef2e1..48d897650 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/EntityProfileTests.java +++ b/src/test/java/org/opensearch/ad/model/EntityProfileTests.java @@ -24,21 +24,20 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; import java.io.IOException; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.common.exception.JsonPathNotFoundException; +import org.opensearch.ad.constant.CommonName; import org.opensearch.common.Strings; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; -import test.com.amazon.opendistroforelasticsearch.ad.util.JsonDeserializer; - -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.common.exception.JsonPathNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; +import test.org.opensearch.ad.util.JsonDeserializer; public class EntityProfileTests extends AbstractADTest { public void testMerge() { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/FeatureDataTests.java b/src/test/java/org/opensearch/ad/model/FeatureDataTests.java similarity index 93% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/model/FeatureDataTests.java rename to src/test/java/org/opensearch/ad/model/FeatureDataTests.java index 236f93fa5..03248eac4 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/FeatureDataTests.java +++ b/src/test/java/org/opensearch/ad/model/FeatureDataTests.java @@ -24,16 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.io.IOException; import java.util.Locale; +import org.opensearch.ad.TestHelpers; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; - public class FeatureDataTests extends OpenSearchTestCase { public void testParseAnomalyDetector() throws IOException { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/FeatureTests.java b/src/test/java/org/opensearch/ad/model/FeatureTests.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/model/FeatureTests.java rename to src/test/java/org/opensearch/ad/model/FeatureTests.java index 11eadf61f..adaa62134 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/FeatureTests.java +++ b/src/test/java/org/opensearch/ad/model/FeatureTests.java @@ -24,16 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.io.IOException; import java.util.Locale; +import org.opensearch.ad.TestHelpers; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; - public class FeatureTests extends OpenSearchTestCase { public void testParseFeature() throws IOException { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/IntervalTimeConfigurationTests.java b/src/test/java/org/opensearch/ad/model/IntervalTimeConfigurationTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/model/IntervalTimeConfigurationTests.java rename to src/test/java/org/opensearch/ad/model/IntervalTimeConfigurationTests.java index 38a9aff35..52283ab81 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/model/IntervalTimeConfigurationTests.java +++ b/src/test/java/org/opensearch/ad/model/IntervalTimeConfigurationTests.java @@ -24,18 +24,17 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.model; +package org.opensearch.ad.model; import java.io.IOException; import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.Locale; +import org.opensearch.ad.TestHelpers; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; - public class IntervalTimeConfigurationTests extends OpenSearchTestCase { public void testParseIntervalSchedule() throws IOException { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/plugin/MockReindexPlugin.java b/src/test/java/org/opensearch/ad/plugin/MockReindexPlugin.java similarity index 97% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/plugin/MockReindexPlugin.java rename to src/test/java/org/opensearch/ad/plugin/MockReindexPlugin.java index 62a6c5a12..a23b0ad0e 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/plugin/MockReindexPlugin.java +++ b/src/test/java/org/opensearch/ad/plugin/MockReindexPlugin.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.plugin; +package org.opensearch.ad.plugin; import java.io.IOException; import java.util.Arrays; @@ -43,6 +43,8 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; import org.opensearch.action.support.WriteRequest; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.constant.CommonName; import org.opensearch.client.Client; import org.opensearch.common.inject.Inject; import org.opensearch.common.unit.TimeValue; @@ -59,8 +61,6 @@ import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; import com.google.common.collect.ImmutableList; public class MockReindexPlugin extends Plugin implements ActionPlugin { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/rest/AnomalyDetectorRestApiIT.java b/src/test/java/org/opensearch/ad/rest/AnomalyDetectorRestApiIT.java similarity index 98% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/rest/AnomalyDetectorRestApiIT.java rename to src/test/java/org/opensearch/ad/rest/AnomalyDetectorRestApiIT.java index 5ff59a24d..00342cede 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/rest/AnomalyDetectorRestApiIT.java +++ b/src/test/java/org/opensearch/ad/rest/AnomalyDetectorRestApiIT.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; +package org.opensearch.ad.rest; import static org.hamcrest.Matchers.containsString; @@ -35,6 +35,15 @@ import org.apache.http.entity.ContentType; import org.apache.http.nio.entity.NStringEntity; import org.junit.Assert; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.AnomalyDetectorRestTestCase; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorExecutionInput; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.settings.EnabledSetting; import org.opensearch.client.Response; import org.opensearch.client.ResponseException; import org.opensearch.common.UUIDs; @@ -43,15 +52,6 @@ import org.opensearch.rest.RestStatus; import org.opensearch.search.builder.SearchSourceBuilder; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorRestTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorExecutionInput; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/rest/HistoricalDetectorRestApiIT.java b/src/test/java/org/opensearch/ad/rest/HistoricalDetectorRestApiIT.java similarity index 92% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/rest/HistoricalDetectorRestApiIT.java rename to src/test/java/org/opensearch/ad/rest/HistoricalDetectorRestApiIT.java index d3edb86a8..cc3e795f4 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/rest/HistoricalDetectorRestApiIT.java +++ b/src/test/java/org/opensearch/ad/rest/HistoricalDetectorRestApiIT.java @@ -24,29 +24,29 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; +package org.opensearch.ad.rest; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.AD_BASE_STATS_URI; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE; +import static org.opensearch.ad.TestHelpers.AD_BASE_STATS_URI; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE; import java.io.IOException; import java.util.Map; import org.apache.http.util.EntityUtils; import org.junit.Before; +import org.opensearch.ad.HistoricalDetectorRestTestCase; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.ADTaskProfile; +import org.opensearch.ad.model.ADTaskState; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; import org.opensearch.client.Response; import org.opensearch.client.ResponseException; import org.opensearch.common.xcontent.ToXContentObject; import org.opensearch.rest.RestStatus; -import com.amazon.opendistroforelasticsearch.ad.HistoricalDetectorRestTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskProfile; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskState; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; import com.google.common.collect.ImmutableMap; public class HistoricalDetectorRestApiIT extends HistoricalDetectorRestTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/rest/SecureADRestIT.java b/src/test/java/org/opensearch/ad/rest/SecureADRestIT.java similarity index 97% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/rest/SecureADRestIT.java rename to src/test/java/org/opensearch/ad/rest/SecureADRestIT.java index eadce0a7c..0b0b57da6 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/rest/SecureADRestIT.java +++ b/src/test/java/org/opensearch/ad/rest/SecureADRestIT.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.rest; +package org.opensearch.ad.rest; import java.io.IOException; import java.time.Instant; @@ -35,13 +35,13 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; +import org.opensearch.ad.AnomalyDetectorRestTestCase; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorExecutionInput; import org.opensearch.client.Response; import org.opensearch.client.RestClient; import org.opensearch.rest.RestStatus; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorRestTestCase; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorExecutionInput; import com.amazon.opendistroforelasticsearch.commons.rest.SecureRestClientBuilder; public class SecureADRestIT extends AnomalyDetectorRestTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStatTests.java b/src/test/java/org/opensearch/ad/stats/ADStatTests.java similarity index 92% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStatTests.java rename to src/test/java/org/opensearch/ad/stats/ADStatTests.java index 8c6de1c39..e93752ec8 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStatTests.java +++ b/src/test/java/org/opensearch/ad/stats/ADStatTests.java @@ -24,16 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats; +package org.opensearch.ad.stats; import java.util.function.Supplier; import org.junit.Test; +import org.opensearch.ad.stats.suppliers.CounterSupplier; +import org.opensearch.ad.stats.suppliers.SettableSupplier; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.CounterSupplier; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.SettableSupplier; - public class ADStatTests extends OpenSearchTestCase { @Test diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStatsResponseTests.java b/src/test/java/org/opensearch/ad/stats/ADStatsResponseTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStatsResponseTests.java rename to src/test/java/org/opensearch/ad/stats/ADStatsResponseTests.java index 05d62a0d8..7535f83e3 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStatsResponseTests.java +++ b/src/test/java/org/opensearch/ad/stats/ADStatsResponseTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats; +package org.opensearch.ad.stats; import java.io.IOException; import java.util.Collections; @@ -34,15 +34,14 @@ import org.junit.Test; import org.opensearch.action.FailedNodeException; +import org.opensearch.ad.transport.ADStatsNodeResponse; +import org.opensearch.ad.transport.ADStatsNodesResponse; import org.opensearch.cluster.ClusterName; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.transport.ADStatsNodeResponse; -import com.amazon.opendistroforelasticsearch.ad.transport.ADStatsNodesResponse; - public class ADStatsResponseTests extends OpenSearchTestCase { @Test public void testGetAndSetClusterStats() { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStatsTests.java b/src/test/java/org/opensearch/ad/stats/ADStatsTests.java similarity index 88% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStatsTests.java rename to src/test/java/org/opensearch/ad/stats/ADStatsTests.java index 1edcae13d..e423ea83d 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/ADStatsTests.java +++ b/src/test/java/org/opensearch/ad/stats/ADStatsTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats; +package org.opensearch.ad.stats; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -43,20 +43,20 @@ import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.caching.EntityCache; +import org.opensearch.ad.ml.EntityModel; +import org.opensearch.ad.ml.HybridThresholdingModel; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.ModelState; +import org.opensearch.ad.stats.suppliers.CounterSupplier; +import org.opensearch.ad.stats.suppliers.IndexStatusSupplier; +import org.opensearch.ad.stats.suppliers.ModelsOnNodeSupplier; +import org.opensearch.ad.util.IndexUtils; import org.opensearch.test.OpenSearchTestCase; -import test.com.amazon.opendistroforelasticsearch.ad.util.MLUtil; - -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.caching.EntityCache; -import com.amazon.opendistroforelasticsearch.ad.ml.EntityModel; -import com.amazon.opendistroforelasticsearch.ad.ml.HybridThresholdingModel; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelState; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.CounterSupplier; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.IndexStatusSupplier; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.ModelsOnNodeSupplier; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; +import test.org.opensearch.ad.util.MLUtil; + import com.amazon.randomcutforest.RandomCutForest; public class ADStatsTests extends OpenSearchTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/CounterSupplierTests.java b/src/test/java/org/opensearch/ad/stats/suppliers/CounterSupplierTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/CounterSupplierTests.java rename to src/test/java/org/opensearch/ad/stats/suppliers/CounterSupplierTests.java index c86b2a177..f0b57c730 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/CounterSupplierTests.java +++ b/src/test/java/org/opensearch/ad/stats/suppliers/CounterSupplierTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats.suppliers; +package org.opensearch.ad.stats.suppliers; import org.junit.Test; import org.opensearch.test.OpenSearchTestCase; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/IndexSupplierTests.java b/src/test/java/org/opensearch/ad/stats/suppliers/IndexSupplierTests.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/IndexSupplierTests.java rename to src/test/java/org/opensearch/ad/stats/suppliers/IndexSupplierTests.java index a357e0152..7a25e9273 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/IndexSupplierTests.java +++ b/src/test/java/org/opensearch/ad/stats/suppliers/IndexSupplierTests.java @@ -24,17 +24,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats.suppliers; +package org.opensearch.ad.stats.suppliers; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.junit.Before; import org.junit.Test; +import org.opensearch.ad.util.IndexUtils; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; - public class IndexSupplierTests extends OpenSearchTestCase { private IndexUtils indexUtils; private String indexStatus; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/ModelsOnNodeSupplierTests.java b/src/test/java/org/opensearch/ad/stats/suppliers/ModelsOnNodeSupplierTests.java similarity index 86% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/ModelsOnNodeSupplierTests.java rename to src/test/java/org/opensearch/ad/stats/suppliers/ModelsOnNodeSupplierTests.java index fa829e6cd..b9eeb790f 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/ModelsOnNodeSupplierTests.java +++ b/src/test/java/org/opensearch/ad/stats/suppliers/ModelsOnNodeSupplierTests.java @@ -24,11 +24,11 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats.suppliers; +package org.opensearch.ad.stats.suppliers; -import static com.amazon.opendistroforelasticsearch.ad.stats.suppliers.ModelsOnNodeSupplier.MODEL_STATE_STAT_KEYS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import static org.opensearch.ad.stats.suppliers.ModelsOnNodeSupplier.MODEL_STATE_STAT_KEYS; import java.time.Clock; import java.util.ArrayList; @@ -42,16 +42,16 @@ import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.caching.EntityCache; +import org.opensearch.ad.ml.EntityModel; +import org.opensearch.ad.ml.HybridThresholdingModel; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.ModelState; import org.opensearch.test.OpenSearchTestCase; -import test.com.amazon.opendistroforelasticsearch.ad.util.MLUtil; +import test.org.opensearch.ad.util.MLUtil; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.caching.EntityCache; -import com.amazon.opendistroforelasticsearch.ad.ml.EntityModel; -import com.amazon.opendistroforelasticsearch.ad.ml.HybridThresholdingModel; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelState; import com.amazon.randomcutforest.RandomCutForest; public class ModelsOnNodeSupplierTests extends OpenSearchTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/SettableSupplierTests.java b/src/test/java/org/opensearch/ad/stats/suppliers/SettableSupplierTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/SettableSupplierTests.java rename to src/test/java/org/opensearch/ad/stats/suppliers/SettableSupplierTests.java index ddee4207b..e4a3fb3f6 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/stats/suppliers/SettableSupplierTests.java +++ b/src/test/java/org/opensearch/ad/stats/suppliers/SettableSupplierTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.stats.suppliers; +package org.opensearch.ad.stats.suppliers; import org.junit.Test; import org.opensearch.test.OpenSearchTestCase; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskCacheManagerTests.java b/src/test/java/org/opensearch/ad/task/ADTaskCacheManagerTests.java similarity index 90% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskCacheManagerTests.java rename to src/test/java/org/opensearch/ad/task/ADTaskCacheManagerTests.java index 9e90561f0..2f6be3e45 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskCacheManagerTests.java +++ b/src/test/java/org/opensearch/ad/task/ADTaskCacheManagerTests.java @@ -24,10 +24,8 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.task; +package org.opensearch.ad.task; -import static com.amazon.opendistroforelasticsearch.ad.MemoryTracker.Origin.HISTORICAL_SINGLE_ENTITY_DETECTOR; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages.DETECTOR_IS_RUNNING; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; @@ -37,6 +35,8 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ad.MemoryTracker.Origin.HISTORICAL_SINGLE_ENTITY_DETECTOR; +import static org.opensearch.ad.constant.CommonErrorMessages.DETECTOR_IS_RUNNING; import java.io.IOException; import java.util.Arrays; @@ -45,19 +45,18 @@ import org.junit.After; import org.junit.Before; +import org.opensearch.ad.MemoryTracker; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.common.exception.DuplicateTaskException; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.ADTaskState; +import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.MemoryTracker; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.common.exception.DuplicateTaskException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskState; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; - public class ADTaskCacheManagerTests extends OpenSearchTestCase { private MemoryTracker memoryTracker; private ADTaskCacheManager adTaskCacheManager; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskManagerTests.java b/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java similarity index 82% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskManagerTests.java rename to src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java index 4b8f9416a..9c8aeb1c8 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/task/ADTaskManagerTests.java +++ b/src/test/java/org/opensearch/ad/task/ADTaskManagerTests.java @@ -24,15 +24,8 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.task; - -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomDetector; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomFeature; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomUser; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonName.ANOMALY_RESULT_INDEX_ALIAS; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_OLD_AD_TASK_DOCS_PER_DETECTOR; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; +package org.opensearch.ad.task; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -40,6 +33,13 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.opensearch.ad.TestHelpers.randomDetector; +import static org.opensearch.ad.TestHelpers.randomFeature; +import static org.opensearch.ad.TestHelpers.randomUser; +import static org.opensearch.ad.constant.CommonName.ANOMALY_RESULT_INDEX_ALIAS; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_OLD_AD_TASK_DOCS_PER_DETECTOR; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.REQUEST_TIMEOUT; import java.io.IOException; import java.time.Instant; @@ -48,6 +48,16 @@ import org.opensearch.ResourceAlreadyExistsException; import org.opensearch.action.ActionListener; import org.opensearch.action.admin.indices.create.CreateIndexResponse; +import org.opensearch.ad.ADUnitTestCase; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.cluster.HashRing; +import org.opensearch.ad.common.exception.DuplicateTaskException; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.DetectionDateRange; +import org.opensearch.ad.transport.AnomalyDetectorJobResponse; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; @@ -56,16 +66,6 @@ import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.ADUnitTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.cluster.HashRing; -import com.amazon.opendistroforelasticsearch.ad.common.exception.DuplicateTaskException; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.DetectionDateRange; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyDetectorJobResponse; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; import com.google.common.collect.ImmutableList; public class ADTaskManagerTests extends ADUnitTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/ADBatchAnomalyResultTransportActionTests.java similarity index 90% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/ADBatchAnomalyResultTransportActionTests.java index 626e2ab12..384be9cfd 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADBatchAnomalyResultTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/ADBatchAnomalyResultTransportActionTests.java @@ -24,12 +24,12 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomFeature; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE; -import static com.amazon.opendistroforelasticsearch.ad.settings.EnabledSetting.AD_PLUGIN_ENABLED; +import static org.opensearch.ad.TestHelpers.randomFeature; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE; +import static org.opensearch.ad.settings.EnabledSetting.AD_PLUGIN_ENABLED; import java.io.IOException; import java.time.Instant; @@ -39,19 +39,19 @@ import org.junit.Before; import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.get.GetResponse; +import org.opensearch.ad.HistoricalDetectorIntegTestCase; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.ADTaskState; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.DetectionDateRange; import org.opensearch.common.io.stream.NotSerializableExceptionWrapper; import org.opensearch.common.settings.Settings; import org.opensearch.test.OpenSearchIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.HistoricalDetectorIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskState; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.DetectionDateRange; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -196,7 +196,7 @@ public void testMultipleTasks() throws IOException, InterruptedException { new DetectionDateRange(startTime, startTime.plus(2000, ChronoUnit.MINUTES)) ); client().execute(ADBatchAnomalyResultAction.INSTANCE, request).actionGet(5000); - Thread.sleep(10000); + Thread.sleep(20000); GetResponse doc = getDoc(CommonName.DETECTION_STATE_INDEX, request.getAdTask().getTaskId()); assertEquals(ADTaskState.FINISHED.name(), doc.getSourceAsMap().get(ADTask.STATE_FIELD)); updateTransientSettings(ImmutableMap.of(MAX_BATCH_TASK_PER_NODE.getKey(), 1)); diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskTests.java b/src/test/java/org/opensearch/ad/transport/ADCancelTaskTests.java similarity index 90% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskTests.java rename to src/test/java/org/opensearch/ad/transport/ADCancelTaskTests.java index c80d248cd..8f2921741 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADCancelTaskTests.java +++ b/src/test/java/org/opensearch/ad/transport/ADCancelTaskTests.java @@ -24,22 +24,22 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomDiscoveryNode; +import static org.opensearch.ad.TestHelpers.randomDiscoveryNode; import java.io.IOException; import java.util.List; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.ADUnitTestCase; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.task.ADTaskCancellationState; import org.opensearch.cluster.ClusterName; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; import org.opensearch.common.io.stream.StreamInput; -import com.amazon.opendistroforelasticsearch.ad.ADUnitTestCase; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskCancellationState; import com.google.common.collect.ImmutableList; public class ADCancelTaskTests extends ADUnitTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADResultBulkTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/ADResultBulkTransportActionTests.java similarity index 97% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADResultBulkTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/ADResultBulkTransportActionTests.java index 6665f7659..265450e54 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADResultBulkTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/ADResultBulkTransportActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; @@ -49,6 +49,9 @@ import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.PlainActionFuture; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.settings.AnomalyDetectorSettings; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.io.stream.BytesStreamOutput; @@ -58,10 +61,6 @@ import org.opensearch.index.IndexingPressure; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; - public class ADResultBulkTransportActionTests extends AbstractADTest { private ADResultBulkTransportAction resultBulk; private TransportService transportService; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsIT.java b/src/test/java/org/opensearch/ad/transport/ADStatsIT.java similarity index 93% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsIT.java rename to src/test/java/org/opensearch/ad/transport/ADStatsIT.java index 95e1f70ce..9fb25dc21 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsIT.java +++ b/src/test/java/org/opensearch/ad/transport/ADStatsIT.java @@ -24,17 +24,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.util.Collection; import java.util.Collections; import java.util.concurrent.ExecutionException; +import org.opensearch.ad.AnomalyDetectorPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; - @OpenSearchIntegTestCase.ClusterScope(transportClientRatio = 0.9) public class ADStatsIT extends OpenSearchIntegTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodesTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/ADStatsNodesTransportActionTests.java similarity index 86% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodesTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/ADStatsNodesTransportActionTests.java index c6af79b4b..ad95dc996 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsNodesTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/ADStatsNodesTransportActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -39,6 +39,19 @@ import org.junit.Before; import org.junit.Test; import org.opensearch.action.support.ActionFilters; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.caching.EntityCache; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.stats.ADStat; +import org.opensearch.ad.stats.ADStats; +import org.opensearch.ad.stats.InternalStatNames; +import org.opensearch.ad.stats.suppliers.CounterSupplier; +import org.opensearch.ad.stats.suppliers.IndexStatusSupplier; +import org.opensearch.ad.stats.suppliers.ModelsOnNodeSupplier; +import org.opensearch.ad.stats.suppliers.SettableSupplier; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.IndexUtils; +import org.opensearch.ad.util.Throttler; import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.common.settings.Settings; @@ -48,20 +61,6 @@ import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.caching.EntityCache; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStat; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStats; -import com.amazon.opendistroforelasticsearch.ad.stats.InternalStatNames; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.CounterSupplier; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.IndexStatusSupplier; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.ModelsOnNodeSupplier; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.SettableSupplier; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; -import com.amazon.opendistroforelasticsearch.ad.util.Throttler; - public class ADStatsNodesTransportActionTests extends OpenSearchIntegTestCase { private ADStatsNodesTransportAction action; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsTests.java b/src/test/java/org/opensearch/ad/transport/ADStatsTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsTests.java rename to src/test/java/org/opensearch/ad/transport/ADStatsTests.java index 426876cc6..a463f80ca 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADStatsTests.java +++ b/src/test/java/org/opensearch/ad/transport/ADStatsTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; @@ -43,6 +43,8 @@ import org.junit.Test; import org.opensearch.Version; import org.opensearch.action.FailedNodeException; +import org.opensearch.ad.common.exception.JsonPathNotFoundException; +import org.opensearch.ad.stats.StatNames; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.Strings; @@ -53,10 +55,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.test.OpenSearchTestCase; -import test.com.amazon.opendistroforelasticsearch.ad.util.JsonDeserializer; - -import com.amazon.opendistroforelasticsearch.ad.common.exception.JsonPathNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.stats.StatNames; +import test.org.opensearch.ad.util.JsonDeserializer; public class ADStatsTests extends OpenSearchTestCase { String node1, nodeName1, clusterName; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileTests.java b/src/test/java/org/opensearch/ad/transport/ADTaskProfileTests.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileTests.java rename to src/test/java/org/opensearch/ad/transport/ADTaskProfileTests.java index e58b7cca0..6bd2d7199 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileTests.java +++ b/src/test/java/org/opensearch/ad/transport/ADTaskProfileTests.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomDiscoveryNode; +import static org.opensearch.ad.TestHelpers.randomDiscoveryNode; import java.io.IOException; import java.util.Collection; @@ -34,6 +34,10 @@ import org.opensearch.Version; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.model.ADTaskProfile; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.UUIDs; @@ -44,10 +48,6 @@ import org.opensearch.test.InternalSettingsPlugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskProfile; import com.google.common.collect.ImmutableList; public class ADTaskProfileTests extends OpenSearchSingleNodeTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/ADTaskProfileTransportActionTests.java similarity index 82% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/ADTaskProfileTransportActionTests.java index 7de3adbf0..98dc07a60 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ADTaskProfileTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/ADTaskProfileTransportActionTests.java @@ -24,19 +24,18 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE; import java.time.Instant; import java.time.temporal.ChronoUnit; import org.junit.Before; +import org.opensearch.ad.HistoricalDetectorIntegTestCase; import org.opensearch.common.settings.Settings; -import com.amazon.opendistroforelasticsearch.ad.HistoricalDetectorIntegTestCase; - public class ADTaskProfileTransportActionTests extends HistoricalDetectorIntegTestCase { private Instant startTime; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobActionTests.java b/src/test/java/org/opensearch/ad/transport/AnomalyDetectorJobActionTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobActionTests.java rename to src/test/java/org/opensearch/ad/transport/AnomalyDetectorJobActionTests.java index cb22dd5c9..cafcc6e6e 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/AnomalyDetectorJobActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -39,6 +39,9 @@ import org.junit.Test; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.task.ADTaskManager; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.io.stream.BytesStreamOutput; @@ -52,9 +55,6 @@ import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; import com.amazon.opendistroforelasticsearch.commons.ConfigConstants; public class AnomalyDetectorJobActionTests extends OpenSearchIntegTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportActionTests.java similarity index 91% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportActionTests.java index 0e1f2704c..f5ca4e24b 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyDetectorJobTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/AnomalyDetectorJobTransportActionTests.java @@ -24,15 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; - -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages.DETECTOR_IS_RUNNING; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_OLD_AD_TASK_DOCS_PER_DETECTOR; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.PROFILE; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.START_JOB; -import static com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils.STOP_JOB; +package org.opensearch.ad.transport; + +import static org.opensearch.ad.constant.CommonErrorMessages.DETECTOR_IS_RUNNING; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_OLD_AD_TASK_DOCS_PER_DETECTOR; +import static org.opensearch.ad.util.RestHandlerUtils.PROFILE; +import static org.opensearch.ad.util.RestHandlerUtils.START_JOB; +import static org.opensearch.ad.util.RestHandlerUtils.STOP_JOB; import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_PRIMARY_TERM; import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; @@ -51,23 +51,23 @@ import org.opensearch.OpenSearchStatusException; import org.opensearch.action.ActionListener; import org.opensearch.action.get.GetResponse; +import org.opensearch.ad.HistoricalDetectorIntegTestCase; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.mock.transport.MockAnomalyDetectorJobAction; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.ADTaskProfile; +import org.opensearch.ad.model.ADTaskState; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.DetectionDateRange; +import org.opensearch.ad.stats.StatNames; import org.opensearch.client.Client; import org.opensearch.common.lucene.uid.Versions; import org.opensearch.common.settings.Settings; import org.opensearch.index.IndexNotFoundException; import org.opensearch.test.OpenSearchIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.HistoricalDetectorIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.mock.transport.MockAnomalyDetectorJobAction; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskProfile; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskState; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.DetectionDateRange; -import com.amazon.opendistroforelasticsearch.ad.stats.StatNames; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -162,7 +162,7 @@ public void testRunMultipleTasksForHistoricalDetector() throws IOException, Inte ); assertTrue(exception.getMessage().contains(DETECTOR_IS_RUNNING)); assertEquals(DETECTOR_IS_RUNNING, exception.getMessage()); - Thread.sleep(10000); + Thread.sleep(20000); List adTasks = searchADTasks(detectorId, null, 100); assertEquals(1, adTasks.size()); assertEquals(ADTaskState.FINISHED.name(), adTasks.get(0).getState()); diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultTests.java b/src/test/java/org/opensearch/ad/transport/AnomalyResultTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultTests.java rename to src/test/java/org/opensearch/ad/transport/AnomalyResultTests.java index ebcd47f80..545047eb3 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultTests.java +++ b/src/test/java/org/opensearch/ad/transport/AnomalyResultTests.java @@ -24,9 +24,8 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.createIndexBlockedState; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.empty; @@ -49,6 +48,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ad.TestHelpers.createIndexBlockedState; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; import java.io.IOException; @@ -78,6 +78,38 @@ import org.opensearch.action.index.IndexResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.PlainActionFuture; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.breaker.ADCircuitBreakerService; +import org.opensearch.ad.cluster.HashRing; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.common.exception.InternalFailure; +import org.opensearch.ad.common.exception.JsonPathNotFoundException; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.common.exception.ResourceNotFoundException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonMessageAttributes; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.feature.SearchFeatureDao; +import org.opensearch.ad.feature.SinglePointFeatures; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.ModelPartitioner; +import org.opensearch.ad.ml.RcfResult; +import org.opensearch.ad.ml.ThresholdingResult; +import org.opensearch.ad.ml.rcf.CombinedRcfResult; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.DetectorInternalState; +import org.opensearch.ad.model.FeatureData; +import org.opensearch.ad.stats.ADStat; +import org.opensearch.ad.stats.ADStats; +import org.opensearch.ad.stats.StatNames; +import org.opensearch.ad.stats.suppliers.CounterSupplier; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.IndexUtils; +import org.opensearch.ad.util.Throttler; import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; @@ -109,40 +141,8 @@ import org.opensearch.transport.TransportResponseHandler; import org.opensearch.transport.TransportService; -import test.com.amazon.opendistroforelasticsearch.ad.util.JsonDeserializer; - -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.breaker.ADCircuitBreakerService; -import com.amazon.opendistroforelasticsearch.ad.cluster.HashRing; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.InternalFailure; -import com.amazon.opendistroforelasticsearch.ad.common.exception.JsonPathNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.ResourceNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.feature.SearchFeatureDao; -import com.amazon.opendistroforelasticsearch.ad.feature.SinglePointFeatures; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelPartitioner; -import com.amazon.opendistroforelasticsearch.ad.ml.RcfResult; -import com.amazon.opendistroforelasticsearch.ad.ml.ThresholdingResult; -import com.amazon.opendistroforelasticsearch.ad.ml.rcf.CombinedRcfResult; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorInternalState; -import com.amazon.opendistroforelasticsearch.ad.model.FeatureData; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStat; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStats; -import com.amazon.opendistroforelasticsearch.ad.stats.StatNames; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.CounterSupplier; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; -import com.amazon.opendistroforelasticsearch.ad.util.Throttler; +import test.org.opensearch.ad.util.JsonDeserializer; + import com.google.gson.JsonElement; public class AnomalyResultTests extends AbstractADTest { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/AnomalyResultTransportActionTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/AnomalyResultTransportActionTests.java index bed62bcd1..8d045893f 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/AnomalyResultTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/AnomalyResultTransportActionTests.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomQuery; +import static org.opensearch.ad.TestHelpers.randomQuery; import java.io.IOException; import java.time.Instant; @@ -36,16 +36,16 @@ import org.junit.Before; import org.opensearch.action.get.GetResponse; +import org.opensearch.ad.ADIntegTestCase; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.Feature; +import org.opensearch.ad.model.IntervalTimeConfiguration; import org.opensearch.common.io.stream.NotSerializableExceptionWrapper; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.test.rest.OpenSearchRestTestCase; -import com.amazon.opendistroforelasticsearch.ad.ADIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.Feature; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/CronTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/CronTransportActionTests.java similarity index 88% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/CronTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/CronTransportActionTests.java index ba8ddd7c2..42ebdc8da 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/CronTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/CronTransportActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -38,6 +38,13 @@ import org.junit.Before; import org.opensearch.Version; import org.opensearch.action.support.ActionFilters; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.caching.EntityCache; +import org.opensearch.ad.common.exception.JsonPathNotFoundException; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.ml.ModelManager; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; @@ -50,15 +57,8 @@ import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import test.com.amazon.opendistroforelasticsearch.ad.util.JsonDeserializer; +import test.org.opensearch.ad.util.JsonDeserializer; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.caching.EntityCache; -import com.amazon.opendistroforelasticsearch.ad.common.exception.JsonPathNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; import com.google.gson.JsonElement; public class CronTransportActionTests extends AbstractADTest { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorActionTests.java b/src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorActionTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorActionTests.java rename to src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorActionTests.java index ffba72d13..f1f70832d 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -41,6 +41,8 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.delete.DeleteResponse; import org.opensearch.action.support.ActionFilters; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.task.ADTaskManager; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; @@ -50,9 +52,6 @@ import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; - public class DeleteAnomalyDetectorActionTests extends OpenSearchIntegTestCase { private DeleteAnomalyDetectorTransportAction action; private ActionListener response; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTransportActionTests.java similarity index 89% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTransportActionTests.java index 1f3b0806f..a57744fd3 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteAnomalyDetectorTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/DeleteAnomalyDetectorTransportActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.time.Instant; @@ -32,12 +32,12 @@ import org.junit.Before; import org.opensearch.action.delete.DeleteResponse; +import org.opensearch.ad.HistoricalDetectorIntegTestCase; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.Feature; import org.opensearch.test.OpenSearchIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.HistoricalDetectorIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.Feature; import com.google.common.collect.ImmutableList; @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 2) diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteIT.java b/src/test/java/org/opensearch/ad/transport/DeleteIT.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteIT.java rename to src/test/java/org/opensearch/ad/transport/DeleteIT.java index ca2a19217..464bd11dd 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteIT.java +++ b/src/test/java/org/opensearch/ad/transport/DeleteIT.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.util.Collection; import java.util.Collections; @@ -32,11 +32,10 @@ import org.opensearch.action.ActionFuture; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.AnomalyDetectorPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; - @OpenSearchIntegTestCase.ClusterScope(transportClientRatio = 0.9) public class DeleteIT extends OpenSearchIntegTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/DeleteModelTransportActionTests.java similarity index 88% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/DeleteModelTransportActionTests.java index 907cb9ee4..37f52e796 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteModelTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/DeleteModelTransportActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; @@ -42,6 +42,14 @@ import org.opensearch.Version; import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.support.ActionFilters; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.caching.EntityCache; +import org.opensearch.ad.common.exception.JsonPathNotFoundException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.ml.ModelManager; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; @@ -54,16 +62,8 @@ import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import test.com.amazon.opendistroforelasticsearch.ad.util.JsonDeserializer; +import test.org.opensearch.ad.util.JsonDeserializer; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.caching.EntityCache; -import com.amazon.opendistroforelasticsearch.ad.common.exception.JsonPathNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; import com.google.gson.JsonElement; public class DeleteModelTransportActionTests extends AbstractADTest { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteTests.java b/src/test/java/org/opensearch/ad/transport/DeleteTests.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteTests.java rename to src/test/java/org/opensearch/ad/transport/DeleteTests.java index fa745697e..c35033e70 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/DeleteTests.java +++ b/src/test/java/org/opensearch/ad/transport/DeleteTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; @@ -55,6 +55,11 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.common.exception.JsonPathNotFoundException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonMessageAttributes; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; @@ -72,14 +77,8 @@ import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import test.com.amazon.opendistroforelasticsearch.ad.util.ClusterCreation; -import test.com.amazon.opendistroforelasticsearch.ad.util.JsonDeserializer; - -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.common.exception.JsonPathNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; +import test.org.opensearch.ad.util.ClusterCreation; +import test.org.opensearch.ad.util.JsonDeserializer; public class DeleteTests extends AbstractADTest { private DeleteModelResponse response; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileTests.java b/src/test/java/org/opensearch/ad/transport/EntityProfileTests.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileTests.java rename to src/test/java/org/opensearch/ad/transport/EntityProfileTests.java index d4b56e36d..3643d7dc8 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityProfileTests.java +++ b/src/test/java/org/opensearch/ad/transport/EntityProfileTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.hamcrest.Matchers.equalTo; import static org.mockito.ArgumentMatchers.any; @@ -45,6 +45,17 @@ import org.opensearch.Version; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.PlainActionFuture; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.caching.EntityCache; +import org.opensearch.ad.cluster.HashRing; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.common.exception.JsonPathNotFoundException; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.model.EntityProfileName; +import org.opensearch.ad.model.ModelProfile; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.io.stream.BytesStreamOutput; @@ -63,20 +74,8 @@ import org.opensearch.transport.TransportResponseHandler; import org.opensearch.transport.TransportService; -import test.com.amazon.opendistroforelasticsearch.ad.util.FakeNode; -import test.com.amazon.opendistroforelasticsearch.ad.util.JsonDeserializer; - -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.caching.EntityCache; -import com.amazon.opendistroforelasticsearch.ad.cluster.HashRing; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.JsonPathNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.model.EntityProfileName; -import com.amazon.opendistroforelasticsearch.ad.model.ModelProfile; +import test.org.opensearch.ad.util.FakeNode; +import test.org.opensearch.ad.util.JsonDeserializer; public class EntityProfileTests extends AbstractADTest { private String detectorId = "yecrdnUBqurvo9uKU_d8"; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityResultTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/EntityResultTransportActionTests.java similarity index 87% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityResultTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/EntityResultTransportActionTests.java index 13b86e7f4..45486a87e 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/EntityResultTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/EntityResultTransportActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; @@ -54,6 +54,27 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.breaker.ADCircuitBreakerService; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.caching.EntityCache; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.common.exception.JsonPathNotFoundException; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonMessageAttributes; +import org.opensearch.ad.constant.CommonValue; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.ml.CheckpointDao; +import org.opensearch.ad.ml.EntityModel; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.ModelState; +import org.opensearch.ad.ml.ThresholdingResult; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.transport.handler.MultiEntityResultHandler; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; @@ -63,29 +84,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.transport.TransportService; -import test.com.amazon.opendistroforelasticsearch.ad.util.JsonDeserializer; - -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.breaker.ADCircuitBreakerService; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.caching.EntityCache; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.JsonPathNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonValue; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.ml.CheckpointDao; -import com.amazon.opendistroforelasticsearch.ad.ml.EntityModel; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelState; -import com.amazon.opendistroforelasticsearch.ad.ml.ThresholdingResult; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.MultiEntityResultHandler; +import test.org.opensearch.ad.util.JsonDeserializer; public class EntityResultTransportActionTests extends AbstractADTest { EntityResultTransportAction entityResult; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ForwardADTaskTests.java b/src/test/java/org/opensearch/ad/transport/ForwardADTaskTests.java similarity index 91% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ForwardADTaskTests.java rename to src/test/java/org/opensearch/ad/transport/ForwardADTaskTests.java index 8858b9751..918469ae6 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ForwardADTaskTests.java +++ b/src/test/java/org/opensearch/ad/transport/ForwardADTaskTests.java @@ -24,13 +24,17 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.time.Instant; import java.util.Collection; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.model.ADTaskAction; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; import org.opensearch.common.io.stream.NamedWriteableRegistry; @@ -38,10 +42,6 @@ import org.opensearch.test.InternalSettingsPlugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.model.ADTaskAction; import com.google.common.collect.ImmutableMap; public class ForwardADTaskTests extends OpenSearchSingleNodeTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorActionTests.java b/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorActionTests.java similarity index 90% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorActionTests.java rename to src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorActionTests.java index d24205dc5..9f24a2cca 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; @@ -33,6 +33,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.DetectorProfile; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.rest.RestStatus; @@ -40,11 +44,6 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfile; - @RunWith(PowerMockRunner.class) @PrepareForTest(GetAnomalyDetectorResponse.class) public class GetAnomalyDetectorActionTests { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorTests.java b/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java similarity index 91% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorTests.java rename to src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java index f14764424..8d41710d5 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorTests.java +++ b/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTests.java @@ -24,13 +24,13 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; import java.io.IOException; import java.security.InvalidParameterException; @@ -45,6 +45,11 @@ import org.opensearch.action.get.GetResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.PlainActionFuture; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.task.ADTaskManager; +import org.opensearch.ad.util.DiscoveryNodeFilterer; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; @@ -52,12 +57,6 @@ import org.opensearch.transport.Transport; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; - public class GetAnomalyDetectorTests extends AbstractADTest { private GetAnomalyDetectorTransportAction action; private TransportService transportService; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportActionTests.java similarity index 92% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportActionTests.java index 95b1930f6..33cdca1ec 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/GetAnomalyDetectorTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/GetAnomalyDetectorTransportActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -42,6 +42,15 @@ import org.mockito.Mockito; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.model.ADTask; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.EntityProfile; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.task.ADTaskManager; +import org.opensearch.ad.util.DiscoveryNodeFilterer; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; @@ -56,15 +65,6 @@ import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.EntityProfile; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; -import com.amazon.opendistroforelasticsearch.ad.util.DiscoveryNodeFilterer; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; import com.google.common.collect.ImmutableMap; public class GetAnomalyDetectorTransportActionTests extends OpenSearchSingleNodeTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorActionTests.java b/src/test/java/org/opensearch/ad/transport/IndexAnomalyDetectorActionTests.java similarity index 93% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorActionTests.java rename to src/test/java/org/opensearch/ad/transport/IndexAnomalyDetectorActionTests.java index a750d876b..0b2e8cca4 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/IndexAnomalyDetectorActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.time.Instant; import java.util.Map; @@ -33,6 +33,9 @@ import org.junit.Before; import org.junit.Test; import org.opensearch.action.support.WriteRequest; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; import org.opensearch.common.io.stream.NamedWriteableRegistry; @@ -43,9 +46,6 @@ import org.opensearch.rest.RestStatus; import org.opensearch.test.OpenSearchSingleNodeTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; import com.google.common.collect.ImmutableMap; public class IndexAnomalyDetectorActionTests extends OpenSearchSingleNodeTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportActionTests.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportActionTests.java index 0f861c87b..0d8962a98 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/IndexAnomalyDetectorTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/IndexAnomalyDetectorTransportActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -39,6 +39,10 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.WriteRequest; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.task.ADTaskManager; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; @@ -51,10 +55,6 @@ import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.task.ADTaskManager; import com.amazon.opendistroforelasticsearch.commons.ConfigConstants; public class IndexAnomalyDetectorTransportActionTests extends OpenSearchIntegTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/MultientityResultTests.java b/src/test/java/org/opensearch/ad/transport/MultientityResultTests.java similarity index 89% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/MultientityResultTests.java rename to src/test/java/org/opensearch/ad/transport/MultientityResultTests.java index 494441aac..75981ca75 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/MultientityResultTests.java +++ b/src/test/java/org/opensearch/ad/transport/MultientityResultTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; @@ -53,6 +53,34 @@ import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.breaker.ADCircuitBreakerService; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.caching.EntityCache; +import org.opensearch.ad.cluster.HashRing; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.common.exception.EndRunException; +import org.opensearch.ad.common.exception.InternalFailure; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.feature.SearchFeatureDao; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.ml.CheckpointDao; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.ModelPartitioner; +import org.opensearch.ad.ml.ThresholdingResult; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.stats.ADStat; +import org.opensearch.ad.stats.ADStats; +import org.opensearch.ad.stats.StatNames; +import org.opensearch.ad.stats.suppliers.CounterSupplier; +import org.opensearch.ad.transport.handler.MultiEntityResultHandler; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.IndexUtils; import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; @@ -71,36 +99,7 @@ import org.opensearch.transport.TransportResponseHandler; import org.opensearch.transport.TransportService; -import test.com.amazon.opendistroforelasticsearch.ad.util.MLUtil; - -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.breaker.ADCircuitBreakerService; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.caching.EntityCache; -import com.amazon.opendistroforelasticsearch.ad.cluster.HashRing; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.EndRunException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.InternalFailure; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.feature.SearchFeatureDao; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.ml.CheckpointDao; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelPartitioner; -import com.amazon.opendistroforelasticsearch.ad.ml.ThresholdingResult; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStat; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStats; -import com.amazon.opendistroforelasticsearch.ad.stats.StatNames; -import com.amazon.opendistroforelasticsearch.ad.stats.suppliers.CounterSupplier; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.MultiEntityResultHandler; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; +import test.org.opensearch.ad.util.MLUtil; public class MultientityResultTests extends AbstractADTest { private AnomalyResultTransportAction action; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorActionTests.java b/src/test/java/org/opensearch/ad/transport/PreviewAnomalyDetectorActionTests.java similarity index 93% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorActionTests.java rename to src/test/java/org/opensearch/ad/transport/PreviewAnomalyDetectorActionTests.java index 2e5fd52d2..4e38dc996 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/PreviewAnomalyDetectorActionTests.java @@ -24,21 +24,21 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.time.Instant; import org.junit.Assert; import org.junit.Test; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyResult; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.test.OpenSearchSingleNodeTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportActionTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportActionTests.java index 71f02ad39..82dae2618 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/PreviewAnomalyDetectorTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/PreviewAnomalyDetectorTransportActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; @@ -54,6 +54,16 @@ import org.opensearch.action.index.IndexResponse; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.WriteRequest; +import org.opensearch.ad.AnomalyDetectorRunner; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.feature.Features; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.util.RestHandlerUtils; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; @@ -68,16 +78,6 @@ import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorRunner; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.feature.Features; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; -import com.amazon.opendistroforelasticsearch.ad.util.RestHandlerUtils; import com.amazon.opendistroforelasticsearch.commons.ConfigConstants; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileIT.java b/src/test/java/org/opensearch/ad/transport/ProfileIT.java similarity index 90% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileIT.java rename to src/test/java/org/opensearch/ad/transport/ProfileIT.java index 9528912e7..3bd02dfe7 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileIT.java +++ b/src/test/java/org/opensearch/ad/transport/ProfileIT.java @@ -24,19 +24,18 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.concurrent.ExecutionException; +import org.opensearch.ad.AnomalyDetectorPlugin; +import org.opensearch.ad.model.DetectorProfileName; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfileName; - @OpenSearchIntegTestCase.ClusterScope(transportClientRatio = 0.9) public class ProfileIT extends OpenSearchIntegTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileTests.java b/src/test/java/org/opensearch/ad/transport/ProfileTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileTests.java rename to src/test/java/org/opensearch/ad/transport/ProfileTests.java index 764a34903..7768bfbe4 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileTests.java +++ b/src/test/java/org/opensearch/ad/transport/ProfileTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; @@ -43,6 +43,10 @@ import org.junit.Test; import org.opensearch.Version; import org.opensearch.action.FailedNodeException; +import org.opensearch.ad.common.exception.JsonPathNotFoundException; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.DetectorProfileName; +import org.opensearch.ad.model.ModelProfile; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.Strings; @@ -53,12 +57,8 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.test.OpenSearchTestCase; -import test.com.amazon.opendistroforelasticsearch.ad.util.JsonDeserializer; +import test.org.opensearch.ad.util.JsonDeserializer; -import com.amazon.opendistroforelasticsearch.ad.common.exception.JsonPathNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfileName; -import com.amazon.opendistroforelasticsearch.ad.model.ModelProfile; import com.google.gson.JsonArray; import com.google.gson.JsonElement; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/ProfileTransportActionTests.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/ProfileTransportActionTests.java index 6a2a43273..601ad3528 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ProfileTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/ProfileTransportActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -43,16 +43,15 @@ import org.junit.Test; import org.opensearch.action.FailedNodeException; import org.opensearch.action.support.ActionFilters; +import org.opensearch.ad.caching.CacheProvider; +import org.opensearch.ad.caching.EntityCache; +import org.opensearch.ad.feature.FeatureManager; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.model.DetectorProfileName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.caching.CacheProvider; -import com.amazon.opendistroforelasticsearch.ad.caching.EntityCache; -import com.amazon.opendistroforelasticsearch.ad.feature.FeatureManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfileName; - public class ProfileTransportActionTests extends OpenSearchIntegTestCase { private ProfileTransportAction action; private String detectorId = "Pl536HEBnXkDrah03glg"; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingTests.java b/src/test/java/org/opensearch/ad/transport/RCFPollingTests.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingTests.java rename to src/test/java/org/opensearch/ad/transport/RCFPollingTests.java index 500cd10dc..f69831b67 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFPollingTests.java +++ b/src/test/java/org/opensearch/ad/transport/RCFPollingTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.anyInt; @@ -45,6 +45,14 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.PlainActionFuture; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.cluster.HashRing; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.common.exception.JsonPathNotFoundException; +import org.opensearch.ad.constant.CommonMessageAttributes; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.ModelPartitioner; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.io.stream.StreamInput; @@ -62,17 +70,9 @@ import org.opensearch.transport.TransportResponseHandler; import org.opensearch.transport.TransportService; -import test.com.amazon.opendistroforelasticsearch.ad.util.FakeNode; -import test.com.amazon.opendistroforelasticsearch.ad.util.JsonDeserializer; - -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.cluster.HashRing; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.JsonPathNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelPartitioner; +import test.org.opensearch.ad.util.FakeNode; +import test.org.opensearch.ad.util.JsonDeserializer; + import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultIT.java b/src/test/java/org/opensearch/ad/transport/RCFResultIT.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultIT.java rename to src/test/java/org/opensearch/ad/transport/RCFResultIT.java index e32991ac2..e95e9ca4b 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultIT.java +++ b/src/test/java/org/opensearch/ad/transport/RCFResultIT.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.util.Collection; import java.util.Collections; @@ -32,11 +32,10 @@ import org.opensearch.action.ActionFuture; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.AnomalyDetectorPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; - @OpenSearchIntegTestCase.ClusterScope(transportClientRatio = 0.9) public class RCFResultIT extends OpenSearchIntegTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultTests.java b/src/test/java/org/opensearch/ad/transport/RCFResultTests.java similarity index 93% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultTests.java rename to src/test/java/org/opensearch/ad/transport/RCFResultTests.java index 9c9b55264..f7e4f83d8 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/RCFResultTests.java +++ b/src/test/java/org/opensearch/ad/transport/RCFResultTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; @@ -44,6 +44,13 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.PlainActionFuture; +import org.opensearch.ad.breaker.ADCircuitBreakerService; +import org.opensearch.ad.common.exception.JsonPathNotFoundException; +import org.opensearch.ad.common.exception.LimitExceededException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonMessageAttributes; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.RcfResult; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; @@ -55,15 +62,8 @@ import org.opensearch.transport.Transport; import org.opensearch.transport.TransportService; -import test.com.amazon.opendistroforelasticsearch.ad.util.JsonDeserializer; +import test.org.opensearch.ad.util.JsonDeserializer; -import com.amazon.opendistroforelasticsearch.ad.breaker.ADCircuitBreakerService; -import com.amazon.opendistroforelasticsearch.ad.common.exception.JsonPathNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.LimitExceededException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.RcfResult; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchADTasksActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchADTasksActionTests.java similarity index 84% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchADTasksActionTests.java rename to src/test/java/org/opensearch/ad/transport/SearchADTasksActionTests.java index a6cb11f65..ab80fdc4d 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchADTasksActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/SearchADTasksActionTests.java @@ -24,18 +24,17 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.matchAllRequest; +import static org.opensearch.ad.TestHelpers.matchAllRequest; import java.io.IOException; import org.junit.Test; import org.opensearch.action.search.SearchResponse; - -import com.amazon.opendistroforelasticsearch.ad.HistoricalDetectorIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; +import org.opensearch.ad.HistoricalDetectorIntegTestCase; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.constant.CommonName; public class SearchADTasksActionTests extends HistoricalDetectorIntegTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchADTasksTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchADTasksTransportActionTests.java similarity index 87% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchADTasksTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/SearchADTasksTransportActionTests.java index 157fd587c..48125a278 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchADTasksTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/SearchADTasksTransportActionTests.java @@ -24,10 +24,10 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.BATCH_TASK_PIECE_INTERVAL_SECONDS; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.MAX_BATCH_TASK_PER_NODE; import java.io.IOException; import java.time.Instant; @@ -36,6 +36,9 @@ import org.junit.Before; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; +import org.opensearch.ad.HistoricalDetectorIntegTestCase; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.ADTask; import org.opensearch.common.settings.Settings; import org.opensearch.index.IndexNotFoundException; import org.opensearch.index.query.BoolQueryBuilder; @@ -43,10 +46,6 @@ import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.test.OpenSearchIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.HistoricalDetectorIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.ADTask; - @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 2) public class SearchADTasksTransportActionTests extends HistoricalDetectorIntegTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchAnomalyDetectorActionTests.java similarity index 88% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorActionTests.java rename to src/test/java/org/opensearch/ad/transport/SearchAnomalyDetectorActionTests.java index e830fd194..d5eacdd86 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/SearchAnomalyDetectorActionTests.java @@ -24,9 +24,9 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.DETECTOR_TYPE_FIELD; +import static org.opensearch.ad.model.AnomalyDetector.DETECTOR_TYPE_FIELD; import java.io.IOException; import java.time.Instant; @@ -34,15 +34,15 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; +import org.opensearch.ad.HistoricalDetectorIntegTestCase; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorType; import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.index.query.MatchAllQueryBuilder; import org.opensearch.index.query.TermQueryBuilder; import org.opensearch.search.builder.SearchSourceBuilder; -import com.amazon.opendistroforelasticsearch.ad.HistoricalDetectorIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorType; import com.google.common.collect.ImmutableList; public class SearchAnomalyDetectorActionTests extends HistoricalDetectorIntegTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoActionTests.java similarity index 97% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoActionTests.java rename to src/test/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoActionTests.java index 8fd87a844..3ed734caa 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyDetectorInfoActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/SearchAnomalyDetectorInfoActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.mockito.Mockito.mock; @@ -35,6 +35,7 @@ import org.junit.Test; import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; +import org.opensearch.ad.TestHelpers; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.xcontent.ToXContent; @@ -42,8 +43,6 @@ import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.transport.TransportService; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; - public class SearchAnomalyDetectorInfoActionTests extends OpenSearchIntegTestCase { private SearchAnomalyDetectorInfoRequest request; private ActionListener response; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyResultActionTests.java b/src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java similarity index 84% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyResultActionTests.java rename to src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java index 94b639c35..f72fbdbe1 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/SearchAnomalyResultActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/SearchAnomalyResultActionTests.java @@ -24,18 +24,17 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.matchAllRequest; +import static org.opensearch.ad.TestHelpers.matchAllRequest; import java.io.IOException; import org.junit.Test; import org.opensearch.action.search.SearchResponse; - -import com.amazon.opendistroforelasticsearch.ad.HistoricalDetectorIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; +import org.opensearch.ad.HistoricalDetectorIntegTestCase; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.constant.CommonName; public class SearchAnomalyResultActionTests extends HistoricalDetectorIntegTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorActionTests.java b/src/test/java/org/opensearch/ad/transport/StatsAnomalyDetectorActionTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorActionTests.java rename to src/test/java/org/opensearch/ad/transport/StatsAnomalyDetectorActionTests.java index 3878ace6f..45cf725c7 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/StatsAnomalyDetectorActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.util.Collections; @@ -36,6 +36,7 @@ import org.junit.Before; import org.junit.Test; import org.opensearch.action.FailedNodeException; +import org.opensearch.ad.stats.ADStatsResponse; import org.opensearch.cluster.ClusterName; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; @@ -45,8 +46,6 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.stats.ADStatsResponse; - public class StatsAnomalyDetectorActionTests extends OpenSearchTestCase { @Override diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorTransportActionTests.java b/src/test/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportActionTests.java similarity index 93% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorTransportActionTests.java rename to src/test/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportActionTests.java index e10c922d2..4f6fdcf85 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/StatsAnomalyDetectorTransportActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/StatsAnomalyDetectorTransportActionTests.java @@ -24,19 +24,19 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.io.IOException; import java.time.Instant; import java.util.Map; import org.junit.Before; +import org.opensearch.ad.ADIntegTestCase; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.model.AnomalyDetectorType; +import org.opensearch.ad.stats.InternalStatNames; +import org.opensearch.ad.stats.StatNames; -import com.amazon.opendistroforelasticsearch.ad.ADIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorType; -import com.amazon.opendistroforelasticsearch.ad.stats.InternalStatNames; -import com.amazon.opendistroforelasticsearch.ad.stats.StatNames; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorActionTests.java b/src/test/java/org/opensearch/ad/transport/StopDetectorActionTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorActionTests.java rename to src/test/java/org/opensearch/ad/transport/StopDetectorActionTests.java index d1e741170..c1fd80637 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/StopDetectorActionTests.java +++ b/src/test/java/org/opensearch/ad/transport/StopDetectorActionTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import org.junit.Assert; import org.junit.Before; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultIT.java b/src/test/java/org/opensearch/ad/transport/ThresholdResultIT.java similarity index 94% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultIT.java rename to src/test/java/org/opensearch/ad/transport/ThresholdResultIT.java index 40e25668e..7b5bc2b30 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultIT.java +++ b/src/test/java/org/opensearch/ad/transport/ThresholdResultIT.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import java.util.Collection; import java.util.Collections; @@ -32,11 +32,10 @@ import org.opensearch.action.ActionFuture; import org.opensearch.action.ActionRequestValidationException; +import org.opensearch.ad.AnomalyDetectorPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchIntegTestCase; -import com.amazon.opendistroforelasticsearch.ad.AnomalyDetectorPlugin; - @OpenSearchIntegTestCase.ClusterScope(transportClientRatio = 0.9) public class ThresholdResultIT extends OpenSearchIntegTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultTests.java b/src/test/java/org/opensearch/ad/transport/ThresholdResultTests.java similarity index 93% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultTests.java rename to src/test/java/org/opensearch/ad/transport/ThresholdResultTests.java index 20916d19a..99477ebe6 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/ThresholdResultTests.java +++ b/src/test/java/org/opensearch/ad/transport/ThresholdResultTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport; +package org.opensearch.ad.transport; import static org.hamcrest.Matchers.equalTo; import static org.mockito.ArgumentMatchers.any; @@ -42,6 +42,11 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.PlainActionFuture; +import org.opensearch.ad.common.exception.JsonPathNotFoundException; +import org.opensearch.ad.constant.CommonErrorMessages; +import org.opensearch.ad.constant.CommonMessageAttributes; +import org.opensearch.ad.ml.ModelManager; +import org.opensearch.ad.ml.ThresholdingResult; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; @@ -53,13 +58,7 @@ import org.opensearch.transport.Transport; import org.opensearch.transport.TransportService; -import test.com.amazon.opendistroforelasticsearch.ad.util.JsonDeserializer; - -import com.amazon.opendistroforelasticsearch.ad.common.exception.JsonPathNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonErrorMessages; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonMessageAttributes; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager; -import com.amazon.opendistroforelasticsearch.ad.ml.ThresholdingResult; +import test.org.opensearch.ad.util.JsonDeserializer; public class ThresholdResultTests extends OpenSearchTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/ADSearchHandlerTests.java b/src/test/java/org/opensearch/ad/transport/handler/ADSearchHandlerTests.java similarity index 92% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/ADSearchHandlerTests.java rename to src/test/java/org/opensearch/ad/transport/handler/ADSearchHandlerTests.java index 6f2d90e5e..4c3395f21 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/ADSearchHandlerTests.java +++ b/src/test/java/org/opensearch/ad/transport/handler/ADSearchHandlerTests.java @@ -24,21 +24,22 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport.handler; +package org.opensearch.ad.transport.handler; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.matchAllRequest; -import static com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ad.TestHelpers.matchAllRequest; +import static org.opensearch.ad.settings.AnomalyDetectorSettings.FILTER_BY_BACKEND_ROLES; import org.junit.Before; import org.opensearch.action.ActionListener; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; +import org.opensearch.ad.ADUnitTestCase; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; @@ -46,7 +47,6 @@ import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.ADUnitTestCase; import com.amazon.opendistroforelasticsearch.commons.ConfigConstants; public class ADSearchHandlerTests extends ADUnitTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/AnomalyResultBulkIndexHandlerTests.java b/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandlerTests.java similarity index 89% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/AnomalyResultBulkIndexHandlerTests.java rename to src/test/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandlerTests.java index de90cbdc0..a63b18fad 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/AnomalyResultBulkIndexHandlerTests.java +++ b/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultBulkIndexHandlerTests.java @@ -24,9 +24,8 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport.handler; +package org.opensearch.ad.transport.handler; -import static com.amazon.opendistroforelasticsearch.ad.constant.CommonName.ANOMALY_RESULT_INDEX_ALIAS; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; @@ -35,6 +34,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.opensearch.ad.constant.CommonName.ANOMALY_RESULT_INDEX_ALIAS; import java.io.IOException; import java.time.Clock; @@ -43,19 +43,19 @@ import org.opensearch.action.admin.indices.create.CreateIndexResponse; import org.opensearch.action.bulk.BulkRequestBuilder; import org.opensearch.action.bulk.BulkResponse; +import org.opensearch.ad.ADUnitTestCase; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.IndexUtils; +import org.opensearch.ad.util.Throttler; +import org.opensearch.ad.util.ThrowingConsumerWrapper; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.ADUnitTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; -import com.amazon.opendistroforelasticsearch.ad.util.Throttler; -import com.amazon.opendistroforelasticsearch.ad.util.ThrowingConsumerWrapper; import com.google.common.collect.ImmutableList; public class AnomalyResultBulkIndexHandlerTests extends ADUnitTestCase { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/AnomalyResultHandlerTests.java b/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultHandlerTests.java similarity index 93% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/AnomalyResultHandlerTests.java rename to src/test/java/org/opensearch/ad/transport/handler/AnomalyResultHandlerTests.java index eaec4f1d9..d3da2d95f 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/AnomalyResultHandlerTests.java +++ b/src/test/java/org/opensearch/ad/transport/handler/AnomalyResultHandlerTests.java @@ -24,9 +24,8 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport.handler; +package org.opensearch.ad.transport.handler; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.createIndexBlockedState; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -34,6 +33,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.opensearch.ad.TestHelpers.createIndexBlockedState; import java.io.IOException; import java.time.Clock; @@ -55,6 +55,18 @@ import org.opensearch.action.admin.indices.create.CreateIndexResponse; import org.opensearch.action.index.IndexRequest; import org.opensearch.action.index.IndexResponse; +import org.opensearch.ad.AbstractADTest; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.transport.AnomalyResultTests; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.IndexUtils; +import org.opensearch.ad.util.Throttler; +import org.opensearch.ad.util.ThrowingConsumerWrapper; import org.opensearch.client.Client; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexMetadata; @@ -65,19 +77,6 @@ import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.AbstractADTest; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.transport.AnomalyResultTests; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; -import com.amazon.opendistroforelasticsearch.ad.util.Throttler; -import com.amazon.opendistroforelasticsearch.ad.util.ThrowingConsumerWrapper; - public class AnomalyResultHandlerTests extends AbstractADTest { private static Settings settings; @Mock diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/DetectorStateHandlerTests.java b/src/test/java/org/opensearch/ad/transport/handler/DetectorStateHandlerTests.java similarity index 89% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/DetectorStateHandlerTests.java rename to src/test/java/org/opensearch/ad/transport/handler/DetectorStateHandlerTests.java index 481935289..d6eef6994 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/transport/handler/DetectorStateHandlerTests.java +++ b/src/test/java/org/opensearch/ad/transport/handler/DetectorStateHandlerTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.transport.handler; +package org.opensearch.ad.transport.handler; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -40,6 +40,16 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.get.GetResponse; +import org.opensearch.ad.NodeStateManager; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.indices.AnomalyDetectionIndices; +import org.opensearch.ad.model.DetectorInternalState; +import org.opensearch.ad.transport.handler.DetectionStateHandler.ErrorStrategy; +import org.opensearch.ad.util.ClientUtil; +import org.opensearch.ad.util.IndexUtils; +import org.opensearch.ad.util.Throttler; +import org.opensearch.ad.util.ThrowingConsumerWrapper; import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; @@ -47,17 +57,6 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.NodeStateManager; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.indices.AnomalyDetectionIndices; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorInternalState; -import com.amazon.opendistroforelasticsearch.ad.transport.handler.DetectionStateHandler.ErrorStrategy; -import com.amazon.opendistroforelasticsearch.ad.util.ClientUtil; -import com.amazon.opendistroforelasticsearch.ad.util.IndexUtils; -import com.amazon.opendistroforelasticsearch.ad.util.Throttler; -import com.amazon.opendistroforelasticsearch.ad.util.ThrowingConsumerWrapper; - public class DetectorStateHandlerTests extends OpenSearchTestCase { private DetectionStateHandler detectorStateHandler; private String detectorId = "123"; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/util/ArrayEqMatcher.java b/src/test/java/org/opensearch/ad/util/ArrayEqMatcher.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/util/ArrayEqMatcher.java rename to src/test/java/org/opensearch/ad/util/ArrayEqMatcher.java index ab4cac871..a4a72bc48 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/util/ArrayEqMatcher.java +++ b/src/test/java/org/opensearch/ad/util/ArrayEqMatcher.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; import java.util.Arrays; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/util/ExceptionUtilsTests.java b/src/test/java/org/opensearch/ad/util/ExceptionUtilsTests.java similarity index 93% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/util/ExceptionUtilsTests.java rename to src/test/java/org/opensearch/ad/util/ExceptionUtilsTests.java index ba906e365..0d7bc036e 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/util/ExceptionUtilsTests.java +++ b/src/test/java/org/opensearch/ad/util/ExceptionUtilsTests.java @@ -24,17 +24,16 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; import org.opensearch.OpenSearchException; import org.opensearch.action.index.IndexResponse; import org.opensearch.action.support.replication.ReplicationResponse; +import org.opensearch.ad.common.exception.AnomalyDetectionException; import org.opensearch.index.shard.ShardId; import org.opensearch.rest.RestStatus; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; - public class ExceptionUtilsTests extends OpenSearchTestCase { public void testGetShardsFailure() { @@ -92,7 +91,7 @@ public void testGetErrorMessage() { assertTrue( ExceptionUtil .getErrorMessage(new RuntimeException("test")) - .contains("at com.amazon.opendistroforelasticsearch.ad.util.ExceptionUtilsTests.testGetErrorMessage") + .contains("at org.opensearch.ad.util.ExceptionUtilsTests.testGetErrorMessage") ); } } diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/util/IndexUtilsTests.java b/src/test/java/org/opensearch/ad/util/IndexUtilsTests.java similarity index 97% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/util/IndexUtilsTests.java rename to src/test/java/org/opensearch/ad/util/IndexUtilsTests.java index aa0a7ccaa..085a8f38d 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/util/IndexUtilsTests.java +++ b/src/test/java/org/opensearch/ad/util/IndexUtilsTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; import static org.mockito.Mockito.mock; @@ -33,14 +33,13 @@ import org.junit.Before; import org.junit.Test; import org.opensearch.action.support.master.AcknowledgedResponse; +import org.opensearch.ad.TestHelpers; import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.common.settings.Settings; import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.threadpool.ThreadPool; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; - public class IndexUtilsTests extends OpenSearchIntegTestCase { private ClientUtil clientUtil; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/util/MultiResponsesDelegateActionListenerTests.java b/src/test/java/org/opensearch/ad/util/MultiResponsesDelegateActionListenerTests.java similarity index 90% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/util/MultiResponsesDelegateActionListenerTests.java rename to src/test/java/org/opensearch/ad/util/MultiResponsesDelegateActionListenerTests.java index 5eb32a91d..204cb5450 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/util/MultiResponsesDelegateActionListenerTests.java +++ b/src/test/java/org/opensearch/ad/util/MultiResponsesDelegateActionListenerTests.java @@ -24,23 +24,22 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomMutlEntityAnomalyDetectResult; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import static org.opensearch.ad.TestHelpers.randomMutlEntityAnomalyDetectResult; import java.util.ArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.opensearch.action.ActionListener; +import org.opensearch.ad.model.AnomalyResult; +import org.opensearch.ad.model.DetectorProfile; +import org.opensearch.ad.model.EntityAnomalyResult; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyResult; -import com.amazon.opendistroforelasticsearch.ad.model.DetectorProfile; -import com.amazon.opendistroforelasticsearch.ad.model.EntityAnomalyResult; - public class MultiResponsesDelegateActionListenerTests extends OpenSearchTestCase { public void testEmptyResponse() throws InterruptedException { diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/util/ParseUtilsTests.java b/src/test/java/org/opensearch/ad/util/ParseUtilsTests.java similarity index 96% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/util/ParseUtilsTests.java rename to src/test/java/org/opensearch/ad/util/ParseUtilsTests.java index f83f2a967..4906c996c 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/util/ParseUtilsTests.java +++ b/src/test/java/org/opensearch/ad/util/ParseUtilsTests.java @@ -24,14 +24,19 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; -import static com.amazon.opendistroforelasticsearch.ad.util.ParseUtils.addUserBackendRolesFilter; +import static org.opensearch.ad.util.ParseUtils.addUserBackendRolesFilter; import java.io.IOException; import java.time.Instant; import java.time.temporal.ChronoUnit; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.common.exception.AnomalyDetectionException; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorType; +import org.opensearch.ad.model.Feature; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; @@ -40,11 +45,6 @@ import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.common.exception.AnomalyDetectionException; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorType; -import com.amazon.opendistroforelasticsearch.ad.model.Feature; import com.amazon.opendistroforelasticsearch.commons.authuser.User; import com.google.common.collect.ImmutableList; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/util/RestHandlerUtilsTests.java b/src/test/java/org/opensearch/ad/util/RestHandlerUtilsTests.java similarity index 92% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/util/RestHandlerUtilsTests.java rename to src/test/java/org/opensearch/ad/util/RestHandlerUtilsTests.java index 8edcce36c..eb9f1c0e4 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/util/RestHandlerUtilsTests.java +++ b/src/test/java/org/opensearch/ad/util/RestHandlerUtilsTests.java @@ -24,13 +24,15 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.builder; -import static com.amazon.opendistroforelasticsearch.ad.TestHelpers.randomFeature; +import static org.opensearch.ad.TestHelpers.builder; +import static org.opensearch.ad.TestHelpers.randomFeature; import java.io.IOException; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentBuilder; @@ -42,8 +44,6 @@ import org.opensearch.test.rest.FakeRestChannel; import org.opensearch.test.rest.FakeRestRequest; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/com/amazon/opendistroforelasticsearch/ad/util/ThrottlerTests.java b/src/test/java/org/opensearch/ad/util/ThrottlerTests.java similarity index 95% rename from src/test/java/com/amazon/opendistroforelasticsearch/ad/util/ThrottlerTests.java rename to src/test/java/org/opensearch/ad/util/ThrottlerTests.java index c6ef7d7ec..90a4093f9 100644 --- a/src/test/java/com/amazon/opendistroforelasticsearch/ad/util/ThrottlerTests.java +++ b/src/test/java/org/opensearch/ad/util/ThrottlerTests.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package com.amazon.opendistroforelasticsearch.ad.util; +package org.opensearch.ad.util; import static org.mockito.Mockito.mock; import static org.powermock.api.mockito.PowerMockito.when; @@ -34,10 +34,9 @@ import org.junit.Before; import org.junit.Test; import org.opensearch.action.search.SearchRequest; +import org.opensearch.ad.model.AnomalyDetector; import org.opensearch.test.OpenSearchTestCase; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; - public class ThrottlerTests extends OpenSearchTestCase { private Throttler throttler; diff --git a/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityProfileTests.java b/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityProfileTests.java index 0c7a61fec..21200af2a 100644 --- a/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityProfileTests.java +++ b/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityProfileTests.java @@ -26,14 +26,14 @@ package org.opensearch.search.aggregations.metrics; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; -import static com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import static org.opensearch.ad.model.AnomalyDetector.ANOMALY_DETECTORS_INDEX; +import static org.opensearch.ad.model.AnomalyDetectorJob.ANOMALY_DETECTOR_JOB_INDEX; import java.io.IOException; import java.time.temporal.ChronoUnit; @@ -51,20 +51,20 @@ import org.opensearch.action.get.GetResponse; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; +import org.opensearch.ad.AbstractProfileRunnerTests; +import org.opensearch.ad.TestHelpers; +import org.opensearch.ad.constant.CommonName; +import org.opensearch.ad.model.AnomalyDetector; +import org.opensearch.ad.model.AnomalyDetectorJob; +import org.opensearch.ad.model.IntervalTimeConfiguration; +import org.opensearch.ad.transport.ProfileAction; +import org.opensearch.ad.transport.ProfileNodeResponse; +import org.opensearch.ad.transport.ProfileResponse; import org.opensearch.cluster.ClusterName; import org.opensearch.common.util.BigArrays; import org.opensearch.search.aggregations.InternalAggregation; import org.opensearch.search.aggregations.InternalAggregations; -import com.amazon.opendistroforelasticsearch.ad.AbstractProfileRunnerTests; -import com.amazon.opendistroforelasticsearch.ad.TestHelpers; -import com.amazon.opendistroforelasticsearch.ad.constant.CommonName; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetector; -import com.amazon.opendistroforelasticsearch.ad.model.AnomalyDetectorJob; -import com.amazon.opendistroforelasticsearch.ad.model.IntervalTimeConfiguration; -import com.amazon.opendistroforelasticsearch.ad.transport.ProfileAction; -import com.amazon.opendistroforelasticsearch.ad.transport.ProfileNodeResponse; -import com.amazon.opendistroforelasticsearch.ad.transport.ProfileResponse; import com.carrotsearch.hppc.BitMixer; /** diff --git a/src/test/java/test/com/amazon/opendistroforelasticsearch/ad/util/ClusterCreation.java b/src/test/java/test/org/opensearch/ad/util/ClusterCreation.java similarity index 98% rename from src/test/java/test/com/amazon/opendistroforelasticsearch/ad/util/ClusterCreation.java rename to src/test/java/test/org/opensearch/ad/util/ClusterCreation.java index 1c0e7ecbd..46a6c8037 100644 --- a/src/test/java/test/com/amazon/opendistroforelasticsearch/ad/util/ClusterCreation.java +++ b/src/test/java/test/org/opensearch/ad/util/ClusterCreation.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package test.com.amazon.opendistroforelasticsearch.ad.util; +package test.org.opensearch.ad.util; import static org.mockito.Mockito.mock; import static org.opensearch.cluster.node.DiscoveryNodeRole.DATA_ROLE; diff --git a/src/test/java/test/com/amazon/opendistroforelasticsearch/ad/util/FakeNode.java b/src/test/java/test/org/opensearch/ad/util/FakeNode.java similarity index 99% rename from src/test/java/test/com/amazon/opendistroforelasticsearch/ad/util/FakeNode.java rename to src/test/java/test/org/opensearch/ad/util/FakeNode.java index 8175a1e30..d0d779ba4 100644 --- a/src/test/java/test/com/amazon/opendistroforelasticsearch/ad/util/FakeNode.java +++ b/src/test/java/test/org/opensearch/ad/util/FakeNode.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package test.com.amazon.opendistroforelasticsearch.ad.util; +package test.org.opensearch.ad.util; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; diff --git a/src/test/java/test/com/amazon/opendistroforelasticsearch/ad/util/JsonDeserializer.java b/src/test/java/test/org/opensearch/ad/util/JsonDeserializer.java similarity index 99% rename from src/test/java/test/com/amazon/opendistroforelasticsearch/ad/util/JsonDeserializer.java rename to src/test/java/test/org/opensearch/ad/util/JsonDeserializer.java index c9aebaee9..981f99616 100644 --- a/src/test/java/test/com/amazon/opendistroforelasticsearch/ad/util/JsonDeserializer.java +++ b/src/test/java/test/org/opensearch/ad/util/JsonDeserializer.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package test.com.amazon.opendistroforelasticsearch.ad.util; +package test.org.opensearch.ad.util; import java.io.IOException; import java.util.ArrayList; @@ -32,8 +32,8 @@ import java.util.function.Function; import org.apache.commons.lang.StringUtils; +import org.opensearch.ad.common.exception.JsonPathNotFoundException; -import com.amazon.opendistroforelasticsearch.ad.common.exception.JsonPathNotFoundException; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/src/test/java/test/com/amazon/opendistroforelasticsearch/ad/util/MLUtil.java b/src/test/java/test/org/opensearch/ad/util/MLUtil.java similarity index 92% rename from src/test/java/test/com/amazon/opendistroforelasticsearch/ad/util/MLUtil.java rename to src/test/java/test/org/opensearch/ad/util/MLUtil.java index 2afd4e4a3..aacd369ac 100644 --- a/src/test/java/test/com/amazon/opendistroforelasticsearch/ad/util/MLUtil.java +++ b/src/test/java/test/org/opensearch/ad/util/MLUtil.java @@ -24,7 +24,7 @@ * permissions and limitations under the License. */ -package test.com.amazon.opendistroforelasticsearch.ad.util; +package test.org.opensearch.ad.util; import java.time.Clock; import java.util.ArrayDeque; @@ -33,12 +33,13 @@ import java.util.stream.DoubleStream; import java.util.stream.IntStream; -import com.amazon.opendistroforelasticsearch.ad.ml.EntityModel; -import com.amazon.opendistroforelasticsearch.ad.ml.HybridThresholdingModel; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelManager.ModelType; -import com.amazon.opendistroforelasticsearch.ad.ml.ModelState; -import com.amazon.opendistroforelasticsearch.ad.ml.ThresholdingModel; -import com.amazon.opendistroforelasticsearch.ad.settings.AnomalyDetectorSettings; +import org.opensearch.ad.ml.EntityModel; +import org.opensearch.ad.ml.HybridThresholdingModel; +import org.opensearch.ad.ml.ModelManager.ModelType; +import org.opensearch.ad.ml.ModelState; +import org.opensearch.ad.ml.ThresholdingModel; +import org.opensearch.ad.settings.AnomalyDetectorSettings; + import com.amazon.randomcutforest.RandomCutForest; /** diff --git a/src/test/resources/com/amazon/opendistroforelasticsearch/ad/e2e/data/synthetic.data b/src/test/resources/org/opensearch/ad/e2e/data/synthetic.data similarity index 100% rename from src/test/resources/com/amazon/opendistroforelasticsearch/ad/e2e/data/synthetic.data rename to src/test/resources/org/opensearch/ad/e2e/data/synthetic.data diff --git a/src/test/resources/com/amazon/opendistroforelasticsearch/ad/e2e/data/synthetic.label b/src/test/resources/org/opensearch/ad/e2e/data/synthetic.label similarity index 100% rename from src/test/resources/com/amazon/opendistroforelasticsearch/ad/e2e/data/synthetic.label rename to src/test/resources/org/opensearch/ad/e2e/data/synthetic.label