Skip to content

Commit

Permalink
Rename namespaces from odfe to opensearch (#24)
Browse files Browse the repository at this point in the history
* Rename packages in 'src' directory

Signed-off-by: Tianli Feng <ftianli@amazon.com>

* Rename packages in 'spi' directory

Signed-off-by: Tianli Feng <ftianli@amazon.com>

* Rename packages in 'sample-extension-plugin' directory

Signed-off-by: Tianli Feng <ftianli@amazon.com>

* Rename package paths in build.gradle scripts

Signed-off-by: Tianli Feng <ftianli@amazon.com>

* Restore file under META-INF.services of the sample extension plugin directory

Signed-off-by: Tianli Feng <ftianli@amazon.com>

* Rename file under META-INF.services of the sample extension plugin using 'git mv'

Signed-off-by: Tianli Feng <ftianli@amazon.com>

* Rename package path in the file under META-INF.services

Signed-off-by: Tianli Feng <ftianli@amazon.com>
  • Loading branch information
Tianli Feng committed May 19, 2021
1 parent 607ca5f commit 45c12ad
Show file tree
Hide file tree
Showing 40 changed files with 106 additions and 107 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion sample-extension-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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']
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.opensearch.jobscheduler.sampleextension.SampleExtensionPlugin
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions spi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 45c12ad

Please sign in to comment.