Rename namespaces from odfe to opensearch

build.gradle

@@ -73,7 +73,7 @@ loggerUsageCheck.enabled = false
 opensearchplugin {
     name 'opensearch-job-scheduler'
     description 'OpenSearch Job Scheduler plugin'
-    classname 'com.amazon.opendistroforelasticsearch.jobscheduler.JobSchedulerPlugin'
+    classname 'org.opensearch.jobscheduler.JobSchedulerPlugin'
 }
 
 javaRestTest {
@@ -86,7 +86,7 @@ testClusters.javaRestTest {
 }
 
 allprojects {
-    group = 'com.amazon.opendistroforelasticsearch'
+    group = 'org.opensearch'
     version = "${opensearchVersion}.0-beta1"
 
     apply from: "$rootDir/build-tools/repositories.gradle"

sample-extension-plugin/build.gradle

@@ -32,7 +32,7 @@ apply plugin: 'opensearch.java-rest-test'
 opensearchplugin {
     name 'opensearch-job-scheduler-sample-extension'
     description 'Sample plugin that extends OpenSearch Job Scheduler plugin'
-    classname 'com.amazon.opendistroforelasticsearch.jobscheduler.sampleextension.SampleExtensionPlugin'
+    classname 'org.opensearch.jobscheduler.sampleextension.SampleExtensionPlugin'
     extendedPlugins = ['opensearch-job-scheduler']
 }
 

sample-extension-plugin/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/sampleextension/SampleExtensionPlugin.java → sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java

@@ -24,12 +24,12 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.sampleextension;
+package org.opensearch.jobscheduler.sampleextension;
 
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobSchedulerExtension;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParser;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobRunner;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.ScheduleParser;
+import org.opensearch.jobscheduler.spi.JobSchedulerExtension;
+import org.opensearch.jobscheduler.spi.ScheduledJobParser;
+import org.opensearch.jobscheduler.spi.ScheduledJobRunner;
+import org.opensearch.jobscheduler.spi.schedule.ScheduleParser;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.client.Client;

sample-extension-plugin/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java → sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java

@@ -24,9 +24,9 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.sampleextension;
+package org.opensearch.jobscheduler.sampleextension;
 
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.IntervalSchedule;
+import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.delete.DeleteRequest;
 import org.opensearch.action.delete.DeleteResponse;

sample-extension-plugin/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/sampleextension/SampleJobParameter.java → sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobParameter.java

@@ -24,10 +24,10 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.sampleextension;
+package org.opensearch.jobscheduler.sampleextension;
 
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParameter;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.Schedule;
+import org.opensearch.jobscheduler.spi.ScheduledJobParameter;
+import org.opensearch.jobscheduler.spi.schedule.Schedule;
 import org.opensearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;

sample-extension-plugin/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/sampleextension/SampleJobRunner.java → sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java

@@ -24,12 +24,12 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.sampleextension;
+package org.opensearch.jobscheduler.sampleextension;
 
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobExecutionContext;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParameter;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobRunner;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.utils.LockService;
+import org.opensearch.jobscheduler.spi.JobExecutionContext;
+import org.opensearch.jobscheduler.spi.ScheduledJobParameter;
+import org.opensearch.jobscheduler.spi.ScheduledJobRunner;
+import org.opensearch.jobscheduler.spi.utils.LockService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.ActionListener;

sample-extension-plugin/src/main/resources/META-INF/services/org.opensearch.jobscheduler.spi.JobSchedulerExtension

@@ -0,0 +1 @@
+org.opensearch.jobscheduler.sampleextension.SampleExtensionPlugin

sample-extension-plugin/src/test/java/com/amazon/opendistroforelasticsearch/jobscheduler/smapleextension/SampleExtensionPluginIT.java → sample-extension-plugin/src/test/java/org/opensearch/jobscheduler/smapleextension/SampleExtensionPluginIT.java

@@ -24,7 +24,7 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.smapleextension;
+package org.opensearch.jobscheduler.smapleextension;
 
 import org.opensearch.action.admin.cluster.health.ClusterHealthRequest;
 import org.opensearch.action.admin.cluster.health.ClusterHealthResponse;

spi/build.gradle

@@ -72,8 +72,8 @@ dependencies {
 }
 
 shadowJar {
-    relocate 'com.cronutils', 'com.amazon.opendistroforelasticsearch.jobscheduler.repackage.com.cronutils'
-    relocate 'org.slf4j', 'com.amazon.opendistroforelasticsearch.jobscheduler.repackage.org.slf4j' // dependency of cron-utils
+    relocate 'com.cronutils', 'org.opensearch.jobscheduler.repackage.com.cronutils'
+    relocate 'org.slf4j', 'org.opensearch.jobscheduler.repackage.org.slf4j' // dependency of cron-utils
     classifier = null
 }
 

spi/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/JobDocVersion.java → spi/src/main/java/org/opensearch/jobscheduler/spi/JobDocVersion.java

@@ -24,7 +24,7 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi;
+package org.opensearch.jobscheduler.spi;
 
 import java.util.Locale;
 

spi/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/JobExecutionContext.java → spi/src/main/java/org/opensearch/jobscheduler/spi/JobExecutionContext.java

@@ -24,9 +24,9 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi;
+package org.opensearch.jobscheduler.spi;
 
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.utils.LockService;
+import org.opensearch.jobscheduler.spi.utils.LockService;
 
 import java.time.Instant;
 

spi/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/JobSchedulerExtension.java → spi/src/main/java/org/opensearch/jobscheduler/spi/JobSchedulerExtension.java

@@ -24,7 +24,7 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi;
+package org.opensearch.jobscheduler.spi;
 
 /**
  * SPI of job scheduler.

spi/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/LockModel.java → spi/src/main/java/org/opensearch/jobscheduler/spi/LockModel.java

@@ -24,7 +24,7 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi;
+package org.opensearch.jobscheduler.spi;
 
 import org.opensearch.common.Strings;
 import org.opensearch.common.xcontent.ToXContentObject;

spi/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/ScheduledJobParameter.java → spi/src/main/java/org/opensearch/jobscheduler/spi/ScheduledJobParameter.java

@@ -24,9 +24,9 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi;
+package org.opensearch.jobscheduler.spi;
 
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.Schedule;
+import org.opensearch.jobscheduler.spi.schedule.Schedule;
 import org.opensearch.common.xcontent.ToXContentObject;
 
 import java.time.Instant;

spi/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/ScheduledJobParser.java → spi/src/main/java/org/opensearch/jobscheduler/spi/ScheduledJobParser.java

@@ -24,7 +24,7 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi;
+package org.opensearch.jobscheduler.spi;
 
 import org.opensearch.common.xcontent.XContentParser;
 

spi/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/ScheduledJobRunner.java → spi/src/main/java/org/opensearch/jobscheduler/spi/ScheduledJobRunner.java

@@ -24,7 +24,7 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi;
+package org.opensearch.jobscheduler.spi;
 
 public interface ScheduledJobRunner {
     void runJob(ScheduledJobParameter job, JobExecutionContext context);

spi/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/schedule/CronSchedule.java → spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/CronSchedule.java

@@ -24,7 +24,7 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule;
+package org.opensearch.jobscheduler.spi.schedule;
 
 import com.cronutils.model.CronType;
 import com.cronutils.model.definition.CronDefinitionBuilder;

spi/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/schedule/IntervalSchedule.java → spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/IntervalSchedule.java

@@ -24,7 +24,7 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule;
+package org.opensearch.jobscheduler.spi.schedule;
 
 import com.cronutils.utils.VisibleForTesting;
 import org.opensearch.common.Strings;

spi/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/schedule/Schedule.java → spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/Schedule.java

@@ -24,7 +24,7 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule;
+package org.opensearch.jobscheduler.spi.schedule;
 
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.io.stream.Writeable;

spi/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/schedule/ScheduleParser.java → spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/ScheduleParser.java

@@ -24,7 +24,7 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule;
+package org.opensearch.jobscheduler.spi.schedule;
 
 import org.opensearch.common.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentParserUtils;

spi/src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/utils/LockService.java → spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java

@@ -24,11 +24,11 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi.utils;
+package org.opensearch.jobscheduler.spi.utils;
 
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobExecutionContext;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.LockModel;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParameter;
+import org.opensearch.jobscheduler.spi.JobExecutionContext;
+import org.opensearch.jobscheduler.spi.LockModel;
+import org.opensearch.jobscheduler.spi.ScheduledJobParameter;
 import com.cronutils.utils.VisibleForTesting;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

spi/src/test/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/schedule/CronScheduleTests.java → spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/CronScheduleTests.java

@@ -24,7 +24,7 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule;
+package org.opensearch.jobscheduler.spi.schedule;
 
 import com.cronutils.model.time.ExecutionTime;
 import org.opensearch.common.collect.Tuple;

spi/src/test/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/schedule/IntervalScheduleTests.java → spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/IntervalScheduleTests.java

@@ -24,12 +24,11 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule;
+package org.opensearch.jobscheduler.spi.schedule;
 
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.test.OpenSearchTestCase;

spi/src/test/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/schedule/JobDocVersionTests.java → spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/JobDocVersionTests.java

@@ -24,9 +24,9 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule;
+package org.opensearch.jobscheduler.spi.schedule;
 
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobDocVersion;
+import org.opensearch.jobscheduler.spi.JobDocVersion;
 import org.opensearch.test.OpenSearchTestCase;
 import org.junit.Assert;
 

spi/src/test/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/schedule/ScheduleParserTests.java → spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/ScheduleParserTests.java

@@ -24,7 +24,7 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule;
+package org.opensearch.jobscheduler.spi.schedule;
 
 import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.xcontent.XContentParser;

spi/src/test/java/com/amazon/opendistroforelasticsearch/jobscheduler/spi/utils/LockServiceIT.java → spi/src/test/java/org/opensearch/jobscheduler/spi/utils/LockServiceIT.java

@@ -39,13 +39,13 @@
  * permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.spi.utils;
+package org.opensearch.jobscheduler.spi.utils;
 
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobDocVersion;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobExecutionContext;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.LockModel;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParameter;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.Schedule;
+import org.opensearch.jobscheduler.spi.JobDocVersion;
+import org.opensearch.jobscheduler.spi.JobExecutionContext;
+import org.opensearch.jobscheduler.spi.LockModel;
+import org.opensearch.jobscheduler.spi.ScheduledJobParameter;
+import org.opensearch.jobscheduler.spi.schedule.Schedule;
 import org.opensearch.action.ActionListener;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.xcontent.XContentBuilder;

src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/JobSchedulerPlugin.java → src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java

@@ -24,16 +24,16 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler;
-
-import com.amazon.opendistroforelasticsearch.jobscheduler.scheduler.JobScheduler;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobSchedulerExtension;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParser;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobRunner;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.Schedule;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.schedule.ScheduleParser;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.utils.LockService;
-import com.amazon.opendistroforelasticsearch.jobscheduler.sweeper.JobSweeper;
+package org.opensearch.jobscheduler;
+
+import org.opensearch.jobscheduler.scheduler.JobScheduler;
+import org.opensearch.jobscheduler.spi.JobSchedulerExtension;
+import org.opensearch.jobscheduler.spi.ScheduledJobParser;
+import org.opensearch.jobscheduler.spi.ScheduledJobRunner;
+import org.opensearch.jobscheduler.spi.schedule.Schedule;
+import org.opensearch.jobscheduler.spi.schedule.ScheduleParser;
+import org.opensearch.jobscheduler.spi.utils.LockService;
+import org.opensearch.jobscheduler.sweeper.JobSweeper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.client.Client;

src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/JobSchedulerSettings.java → src/main/java/org/opensearch/jobscheduler/JobSchedulerSettings.java

@@ -24,7 +24,7 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler;
+package org.opensearch.jobscheduler;
 
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.unit.TimeValue;

src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/LegacyOpenDistroJobSchedulerSettings.java → src/main/java/org/opensearch/jobscheduler/LegacyOpenDistroJobSchedulerSettings.java

@@ -24,7 +24,7 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler;
+package org.opensearch.jobscheduler;
 
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.unit.TimeValue;

src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/ScheduledJobProvider.java → src/main/java/org/opensearch/jobscheduler/ScheduledJobProvider.java

@@ -24,10 +24,10 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler;
+package org.opensearch.jobscheduler;
 
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParser;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobRunner;
+import org.opensearch.jobscheduler.spi.ScheduledJobParser;
+import org.opensearch.jobscheduler.spi.ScheduledJobRunner;
 
 public class ScheduledJobProvider {
     private String jobType;

src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/scheduler/JobScheduler.java → src/main/java/org/opensearch/jobscheduler/scheduler/JobScheduler.java

@@ -24,15 +24,15 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.scheduler;
-
-import com.amazon.opendistroforelasticsearch.jobscheduler.JobSchedulerPlugin;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobExecutionContext;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParameter;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobRunner;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.JobDocVersion;
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.utils.LockService;
-import com.amazon.opendistroforelasticsearch.jobscheduler.utils.VisibleForTesting;
+package org.opensearch.jobscheduler.scheduler;
+
+import org.opensearch.jobscheduler.JobSchedulerPlugin;
+import org.opensearch.jobscheduler.spi.JobExecutionContext;
+import org.opensearch.jobscheduler.spi.ScheduledJobParameter;
+import org.opensearch.jobscheduler.spi.ScheduledJobRunner;
+import org.opensearch.jobscheduler.spi.JobDocVersion;
+import org.opensearch.jobscheduler.spi.utils.LockService;
+import org.opensearch.jobscheduler.utils.VisibleForTesting;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.common.Randomness;

src/main/java/com/amazon/opendistroforelasticsearch/jobscheduler/scheduler/JobSchedulingInfo.java → src/main/java/org/opensearch/jobscheduler/scheduler/JobSchedulingInfo.java

@@ -24,9 +24,9 @@
  *   permissions and limitations under the License.
  */
 
-package com.amazon.opendistroforelasticsearch.jobscheduler.scheduler;
+package org.opensearch.jobscheduler.scheduler;
 
-import com.amazon.opendistroforelasticsearch.jobscheduler.spi.ScheduledJobParameter;
+import org.opensearch.jobscheduler.spi.ScheduledJobParameter;
 import org.opensearch.threadpool.Scheduler;
 
 import java.time.Instant;