Merge pull request #43 from spbjss/main

Rename namespaces from opendistro to opensearch.
opensearch-project · May 15, 2021 · cfebf07 · cfebf07
2 parents be8c248 + df40fe5
commit cfebf07
Show file tree

Hide file tree

Showing 400 changed files with 2,105 additions and 2,270 deletions.
diff --git 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<String> 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/...asticsearch/ad/AbstractProfileRunner.java → .../opensearch/ad/AbstractProfileRunner.java b/...asticsearch/ad/AbstractProfileRunner.java → .../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/...icsearch/ad/AnomalyDetectorJobRunner.java → ...ensearch/ad/AnomalyDetectorJobRunner.java b/...icsearch/ad/AnomalyDetectorJobRunner.java → ...ensearch/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;