From 8750e59bc4dc933491923183c897a18a946ce13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=8B=87?= Date: Sat, 13 May 2023 14:01:04 +0800 Subject: [PATCH] cs_2.7.0.0 --- .gitignore | 1 + README.md | 6 +- build-tools/repositories.gradle | 4 + build.gradle | 43 +++++---- gradle/wrapper/gradle-wrapper.properties | 3 +- ...rch.job-scheduler.release-notes-2.4.0.0.md | 2 +- ...rch.job-scheduler.release-notes-2.7.0.0.md | 2 +- sample-extension-plugin/build.gradle | 23 ++--- .../SampleExtensionPlugin.java | 54 +++++------ .../SampleExtensionRestHandler.java | 30 +++---- .../sampleextension/SampleJobParameter.java | 8 +- .../sampleextension/SampleJobRunner.java | 30 +++---- ...ch.jobscheduler.spi.JobSchedulerExtension} | 2 +- .../SampleExtensionIntegTestCase.java | 26 +++--- .../SampleExtensionPluginIT.java | 20 ++--- .../sampleextension/SampleJobRunnerIT.java | 6 +- .../JobSchedulerBackwardsCompatibilityIT.java | 6 +- scripts/build.sh | 4 +- spi/build.gradle | 24 ++--- .../jobscheduler/spi/JobDocVersion.java | 2 +- .../jobscheduler/spi/JobExecutionContext.java | 4 +- .../spi/JobSchedulerExtension.java | 2 +- .../jobscheduler/spi/LockModel.java | 18 ++-- .../spi/ScheduledJobParameter.java | 6 +- .../jobscheduler/spi/ScheduledJobParser.java | 4 +- .../jobscheduler/spi/ScheduledJobRunner.java | 2 +- .../spi/schedule/CronSchedule.java | 14 +-- .../spi/schedule/IntervalSchedule.java | 16 ++-- .../jobscheduler/spi/schedule/Schedule.java | 8 +- .../spi/schedule/ScheduleParser.java | 6 +- .../jobscheduler/spi/utils/LockService.java | 48 +++++----- .../utils/opensearch_job_scheduler_lock.json | 0 .../spi/schedule/CronScheduleTests.java | 14 +-- .../spi/schedule/IntervalScheduleTests.java | 16 ++-- .../spi/schedule/JobDocVersionTests.java | 6 +- .../spi/schedule/ScheduleParserTests.java | 10 +-- .../jobscheduler/spi/utils/LockServiceIT.java | 20 ++--- .../jobscheduler/JobSchedulerPlugin.java | 60 ++++++------- .../jobscheduler/JobSchedulerSettings.java | 6 +- .../LegacyOpenDistroJobSchedulerSettings.java | 6 +- .../jobscheduler/ScheduledJobProvider.java | 6 +- .../jobscheduler/scheduler/JobScheduler.java | 26 +++--- .../scheduler/JobSchedulingInfo.java | 6 +- .../scheduler/ScheduledJobInfo.java | 2 +- .../jobscheduler/sweeper/JobSweeper.java | 90 +++++++++---------- .../jobscheduler/utils/VisibleForTesting.java | 2 +- .../jobscheduler/JobSchedulerPluginIT.java | 20 ++--- .../JobSchedulerPluginRestIT.java | 14 +-- .../JobSchedulerSettingsTests.java | 10 +-- .../scheduler/JobSchedulerTests.java | 20 ++--- .../jobscheduler/sweeper/JobSweeperTests.java | 82 ++++++++--------- 51 files changed, 433 insertions(+), 407 deletions(-) rename sample-extension-plugin/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java (75%) rename sample-extension-plugin/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java (86%) rename sample-extension-plugin/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/sampleextension/SampleJobParameter.java (94%) rename sample-extension-plugin/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/sampleextension/SampleJobRunner.java (85%) rename sample-extension-plugin/src/main/resources/META-INF/services/{org.opensearch.jobscheduler.spi.JobSchedulerExtension => com.colasoft.opensearch.jobscheduler.spi.JobSchedulerExtension} (51%) rename sample-extension-plugin/src/test/java/{org => com/colasoft}/opensearch/jobscheduler/sampleextension/SampleExtensionIntegTestCase.java (94%) rename sample-extension-plugin/src/test/java/{org => com/colasoft}/opensearch/jobscheduler/sampleextension/SampleExtensionPluginIT.java (70%) rename sample-extension-plugin/src/test/java/{org => com/colasoft}/opensearch/jobscheduler/sampleextension/SampleJobRunnerIT.java (96%) rename sample-extension-plugin/src/test/java/{org => com/colasoft}/opensearch/jobscheduler/sampleextension/bwc/JobSchedulerBackwardsCompatibilityIT.java (97%) rename spi/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/spi/JobDocVersion.java (97%) rename spi/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/spi/JobExecutionContext.java (91%) rename spi/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/spi/JobSchedulerExtension.java (92%) rename spi/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/spi/LockModel.java (94%) rename spi/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/spi/ScheduledJobParameter.java (90%) rename spi/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/spi/ScheduledJobParser.java (79%) rename spi/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/spi/ScheduledJobRunner.java (87%) rename spi/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/spi/schedule/CronSchedule.java (95%) rename spi/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/spi/schedule/IntervalSchedule.java (94%) rename spi/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/spi/schedule/Schedule.java (86%) rename spi/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/spi/schedule/ScheduleParser.java (95%) rename spi/src/main/java/{org => com/colasoft}/opensearch/jobscheduler/spi/utils/LockService.java (91%) rename spi/src/main/resources/{org => com/colasoft}/opensearch/jobscheduler/spi/utils/opensearch_job_scheduler_lock.json (100%) rename spi/src/test/java/{org => com/colasoft}/opensearch/jobscheduler/spi/schedule/CronScheduleTests.java (96%) rename spi/src/test/java/{org => com/colasoft}/opensearch/jobscheduler/spi/schedule/IntervalScheduleTests.java (96%) rename spi/src/test/java/{org => com/colasoft}/opensearch/jobscheduler/spi/schedule/JobDocVersionTests.java (84%) rename spi/src/test/java/{org => com/colasoft}/opensearch/jobscheduler/spi/schedule/ScheduleParserTests.java (91%) rename spi/src/test/java/{org => com/colasoft}/opensearch/jobscheduler/spi/utils/LockServiceIT.java (97%) rename src/main/java/{org => com/colasoft}/opensearch/jobscheduler/JobSchedulerPlugin.java (77%) rename src/main/java/{org => com/colasoft}/opensearch/jobscheduler/JobSchedulerSettings.java (92%) rename src/main/java/{org => com/colasoft}/opensearch/jobscheduler/LegacyOpenDistroJobSchedulerSettings.java (92%) rename src/main/java/{org => com/colasoft}/opensearch/jobscheduler/ScheduledJobProvider.java (84%) rename src/main/java/{org => com/colasoft}/opensearch/jobscheduler/scheduler/JobScheduler.java (90%) rename src/main/java/{org => com/colasoft}/opensearch/jobscheduler/scheduler/JobSchedulingInfo.java (92%) rename src/main/java/{org => com/colasoft}/opensearch/jobscheduler/scheduler/ScheduledJobInfo.java (96%) rename src/main/java/{org => com/colasoft}/opensearch/jobscheduler/sweeper/JobSweeper.java (87%) rename src/main/java/{org => com/colasoft}/opensearch/jobscheduler/utils/VisibleForTesting.java (84%) rename src/test/java/{org => com/colasoft}/opensearch/jobscheduler/JobSchedulerPluginIT.java (68%) rename src/test/java/{org => com/colasoft}/opensearch/jobscheduler/JobSchedulerPluginRestIT.java (73%) rename src/test/java/{org => com/colasoft}/opensearch/jobscheduler/JobSchedulerSettingsTests.java (94%) rename src/test/java/{org => com/colasoft}/opensearch/jobscheduler/scheduler/JobSchedulerTests.java (93%) rename src/test/java/{org => com/colasoft}/opensearch/jobscheduler/sweeper/JobSweeperTests.java (85%) diff --git a/.gitignore b/.gitignore index 7c8c0f1b..5167a3fa 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ build bin/ .classpath .vscode +gradle/wrapper/gradle-8.0.2-bin.zip diff --git a/README.md b/README.md index 883ac02e..3a1a3a81 100644 --- a/README.md +++ b/README.md @@ -31,11 +31,11 @@ Add the following to your plugin to integrate with JobScheduler * Add [this workaround](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/build.gradle#L36) to make sure that job-schedular plugin is correctly installed during integration tests. 2. Implement the following classes -* Implement these two interfaces [ScheduledJobParameter](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobParameter.java#L37) and [ScheduledJobRunner](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java#L43) -* Extend class [JobSchedulerExtension](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java#L12) +* Implement these two interfaces [ScheduledJobParameter](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleJobParameter.java#L37) and [ScheduledJobRunner](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleJobRunner.java#L43) +* Extend class [JobSchedulerExtension](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java#L12) 3. Add the resource file -* Create `org.opensearch.jobscheduler.spi.JobSchedulerExtension` [file](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/resources/META-INF/services/org.opensearch.jobscheduler.spi.JobSchedulerExtension#L1). +* Create `com.colasoft.opensearch.jobscheduler.spi.JobSchedulerExtension` [file](https://github.com/opensearch-project/job-scheduler/blob/main/sample-extension-plugin/src/main/resources/META-INF/services/com.colasoft.opensearch.jobscheduler.spi.JobSchedulerExtension#L1). ## Contributing diff --git a/build-tools/repositories.gradle b/build-tools/repositories.gradle index d6e7189e..6f26913e 100644 --- a/build-tools/repositories.gradle +++ b/build-tools/repositories.gradle @@ -4,5 +4,9 @@ */ repositories { + maven { + allowInsecureProtocol(true) + url 'http://192.168.0.9:8081/nexus/content/groups/public' + } mavenCentral() } \ No newline at end of file diff --git a/build.gradle b/build.gradle index d5263527..f1975716 100644 --- a/build.gradle +++ b/build.gradle @@ -3,23 +3,29 @@ * SPDX-License-Identifier: Apache-2.0 */ import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin -import org.opensearch.gradle.test.RestIntegTestTask +import com.colasoft.opensearch.gradle.test.RestIntegTestTask buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "2.7.0-SNAPSHOT") - isSnapshot = "true" == System.getProperty("build.snapshot", "true") + opensearch_version = System.getProperty("opensearch.version", "2.7.0") + isSnapshot = "true" == System.getProperty("build.snapshot", "false") buildVersionQualifier = System.getProperty("build.version_qualifier", "") } repositories { + maven { + allowInsecureProtocol(true) + url 'http://192.168.0.9:8081/nexus/content/groups/public' + } + maven { + url 'https://maven.aliyun.com/nexus/content/groups/public/' + } mavenLocal() mavenCentral() - maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } } dependencies { - classpath "org.opensearch.gradle:build-tools:${opensearch_version}" + classpath "com.colasoft.opensearch.gradle:build-tools:${opensearch_version}" } } @@ -59,7 +65,7 @@ tasks.matching {it.path in [":publishNebulaPublicationToSnapshotsRepository"]}.a opensearchplugin { name 'opensearch-job-scheduler' description 'OpenSearch Job Scheduler plugin' - classname 'org.opensearch.jobscheduler.JobSchedulerPlugin' + classname 'com.colasoft.opensearch.jobscheduler.JobSchedulerPlugin' } javaRestTest { @@ -72,7 +78,7 @@ testClusters.javaRestTest { } allprojects { - group = 'org.opensearch' + group = 'com.colasoft.opensearch' version = opensearch_version.tokenize('-')[0] + '.0' if (buildVersionQualifier) { version += "-${buildVersionQualifier}" @@ -107,7 +113,7 @@ allprojects { pom { name = "opensearch-job-scheduler" description = "OpenSearch Job Scheduler plugin" - groupId = "org.opensearch.plugin" + groupId = "com.colasoft.opensearch.plugin" } pom.withXml { XmlProvider xml -> Node node = xml.asNode() @@ -133,26 +139,33 @@ publishing { pom { name = "opensearch-job-scheduler" description = "OpenSearch Job Scheduler plugin" - groupId = "org.opensearch.plugin" + groupId = "com.colasoft.opensearch.plugin" } } } repositories { maven { - name = "Snapshots" // optional target repository name - url = "https://aws.oss.sonatype.org/content/repositories/snapshots" + setAllowInsecureProtocol(true) + name = 'release' + url = 'http://192.168.0.9:8081/nexus/content/repositories/sm_release_repositories' credentials { - username "$System.env.SONATYPE_USERNAME" - password "$System.env.SONATYPE_PASSWORD" + username 'sm_admin' + password 'p[-sdko12}(9K' } } } } repositories { + maven { + allowInsecureProtocol(true) + url 'http://192.168.0.9:8081/nexus/content/groups/public' + } + maven { + url 'https://maven.aliyun.com/nexus/content/groups/public/' + } mavenLocal() mavenCentral() - maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } } dependencies { @@ -260,7 +273,7 @@ task integTestRemote(type: RestIntegTestTask) { if (System.getProperty("tests.rest.cluster") != null) { filter { - includeTestsMatching "org.opensearch.jobscheduler.*RestIT" + includeTestsMatching "com.colasoft.opensearch.jobscheduler.*RestIT" } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83b..82ee86ea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +#distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/release-notes/opensearch.job-scheduler.release-notes-2.4.0.0.md b/release-notes/opensearch.job-scheduler.release-notes-2.4.0.0.md index d12c8374..7f6baa53 100644 --- a/release-notes/opensearch.job-scheduler.release-notes-2.4.0.0.md +++ b/release-notes/opensearch.job-scheduler.release-notes-2.4.0.0.md @@ -5,7 +5,7 @@ Compatible with OpenSearch 2.4.0 ### Maintenance * testing ci ([#264](https://github.com/opensearch-project/job-scheduler/pull/264)) ([#265](https://github.com/opensearch-project/job-scheduler/pull/265)) * Add slf4j which is the dep of cronutils. ([#256](https://github.com/opensearch-project/job-scheduler/pull/256)) ([#257](https://github.com/opensearch-project/job-scheduler/pull/257)) -* add group = org.opensearch.plugin. ([#251](https://github.com/opensearch-project/job-scheduler/pull/251)) ([#255](https://github.com/opensearch-project/job-scheduler/pull/255)) +* add group = com.colasoft.opensearch.plugin. ([#251](https://github.com/opensearch-project/job-scheduler/pull/251)) ([#255](https://github.com/opensearch-project/job-scheduler/pull/255)) * Updating CronUtils due to glassfish CVE. ([#245](https://github.com/opensearch-project/job-scheduler/pull/245)) ([#246](https://github.com/opensearch-project/job-scheduler/pull/246)) * Increment version to 2.4.0-SNAPSHOT. ([#241](https://github.com/opensearch-project/job-scheduler/pull/241)) diff --git a/release-notes/opensearch.job-scheduler.release-notes-2.7.0.0.md b/release-notes/opensearch.job-scheduler.release-notes-2.7.0.0.md index 73aca070..1bd7753e 100644 --- a/release-notes/opensearch.job-scheduler.release-notes-2.7.0.0.md +++ b/release-notes/opensearch.job-scheduler.release-notes-2.7.0.0.md @@ -3,7 +3,7 @@ Compatible with OpenSearch 2.7.0 ### Added -* Adding name and description to org.opensearch.opensearch-job-scheduler pom ([#338](https://github.com/opensearch-project/job-scheduler/pull/338)) +* Adding name and description to com.colasoft.opensearch.opensearch-job-scheduler pom ([#338](https://github.com/opensearch-project/job-scheduler/pull/338)) * Adding Decoupling snapshots ([#324](https://github.com/opensearch-project/job-scheduler/pull/324)) * Adding generatePomFileForPluginZipPublication as dependency of publishNebulaPublicationToSnapshotsRepository ([#360](https://github.com/opensearch-project/job-scheduler/pull/360)) * Adding groupId to pom section of build.gradle ([#363](https://github.com/opensearch-project/job-scheduler/pull/363)) diff --git a/sample-extension-plugin/build.gradle b/sample-extension-plugin/build.gradle index 992684d2..cd850ba1 100644 --- a/sample-extension-plugin/build.gradle +++ b/sample-extension-plugin/build.gradle @@ -7,8 +7,8 @@ apply plugin: 'opensearch.opensearchplugin' apply plugin: 'opensearch.testclusters' apply plugin: 'opensearch.java-rest-test' -import org.opensearch.gradle.test.RestIntegTestTask -import org.opensearch.gradle.testclusters.StandaloneRestIntegTestTask +import com.colasoft.opensearch.gradle.test.RestIntegTestTask +import com.colasoft.opensearch.gradle.testclusters.StandaloneRestIntegTestTask import java.util.concurrent.Callable @@ -16,7 +16,7 @@ import java.util.concurrent.Callable opensearchplugin { name 'opensearch-job-scheduler-sample-extension' description 'Sample plugin that extends OpenSearch Job Scheduler plugin' - classname 'org.opensearch.jobscheduler.sampleextension.SampleExtensionPlugin' + classname 'com.colasoft.opensearch.jobscheduler.sampleextension.SampleExtensionPlugin' extendedPlugins = ['opensearch-job-scheduler'] } @@ -27,9 +27,12 @@ ext { } repositories { + maven { + allowInsecureProtocol(true) + url 'http://192.168.0.9:8081/nexus/content/groups/public' + } mavenLocal() mavenCentral() - maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } } dependencies { @@ -96,7 +99,7 @@ integTest { } if (System.getProperty("tests.rest.bwcsuite") == null) { filter { - excludeTestsMatching "org.opensearch.jobscheduler.sampleextension.bwc.*IT" + excludeTestsMatching "com.colasoft.opensearch.jobscheduler.sampleextension.bwc.*IT" } } } @@ -187,7 +190,7 @@ task prepareBwcTests { dependsOn 'prepareBwcTests' useCluster testClusters."${baseName}$i" filter { - includeTestsMatching "org.opensearch.jobscheduler.sampleextension.bwc.*IT" + includeTestsMatching "com.colasoft.opensearch.jobscheduler.sampleextension.bwc.*IT" } systemProperty 'tests.rest.bwcsuite', 'old_cluster' systemProperty 'tests.rest.bwcsuite_round', 'old' @@ -207,7 +210,7 @@ task "${baseName}#mixedClusterTask"(type: StandaloneRestIntegTestTask) { testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins) } filter { - includeTestsMatching "org.opensearch.jobscheduler.sampleextension.bwc.*IT" + includeTestsMatching "com.colasoft.opensearch.jobscheduler.sampleextension.bwc.*IT" } systemProperty 'tests.rest.bwcsuite', 'mixed_cluster' systemProperty 'tests.rest.bwcsuite_round', 'first' @@ -226,7 +229,7 @@ task "${baseName}#twoThirdsUpgradedClusterTask"(type: StandaloneRestIntegTestTas testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins) } filter { - includeTestsMatching "org.opensearch.jobscheduler.sampleextension.bwc.*IT" + includeTestsMatching "com.colasoft.opensearch.jobscheduler.sampleextension.bwc.*IT" } systemProperty 'tests.rest.bwcsuite', 'mixed_cluster' systemProperty 'tests.rest.bwcsuite_round', 'second' @@ -245,7 +248,7 @@ task "${baseName}#rollingUpgradeClusterTask"(type: StandaloneRestIntegTestTask) testClusters."${baseName}0".upgradeNodeAndPluginToNextVersion(plugins) } filter { - includeTestsMatching "org.opensearch.jobscheduler.sampleextension.bwc.*IT" + includeTestsMatching "com.colasoft.opensearch.jobscheduler.sampleextension.bwc.*IT" } mustRunAfter "${baseName}#mixedClusterTask" systemProperty 'tests.rest.bwcsuite', 'mixed_cluster' @@ -264,7 +267,7 @@ task "${baseName}#fullRestartClusterTask"(type: StandaloneRestIntegTestTask) { testClusters."${baseName}1".upgradeAllNodesAndPluginsToNextVersion(plugins) } filter { - includeTestsMatching "org.opensearch.jobscheduler.sampleextension.bwc.*IT" + includeTestsMatching "com.colasoft.opensearch.jobscheduler.sampleextension.bwc.*IT" } systemProperty 'tests.rest.bwcsuite', 'upgraded_cluster' systemProperty 'tests.plugin_bwc_version', bwcJobSchedulerVersion diff --git a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java b/sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java similarity index 75% rename from sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java rename to sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java index b50c973c..4d4f772a 100644 --- a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java +++ b/sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java @@ -6,36 +6,36 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.sampleextension; +package com.colasoft.opensearch.jobscheduler.sampleextension; -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 com.colasoft.opensearch.jobscheduler.spi.JobSchedulerExtension; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParser; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobRunner; +import com.colasoft.opensearch.jobscheduler.spi.schedule.ScheduleParser; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.client.Client; -import org.opensearch.cluster.metadata.IndexNameExpressionResolver; -import org.opensearch.cluster.node.DiscoveryNodes; -import org.opensearch.cluster.service.ClusterService; -import org.opensearch.common.io.stream.NamedWriteableRegistry; -import org.opensearch.common.settings.ClusterSettings; -import org.opensearch.common.settings.IndexScopedSettings; -import org.opensearch.common.settings.Settings; -import org.opensearch.common.settings.SettingsFilter; -import org.opensearch.core.xcontent.NamedXContentRegistry; -import org.opensearch.core.xcontent.XContentParser; -import org.opensearch.common.xcontent.XContentParserUtils; -import org.opensearch.env.Environment; -import org.opensearch.env.NodeEnvironment; -import org.opensearch.plugins.ActionPlugin; -import org.opensearch.plugins.Plugin; -import org.opensearch.repositories.RepositoriesService; -import org.opensearch.rest.RestController; -import org.opensearch.rest.RestHandler; -import org.opensearch.script.ScriptService; -import org.opensearch.threadpool.ThreadPool; -import org.opensearch.watcher.ResourceWatcherService; +import com.colasoft.opensearch.client.Client; +import com.colasoft.opensearch.cluster.metadata.IndexNameExpressionResolver; +import com.colasoft.opensearch.cluster.node.DiscoveryNodes; +import com.colasoft.opensearch.cluster.service.ClusterService; +import com.colasoft.opensearch.common.io.stream.NamedWriteableRegistry; +import com.colasoft.opensearch.common.settings.ClusterSettings; +import com.colasoft.opensearch.common.settings.IndexScopedSettings; +import com.colasoft.opensearch.common.settings.Settings; +import com.colasoft.opensearch.common.settings.SettingsFilter; +import com.colasoft.opensearch.core.xcontent.NamedXContentRegistry; +import com.colasoft.opensearch.core.xcontent.XContentParser; +import com.colasoft.opensearch.common.xcontent.XContentParserUtils; +import com.colasoft.opensearch.env.Environment; +import com.colasoft.opensearch.env.NodeEnvironment; +import com.colasoft.opensearch.plugins.ActionPlugin; +import com.colasoft.opensearch.plugins.Plugin; +import com.colasoft.opensearch.repositories.RepositoriesService; +import com.colasoft.opensearch.rest.RestController; +import com.colasoft.opensearch.rest.RestHandler; +import com.colasoft.opensearch.script.ScriptService; +import com.colasoft.opensearch.threadpool.ThreadPool; +import com.colasoft.opensearch.watcher.ResourceWatcherService; import java.io.IOException; import java.time.Instant; diff --git a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java b/sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java similarity index 86% rename from sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java rename to sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java index 2a559ec3..60142653 100644 --- a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java +++ b/sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleExtensionRestHandler.java @@ -6,22 +6,22 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.sampleextension; +package com.colasoft.opensearch.jobscheduler.sampleextension; -import org.opensearch.action.support.WriteRequest; -import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule; -import org.opensearch.action.ActionListener; -import org.opensearch.action.delete.DeleteRequest; -import org.opensearch.action.delete.DeleteResponse; -import org.opensearch.action.index.IndexRequest; -import org.opensearch.action.index.IndexResponse; -import org.opensearch.client.node.NodeClient; -import org.opensearch.common.xcontent.json.JsonXContent; -import org.opensearch.rest.BaseRestHandler; -import org.opensearch.rest.BytesRestResponse; -import org.opensearch.rest.RestRequest; -import org.opensearch.rest.RestResponse; -import org.opensearch.rest.RestStatus; +import com.colasoft.opensearch.action.support.WriteRequest; +import com.colasoft.opensearch.jobscheduler.spi.schedule.IntervalSchedule; +import com.colasoft.opensearch.action.ActionListener; +import com.colasoft.opensearch.action.delete.DeleteRequest; +import com.colasoft.opensearch.action.delete.DeleteResponse; +import com.colasoft.opensearch.action.index.IndexRequest; +import com.colasoft.opensearch.action.index.IndexResponse; +import com.colasoft.opensearch.client.node.NodeClient; +import com.colasoft.opensearch.common.xcontent.json.JsonXContent; +import com.colasoft.opensearch.rest.BaseRestHandler; +import com.colasoft.opensearch.rest.BytesRestResponse; +import com.colasoft.opensearch.rest.RestRequest; +import com.colasoft.opensearch.rest.RestResponse; +import com.colasoft.opensearch.rest.RestStatus; import java.io.IOException; import java.time.Instant; diff --git a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobParameter.java b/sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleJobParameter.java similarity index 94% rename from sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobParameter.java rename to sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleJobParameter.java index 72e62174..f8b0cff1 100644 --- a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobParameter.java +++ b/sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleJobParameter.java @@ -6,11 +6,11 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.sampleextension; +package com.colasoft.opensearch.jobscheduler.sampleextension; -import org.opensearch.jobscheduler.spi.ScheduledJobParameter; -import org.opensearch.jobscheduler.spi.schedule.Schedule; -import org.opensearch.core.xcontent.XContentBuilder; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParameter; +import com.colasoft.opensearch.jobscheduler.spi.schedule.Schedule; +import com.colasoft.opensearch.core.xcontent.XContentBuilder; import java.io.IOException; import java.time.Instant; diff --git a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java b/sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleJobRunner.java similarity index 85% rename from sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java rename to sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleJobRunner.java index b459db04..b6e27f60 100644 --- a/sample-extension-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunner.java +++ b/sample-extension-plugin/src/main/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleJobRunner.java @@ -6,22 +6,22 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.sampleextension; - -import org.opensearch.action.index.IndexRequest; -import org.opensearch.client.Client; -import org.opensearch.common.xcontent.XContentType; -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; +package com.colasoft.opensearch.jobscheduler.sampleextension; + +import com.colasoft.opensearch.action.index.IndexRequest; +import com.colasoft.opensearch.client.Client; +import com.colasoft.opensearch.common.xcontent.XContentType; +import com.colasoft.opensearch.jobscheduler.spi.JobExecutionContext; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParameter; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobRunner; +import com.colasoft.opensearch.jobscheduler.spi.utils.LockService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.action.ActionListener; -import org.opensearch.cluster.routing.ShardRouting; -import org.opensearch.cluster.service.ClusterService; -import org.opensearch.plugins.Plugin; -import org.opensearch.threadpool.ThreadPool; +import com.colasoft.opensearch.action.ActionListener; +import com.colasoft.opensearch.cluster.routing.ShardRouting; +import com.colasoft.opensearch.cluster.service.ClusterService; +import com.colasoft.opensearch.plugins.Plugin; +import com.colasoft.opensearch.threadpool.ThreadPool; import java.util.List; import java.util.UUID; @@ -32,7 +32,7 @@ * The job runner should be a singleton class if it uses OpenSearch client or other objects passed * from OpenSearch. Because when registering the job runner to JobScheduler plugin, OpenSearch has * not invoke plugins' createComponents() method. That is saying the plugin is not completely initalized, - * and the OpenSearch {@link org.opensearch.client.Client}, {@link ClusterService} and other objects + * and the OpenSearch {@link com.colasoft.opensearch.client.Client}, {@link ClusterService} and other objects * are not available to plugin and this job runner. * * So we have to move this job runner intialization to {@link Plugin} createComponents() method, and using diff --git a/sample-extension-plugin/src/main/resources/META-INF/services/org.opensearch.jobscheduler.spi.JobSchedulerExtension b/sample-extension-plugin/src/main/resources/META-INF/services/com.colasoft.opensearch.jobscheduler.spi.JobSchedulerExtension similarity index 51% rename from sample-extension-plugin/src/main/resources/META-INF/services/org.opensearch.jobscheduler.spi.JobSchedulerExtension rename to sample-extension-plugin/src/main/resources/META-INF/services/com.colasoft.opensearch.jobscheduler.spi.JobSchedulerExtension index 04ab499c..ae855c16 100644 --- a/sample-extension-plugin/src/main/resources/META-INF/services/org.opensearch.jobscheduler.spi.JobSchedulerExtension +++ b/sample-extension-plugin/src/main/resources/META-INF/services/com.colasoft.opensearch.jobscheduler.spi.JobSchedulerExtension @@ -3,4 +3,4 @@ # SPDX-License-Identifier: Apache-2.0 # -org.opensearch.jobscheduler.sampleextension.SampleExtensionPlugin \ No newline at end of file +com.colasoft.opensearch.jobscheduler.sampleextension.SampleExtensionPlugin \ No newline at end of file diff --git a/sample-extension-plugin/src/test/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionIntegTestCase.java b/sample-extension-plugin/src/test/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleExtensionIntegTestCase.java similarity index 94% rename from sample-extension-plugin/src/test/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionIntegTestCase.java rename to sample-extension-plugin/src/test/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleExtensionIntegTestCase.java index 9c82bdc8..debc2244 100644 --- a/sample-extension-plugin/src/test/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionIntegTestCase.java +++ b/sample-extension-plugin/src/test/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleExtensionIntegTestCase.java @@ -6,25 +6,25 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.sampleextension; +package com.colasoft.opensearch.jobscheduler.sampleextension; import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.junit.Assert; -import org.opensearch.client.Request; -import org.opensearch.client.RequestOptions; -import org.opensearch.client.Response; -import org.opensearch.client.RestClient; -import org.opensearch.client.WarningsHandler; -import org.opensearch.common.settings.Settings; -import org.opensearch.common.xcontent.LoggingDeprecationHandler; -import org.opensearch.core.xcontent.NamedXContentRegistry; -import org.opensearch.common.xcontent.json.JsonXContent; -import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule; -import org.opensearch.rest.RestStatus; -import org.opensearch.test.rest.OpenSearchRestTestCase; +import com.colasoft.opensearch.client.Request; +import com.colasoft.opensearch.client.RequestOptions; +import com.colasoft.opensearch.client.Response; +import com.colasoft.opensearch.client.RestClient; +import com.colasoft.opensearch.client.WarningsHandler; +import com.colasoft.opensearch.common.settings.Settings; +import com.colasoft.opensearch.common.xcontent.LoggingDeprecationHandler; +import com.colasoft.opensearch.core.xcontent.NamedXContentRegistry; +import com.colasoft.opensearch.common.xcontent.json.JsonXContent; +import com.colasoft.opensearch.jobscheduler.spi.schedule.IntervalSchedule; +import com.colasoft.opensearch.rest.RestStatus; +import com.colasoft.opensearch.test.rest.OpenSearchRestTestCase; import java.io.IOException; import java.time.Instant; diff --git a/sample-extension-plugin/src/test/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPluginIT.java b/sample-extension-plugin/src/test/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleExtensionPluginIT.java similarity index 70% rename from sample-extension-plugin/src/test/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPluginIT.java rename to sample-extension-plugin/src/test/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleExtensionPluginIT.java index 4428ee93..e3181f48 100644 --- a/sample-extension-plugin/src/test/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPluginIT.java +++ b/sample-extension-plugin/src/test/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleExtensionPluginIT.java @@ -6,17 +6,17 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.sampleextension; +package com.colasoft.opensearch.jobscheduler.sampleextension; -import org.opensearch.action.admin.cluster.health.ClusterHealthRequest; -import org.opensearch.action.admin.cluster.health.ClusterHealthResponse; -import org.opensearch.action.admin.cluster.node.info.NodeInfo; -import org.opensearch.action.admin.cluster.node.info.NodesInfoRequest; -import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse; -import org.opensearch.action.admin.cluster.node.info.PluginsAndModules; -import org.opensearch.cluster.health.ClusterHealthStatus; -import org.opensearch.plugins.PluginInfo; -import org.opensearch.test.OpenSearchIntegTestCase; +import com.colasoft.opensearch.action.admin.cluster.health.ClusterHealthRequest; +import com.colasoft.opensearch.action.admin.cluster.health.ClusterHealthResponse; +import com.colasoft.opensearch.action.admin.cluster.node.info.NodeInfo; +import com.colasoft.opensearch.action.admin.cluster.node.info.NodesInfoRequest; +import com.colasoft.opensearch.action.admin.cluster.node.info.NodesInfoResponse; +import com.colasoft.opensearch.action.admin.cluster.node.info.PluginsAndModules; +import com.colasoft.opensearch.cluster.health.ClusterHealthStatus; +import com.colasoft.opensearch.plugins.PluginInfo; +import com.colasoft.opensearch.test.OpenSearchIntegTestCase; import org.junit.Assert; import java.util.List; diff --git a/sample-extension-plugin/src/test/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunnerIT.java b/sample-extension-plugin/src/test/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleJobRunnerIT.java similarity index 96% rename from sample-extension-plugin/src/test/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunnerIT.java rename to sample-extension-plugin/src/test/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleJobRunnerIT.java index 9f63e9d5..bfdc631f 100644 --- a/sample-extension-plugin/src/test/java/org/opensearch/jobscheduler/sampleextension/SampleJobRunnerIT.java +++ b/sample-extension-plugin/src/test/java/com/colasoft/opensearch/jobscheduler/sampleextension/SampleJobRunnerIT.java @@ -6,11 +6,11 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.sampleextension; +package com.colasoft.opensearch.jobscheduler.sampleextension; import org.junit.Assert; -import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule; -import org.opensearch.test.rest.OpenSearchRestTestCase; +import com.colasoft.opensearch.jobscheduler.spi.schedule.IntervalSchedule; +import com.colasoft.opensearch.test.rest.OpenSearchRestTestCase; import java.io.IOException; import java.time.Instant; diff --git a/sample-extension-plugin/src/test/java/org/opensearch/jobscheduler/sampleextension/bwc/JobSchedulerBackwardsCompatibilityIT.java b/sample-extension-plugin/src/test/java/com/colasoft/opensearch/jobscheduler/sampleextension/bwc/JobSchedulerBackwardsCompatibilityIT.java similarity index 97% rename from sample-extension-plugin/src/test/java/org/opensearch/jobscheduler/sampleextension/bwc/JobSchedulerBackwardsCompatibilityIT.java rename to sample-extension-plugin/src/test/java/com/colasoft/opensearch/jobscheduler/sampleextension/bwc/JobSchedulerBackwardsCompatibilityIT.java index f11b95e1..1000f1ec 100644 --- a/sample-extension-plugin/src/test/java/org/opensearch/jobscheduler/sampleextension/bwc/JobSchedulerBackwardsCompatibilityIT.java +++ b/sample-extension-plugin/src/test/java/com/colasoft/opensearch/jobscheduler/sampleextension/bwc/JobSchedulerBackwardsCompatibilityIT.java @@ -6,11 +6,11 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.sampleextension.bwc; +package com.colasoft.opensearch.jobscheduler.sampleextension.bwc; import org.junit.Assert; -import org.opensearch.jobscheduler.sampleextension.SampleExtensionIntegTestCase; -import org.opensearch.test.rest.OpenSearchRestTestCase; +import com.colasoft.opensearch.jobscheduler.sampleextension.SampleExtensionIntegTestCase; +import com.colasoft.opensearch.test.rest.OpenSearchRestTestCase; import java.time.Instant; import java.util.List; diff --git a/scripts/build.sh b/scripts/build.sh index 892e8d56..4b1a94c0 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -75,5 +75,5 @@ cp ./build/distributions/*.zip $OUTPUT/plugins ./gradlew publishToMavenLocal -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER ./gradlew publishAllPublicationsToStagingRepository -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER ./gradlew publishPluginZipPublicationToZipStagingRepository -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER -mkdir -p $OUTPUT/maven/org/opensearch -cp -r ./build/local-staging-repo/org/opensearch/. $OUTPUT/maven/org/opensearch \ No newline at end of file +mkdir -p $OUTPUT/maven/com/colasoft/opensearch +cp -r ./build/local-staging-repo/com/colasoft/opensearch/. $OUTPUT/maven/com/colasoft/opensearch \ No newline at end of file diff --git a/spi/build.gradle b/spi/build.gradle index 72c78e11..6f9f63fe 100644 --- a/spi/build.gradle +++ b/spi/build.gradle @@ -4,7 +4,7 @@ */ import com.github.jengelman.gradle.plugins.shadow.ShadowBasePlugin -import org.opensearch.gradle.test.RestIntegTestTask +import com.colasoft.opensearch.gradle.test.RestIntegTestTask plugins { id 'com.github.johnrengelman.shadow' @@ -18,9 +18,12 @@ apply plugin: 'opensearch.testclusters' apply plugin: 'opensearch.java-rest-test' repositories { + maven { + allowInsecureProtocol(true) + url 'http://192.168.0.9:8081/nexus/content/groups/public' + } mavenLocal() mavenCentral() - maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } } ext { @@ -45,14 +48,14 @@ check.dependsOn jacocoTestReport def slf4j_version_of_cronutils = "1.7.36" dependencies { - compileOnly "org.opensearch:opensearch:${opensearch_version}" + compileOnly "com.colasoft.opensearch:opensearch:${opensearch_version}" // slf4j is the runtime dependency of cron-utils // if cron-utils version gets bumped, pls check the slf4j version cron-utils depending on // and bump if needed implementation "com.cronutils:cron-utils:9.2.0" runtimeOnly "org.slf4j:slf4j-api:${slf4j_version_of_cronutils}" - testImplementation "org.opensearch.test:framework:${opensearch_version}" + testImplementation "com.colasoft.opensearch.test:framework:${opensearch_version}" testImplementation "org.apache.logging.log4j:log4j-core:${versions.log4j}" } @@ -64,8 +67,8 @@ configurations.all { } shadowJar { - relocate 'com.cronutils', 'org.opensearch.jobscheduler.repackage.com.cronutils' - relocate 'org.slf4j', 'org.opensearch.jobscheduler.repackage.org.slf4j' // dependency of cron-utils + relocate 'com.cronutils', 'com.colasoft.opensearch.jobscheduler.repackage.com.cronutils' + relocate 'org.slf4j', 'com.colasoft.opensearch.jobscheduler.repackage.org.slf4j' // dependency of cron-utils archiveClassifier = null } @@ -111,11 +114,12 @@ publishing { url = "${rootProject.buildDir}/local-staging-repo" } maven { - name = "Snapshots" // optional target repository name - url = "https://aws.oss.sonatype.org/content/repositories/snapshots" + setAllowInsecureProtocol(true) + name = 'release' + url = 'http://192.168.0.9:8081/nexus/content/repositories/sm_release_repositories' credentials { - username "$System.env.SONATYPE_USERNAME" - password "$System.env.SONATYPE_PASSWORD" + username 'sm_admin' + password 'p[-sdko12}(9K' } } } diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/JobDocVersion.java b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/JobDocVersion.java similarity index 97% rename from spi/src/main/java/org/opensearch/jobscheduler/spi/JobDocVersion.java rename to spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/JobDocVersion.java index 39fedfd0..8751efb4 100644 --- a/spi/src/main/java/org/opensearch/jobscheduler/spi/JobDocVersion.java +++ b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/JobDocVersion.java @@ -6,7 +6,7 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi; +package com.colasoft.opensearch.jobscheduler.spi; import java.util.Locale; diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/JobExecutionContext.java b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/JobExecutionContext.java similarity index 91% rename from spi/src/main/java/org/opensearch/jobscheduler/spi/JobExecutionContext.java rename to spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/JobExecutionContext.java index 42e5b5b6..61535eb0 100644 --- a/spi/src/main/java/org/opensearch/jobscheduler/spi/JobExecutionContext.java +++ b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/JobExecutionContext.java @@ -6,9 +6,9 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi; +package com.colasoft.opensearch.jobscheduler.spi; -import org.opensearch.jobscheduler.spi.utils.LockService; +import com.colasoft.opensearch.jobscheduler.spi.utils.LockService; import java.time.Instant; diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/JobSchedulerExtension.java b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/JobSchedulerExtension.java similarity index 92% rename from spi/src/main/java/org/opensearch/jobscheduler/spi/JobSchedulerExtension.java rename to spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/JobSchedulerExtension.java index abded740..57f17181 100644 --- a/spi/src/main/java/org/opensearch/jobscheduler/spi/JobSchedulerExtension.java +++ b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/JobSchedulerExtension.java @@ -6,7 +6,7 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi; +package com.colasoft.opensearch.jobscheduler.spi; /** * SPI of job scheduler. diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/LockModel.java b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/LockModel.java similarity index 94% rename from spi/src/main/java/org/opensearch/jobscheduler/spi/LockModel.java rename to spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/LockModel.java index f241400d..9eb4d598 100644 --- a/spi/src/main/java/org/opensearch/jobscheduler/spi/LockModel.java +++ b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/LockModel.java @@ -6,15 +6,15 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi; - -import org.opensearch.common.Strings; -import org.opensearch.core.xcontent.ToXContentObject; -import org.opensearch.core.xcontent.XContentBuilder; -import org.opensearch.core.xcontent.XContentParser; -import org.opensearch.common.xcontent.XContentParserUtils; -import org.opensearch.common.xcontent.XContentType; -import org.opensearch.index.seqno.SequenceNumbers; +package com.colasoft.opensearch.jobscheduler.spi; + +import com.colasoft.opensearch.common.Strings; +import com.colasoft.opensearch.core.xcontent.ToXContentObject; +import com.colasoft.opensearch.core.xcontent.XContentBuilder; +import com.colasoft.opensearch.core.xcontent.XContentParser; +import com.colasoft.opensearch.common.xcontent.XContentParserUtils; +import com.colasoft.opensearch.common.xcontent.XContentType; +import com.colasoft.opensearch.index.seqno.SequenceNumbers; import java.io.IOException; import java.time.Instant; diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/ScheduledJobParameter.java b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/ScheduledJobParameter.java similarity index 90% rename from spi/src/main/java/org/opensearch/jobscheduler/spi/ScheduledJobParameter.java rename to spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/ScheduledJobParameter.java index 845d0e9a..c522ae3f 100644 --- a/spi/src/main/java/org/opensearch/jobscheduler/spi/ScheduledJobParameter.java +++ b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/ScheduledJobParameter.java @@ -6,10 +6,10 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi; +package com.colasoft.opensearch.jobscheduler.spi; -import org.opensearch.jobscheduler.spi.schedule.Schedule; -import org.opensearch.core.xcontent.ToXContentObject; +import com.colasoft.opensearch.jobscheduler.spi.schedule.Schedule; +import com.colasoft.opensearch.core.xcontent.ToXContentObject; import java.time.Instant; diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/ScheduledJobParser.java b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/ScheduledJobParser.java similarity index 79% rename from spi/src/main/java/org/opensearch/jobscheduler/spi/ScheduledJobParser.java rename to spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/ScheduledJobParser.java index 694ce2e8..f05d53c3 100644 --- a/spi/src/main/java/org/opensearch/jobscheduler/spi/ScheduledJobParser.java +++ b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/ScheduledJobParser.java @@ -6,9 +6,9 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi; +package com.colasoft.opensearch.jobscheduler.spi; -import org.opensearch.core.xcontent.XContentParser; +import com.colasoft.opensearch.core.xcontent.XContentParser; import java.io.IOException; diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/ScheduledJobRunner.java b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/ScheduledJobRunner.java similarity index 87% rename from spi/src/main/java/org/opensearch/jobscheduler/spi/ScheduledJobRunner.java rename to spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/ScheduledJobRunner.java index 50815cc0..1bcadce7 100644 --- a/spi/src/main/java/org/opensearch/jobscheduler/spi/ScheduledJobRunner.java +++ b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/ScheduledJobRunner.java @@ -6,7 +6,7 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi; +package com.colasoft.opensearch.jobscheduler.spi; public interface ScheduledJobRunner { void runJob(ScheduledJobParameter job, JobExecutionContext context); diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/CronSchedule.java b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/schedule/CronSchedule.java similarity index 95% rename from spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/CronSchedule.java rename to spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/schedule/CronSchedule.java index e9c4d6c3..1a99de5e 100644 --- a/spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/CronSchedule.java +++ b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/schedule/CronSchedule.java @@ -6,19 +6,19 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi.schedule; +package com.colasoft.opensearch.jobscheduler.spi.schedule; import com.cronutils.model.CronType; import com.cronutils.model.definition.CronDefinitionBuilder; import com.cronutils.model.time.ExecutionTime; import com.cronutils.parser.CronParser; import com.cronutils.utils.VisibleForTesting; -import org.opensearch.common.Strings; -import org.opensearch.common.collect.Tuple; -import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.io.stream.StreamOutput; -import org.opensearch.core.xcontent.XContentBuilder; -import org.opensearch.common.xcontent.XContentType; +import com.colasoft.opensearch.common.Strings; +import com.colasoft.opensearch.common.collect.Tuple; +import com.colasoft.opensearch.common.io.stream.StreamInput; +import com.colasoft.opensearch.common.io.stream.StreamOutput; +import com.colasoft.opensearch.core.xcontent.XContentBuilder; +import com.colasoft.opensearch.common.xcontent.XContentType; import java.io.IOException; import java.time.Clock; diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/IntervalSchedule.java b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/schedule/IntervalSchedule.java similarity index 94% rename from spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/IntervalSchedule.java rename to spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/schedule/IntervalSchedule.java index 17fc8079..14b12fc5 100644 --- a/spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/IntervalSchedule.java +++ b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/schedule/IntervalSchedule.java @@ -6,16 +6,16 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi.schedule; +package com.colasoft.opensearch.jobscheduler.spi.schedule; import com.cronutils.utils.VisibleForTesting; -import org.opensearch.common.Strings; -import org.opensearch.common.SuppressForbidden; -import org.opensearch.common.collect.Tuple; -import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.io.stream.StreamOutput; -import org.opensearch.core.xcontent.XContentBuilder; -import org.opensearch.common.xcontent.XContentType; +import com.colasoft.opensearch.common.Strings; +import com.colasoft.opensearch.common.SuppressForbidden; +import com.colasoft.opensearch.common.collect.Tuple; +import com.colasoft.opensearch.common.io.stream.StreamInput; +import com.colasoft.opensearch.common.io.stream.StreamOutput; +import com.colasoft.opensearch.core.xcontent.XContentBuilder; +import com.colasoft.opensearch.common.xcontent.XContentType; import java.io.IOException; import java.time.Clock; diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/Schedule.java b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/schedule/Schedule.java similarity index 86% rename from spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/Schedule.java rename to spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/schedule/Schedule.java index 36bf8ab7..53aacb24 100644 --- a/spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/Schedule.java +++ b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/schedule/Schedule.java @@ -6,11 +6,11 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi.schedule; +package com.colasoft.opensearch.jobscheduler.spi.schedule; -import org.opensearch.common.collect.Tuple; -import org.opensearch.common.io.stream.Writeable; -import org.opensearch.core.xcontent.ToXContentObject; +import com.colasoft.opensearch.common.collect.Tuple; +import com.colasoft.opensearch.common.io.stream.Writeable; +import com.colasoft.opensearch.core.xcontent.ToXContentObject; import java.time.Duration; import java.time.Instant; diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/ScheduleParser.java b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/schedule/ScheduleParser.java similarity index 95% rename from spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/ScheduleParser.java rename to spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/schedule/ScheduleParser.java index 67da6c8d..65779783 100644 --- a/spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/ScheduleParser.java +++ b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/schedule/ScheduleParser.java @@ -6,10 +6,10 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi.schedule; +package com.colasoft.opensearch.jobscheduler.spi.schedule; -import org.opensearch.core.xcontent.XContentParser; -import org.opensearch.common.xcontent.XContentParserUtils; +import com.colasoft.opensearch.core.xcontent.XContentParser; +import com.colasoft.opensearch.common.xcontent.XContentParserUtils; import java.io.IOException; import java.time.Instant; diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/utils/LockService.java similarity index 91% rename from spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java rename to spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/utils/LockService.java index 888d50d6..24431bdf 100644 --- a/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java +++ b/spi/src/main/java/com/colasoft/opensearch/jobscheduler/spi/utils/LockService.java @@ -6,34 +6,34 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi.utils; +package com.colasoft.opensearch.jobscheduler.spi.utils; -import org.opensearch.jobscheduler.spi.JobExecutionContext; -import org.opensearch.jobscheduler.spi.LockModel; -import org.opensearch.jobscheduler.spi.ScheduledJobParameter; +import com.colasoft.opensearch.jobscheduler.spi.JobExecutionContext; +import com.colasoft.opensearch.jobscheduler.spi.LockModel; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParameter; import com.cronutils.utils.VisibleForTesting; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.ResourceAlreadyExistsException; -import org.opensearch.action.ActionListener; -import org.opensearch.action.DocWriteResponse; -import org.opensearch.action.admin.indices.create.CreateIndexRequest; -import org.opensearch.action.delete.DeleteRequest; -import org.opensearch.action.get.GetRequest; -import org.opensearch.action.index.IndexRequest; -import org.opensearch.action.update.UpdateRequest; -import org.opensearch.client.Client; -import org.opensearch.cluster.service.ClusterService; -import org.opensearch.common.xcontent.LoggingDeprecationHandler; -import org.opensearch.core.xcontent.NamedXContentRegistry; -import org.opensearch.core.xcontent.ToXContent; -import org.opensearch.common.xcontent.XContentFactory; -import org.opensearch.core.xcontent.XContentParser; -import org.opensearch.common.xcontent.XContentType; -import org.opensearch.index.IndexNotFoundException; -import org.opensearch.index.engine.DocumentMissingException; -import org.opensearch.index.engine.VersionConflictEngineException; -import org.opensearch.index.seqno.SequenceNumbers; +import com.colasoft.opensearch.ResourceAlreadyExistsException; +import com.colasoft.opensearch.action.ActionListener; +import com.colasoft.opensearch.action.DocWriteResponse; +import com.colasoft.opensearch.action.admin.indices.create.CreateIndexRequest; +import com.colasoft.opensearch.action.delete.DeleteRequest; +import com.colasoft.opensearch.action.get.GetRequest; +import com.colasoft.opensearch.action.index.IndexRequest; +import com.colasoft.opensearch.action.update.UpdateRequest; +import com.colasoft.opensearch.client.Client; +import com.colasoft.opensearch.cluster.service.ClusterService; +import com.colasoft.opensearch.common.xcontent.LoggingDeprecationHandler; +import com.colasoft.opensearch.core.xcontent.NamedXContentRegistry; +import com.colasoft.opensearch.core.xcontent.ToXContent; +import com.colasoft.opensearch.common.xcontent.XContentFactory; +import com.colasoft.opensearch.core.xcontent.XContentParser; +import com.colasoft.opensearch.common.xcontent.XContentType; +import com.colasoft.opensearch.index.IndexNotFoundException; +import com.colasoft.opensearch.index.engine.DocumentMissingException; +import com.colasoft.opensearch.index.engine.VersionConflictEngineException; +import com.colasoft.opensearch.index.seqno.SequenceNumbers; import java.io.BufferedReader; import java.io.IOException; diff --git a/spi/src/main/resources/org/opensearch/jobscheduler/spi/utils/opensearch_job_scheduler_lock.json b/spi/src/main/resources/com/colasoft/opensearch/jobscheduler/spi/utils/opensearch_job_scheduler_lock.json similarity index 100% rename from spi/src/main/resources/org/opensearch/jobscheduler/spi/utils/opensearch_job_scheduler_lock.json rename to spi/src/main/resources/com/colasoft/opensearch/jobscheduler/spi/utils/opensearch_job_scheduler_lock.json diff --git a/spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/CronScheduleTests.java b/spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/schedule/CronScheduleTests.java similarity index 96% rename from spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/CronScheduleTests.java rename to spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/schedule/CronScheduleTests.java index 2c76666c..ecf8862a 100644 --- a/spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/CronScheduleTests.java +++ b/spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/schedule/CronScheduleTests.java @@ -6,15 +6,15 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi.schedule; +package com.colasoft.opensearch.jobscheduler.spi.schedule; import com.cronutils.model.time.ExecutionTime; -import org.opensearch.common.collect.Tuple; -import org.opensearch.common.io.stream.BytesStreamOutput; -import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.xcontent.XContentHelper; -import org.opensearch.common.xcontent.XContentType; -import org.opensearch.test.OpenSearchTestCase; +import com.colasoft.opensearch.common.collect.Tuple; +import com.colasoft.opensearch.common.io.stream.BytesStreamOutput; +import com.colasoft.opensearch.common.io.stream.StreamInput; +import com.colasoft.opensearch.common.xcontent.XContentHelper; +import com.colasoft.opensearch.common.xcontent.XContentType; +import com.colasoft.opensearch.test.OpenSearchTestCase; import org.junit.Assert; import org.junit.Before; import org.mockito.Mockito; diff --git a/spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/IntervalScheduleTests.java b/spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/schedule/IntervalScheduleTests.java similarity index 96% rename from spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/IntervalScheduleTests.java rename to spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/schedule/IntervalScheduleTests.java index cc823e9d..89469908 100644 --- a/spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/IntervalScheduleTests.java +++ b/spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/schedule/IntervalScheduleTests.java @@ -6,14 +6,14 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -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.xcontent.XContentHelper; -import org.opensearch.common.xcontent.XContentType; -import org.opensearch.test.OpenSearchTestCase; +package com.colasoft.opensearch.jobscheduler.spi.schedule; + +import com.colasoft.opensearch.common.collect.Tuple; +import com.colasoft.opensearch.common.io.stream.BytesStreamOutput; +import com.colasoft.opensearch.common.io.stream.StreamInput; +import com.colasoft.opensearch.common.xcontent.XContentHelper; +import com.colasoft.opensearch.common.xcontent.XContentType; +import com.colasoft.opensearch.test.OpenSearchTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/JobDocVersionTests.java b/spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/schedule/JobDocVersionTests.java similarity index 84% rename from spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/JobDocVersionTests.java rename to spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/schedule/JobDocVersionTests.java index bda2cb8b..1184c22d 100644 --- a/spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/JobDocVersionTests.java +++ b/spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/schedule/JobDocVersionTests.java @@ -6,10 +6,10 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi.schedule; +package com.colasoft.opensearch.jobscheduler.spi.schedule; -import org.opensearch.jobscheduler.spi.JobDocVersion; -import org.opensearch.test.OpenSearchTestCase; +import com.colasoft.opensearch.jobscheduler.spi.JobDocVersion; +import com.colasoft.opensearch.test.OpenSearchTestCase; import org.junit.Assert; public class JobDocVersionTests extends OpenSearchTestCase { diff --git a/spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/ScheduleParserTests.java b/spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/schedule/ScheduleParserTests.java similarity index 91% rename from spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/ScheduleParserTests.java rename to spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/schedule/ScheduleParserTests.java index 85ccc847..01b8b517 100644 --- a/spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/ScheduleParserTests.java +++ b/spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/schedule/ScheduleParserTests.java @@ -6,12 +6,12 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi.schedule; +package com.colasoft.opensearch.jobscheduler.spi.schedule; -import org.opensearch.common.bytes.BytesArray; -import org.opensearch.core.xcontent.XContentParser; -import org.opensearch.common.xcontent.XContentType; -import org.opensearch.test.OpenSearchTestCase; +import com.colasoft.opensearch.common.bytes.BytesArray; +import com.colasoft.opensearch.core.xcontent.XContentParser; +import com.colasoft.opensearch.common.xcontent.XContentType; +import com.colasoft.opensearch.test.OpenSearchTestCase; import org.junit.Assert; import org.junit.Test; diff --git a/spi/src/test/java/org/opensearch/jobscheduler/spi/utils/LockServiceIT.java b/spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/utils/LockServiceIT.java similarity index 97% rename from spi/src/test/java/org/opensearch/jobscheduler/spi/utils/LockServiceIT.java rename to spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/utils/LockServiceIT.java index f43d976a..b2a5eb94 100644 --- a/spi/src/test/java/org/opensearch/jobscheduler/spi/utils/LockServiceIT.java +++ b/spi/src/test/java/com/colasoft/opensearch/jobscheduler/spi/utils/LockServiceIT.java @@ -6,20 +6,20 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.spi.utils; +package com.colasoft.opensearch.jobscheduler.spi.utils; import org.junit.Before; import org.junit.Ignore; import org.mockito.Mockito; -import org.opensearch.action.ActionListener; -import org.opensearch.cluster.service.ClusterService; -import org.opensearch.core.xcontent.XContentBuilder; -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.test.OpenSearchIntegTestCase; +import com.colasoft.opensearch.action.ActionListener; +import com.colasoft.opensearch.cluster.service.ClusterService; +import com.colasoft.opensearch.core.xcontent.XContentBuilder; +import com.colasoft.opensearch.jobscheduler.spi.JobDocVersion; +import com.colasoft.opensearch.jobscheduler.spi.JobExecutionContext; +import com.colasoft.opensearch.jobscheduler.spi.LockModel; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParameter; +import com.colasoft.opensearch.jobscheduler.spi.schedule.Schedule; +import com.colasoft.opensearch.test.OpenSearchIntegTestCase; import java.io.IOException; import java.time.Duration; diff --git a/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java b/src/main/java/com/colasoft/opensearch/jobscheduler/JobSchedulerPlugin.java similarity index 77% rename from src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java rename to src/main/java/com/colasoft/opensearch/jobscheduler/JobSchedulerPlugin.java index bbfa4d9a..7197c9e1 100644 --- a/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java +++ b/src/main/java/com/colasoft/opensearch/jobscheduler/JobSchedulerPlugin.java @@ -6,38 +6,38 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -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; +package com.colasoft.opensearch.jobscheduler; + +import com.colasoft.opensearch.jobscheduler.scheduler.JobScheduler; +import com.colasoft.opensearch.jobscheduler.spi.JobSchedulerExtension; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParser; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobRunner; +import com.colasoft.opensearch.jobscheduler.spi.schedule.Schedule; +import com.colasoft.opensearch.jobscheduler.spi.schedule.ScheduleParser; +import com.colasoft.opensearch.jobscheduler.spi.utils.LockService; +import com.colasoft.opensearch.jobscheduler.sweeper.JobSweeper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.client.Client; -import org.opensearch.cluster.metadata.IndexNameExpressionResolver; -import org.opensearch.cluster.service.ClusterService; -import org.opensearch.core.ParseField; -import org.opensearch.common.io.stream.NamedWriteableRegistry; -import org.opensearch.common.settings.Setting; -import org.opensearch.common.settings.Settings; -import org.opensearch.common.util.concurrent.OpenSearchExecutors; -import org.opensearch.core.xcontent.NamedXContentRegistry; -import org.opensearch.env.Environment; -import org.opensearch.env.NodeEnvironment; -import org.opensearch.index.IndexModule; -import org.opensearch.plugins.ExtensiblePlugin; -import org.opensearch.plugins.Plugin; -import org.opensearch.repositories.RepositoriesService; -import org.opensearch.script.ScriptService; -import org.opensearch.threadpool.ExecutorBuilder; -import org.opensearch.threadpool.FixedExecutorBuilder; -import org.opensearch.threadpool.ThreadPool; -import org.opensearch.watcher.ResourceWatcherService; +import com.colasoft.opensearch.client.Client; +import com.colasoft.opensearch.cluster.metadata.IndexNameExpressionResolver; +import com.colasoft.opensearch.cluster.service.ClusterService; +import com.colasoft.opensearch.core.ParseField; +import com.colasoft.opensearch.common.io.stream.NamedWriteableRegistry; +import com.colasoft.opensearch.common.settings.Setting; +import com.colasoft.opensearch.common.settings.Settings; +import com.colasoft.opensearch.common.util.concurrent.OpenSearchExecutors; +import com.colasoft.opensearch.core.xcontent.NamedXContentRegistry; +import com.colasoft.opensearch.env.Environment; +import com.colasoft.opensearch.env.NodeEnvironment; +import com.colasoft.opensearch.index.IndexModule; +import com.colasoft.opensearch.plugins.ExtensiblePlugin; +import com.colasoft.opensearch.plugins.Plugin; +import com.colasoft.opensearch.repositories.RepositoriesService; +import com.colasoft.opensearch.script.ScriptService; +import com.colasoft.opensearch.threadpool.ExecutorBuilder; +import com.colasoft.opensearch.threadpool.FixedExecutorBuilder; +import com.colasoft.opensearch.threadpool.ThreadPool; +import com.colasoft.opensearch.watcher.ResourceWatcherService; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/opensearch/jobscheduler/JobSchedulerSettings.java b/src/main/java/com/colasoft/opensearch/jobscheduler/JobSchedulerSettings.java similarity index 92% rename from src/main/java/org/opensearch/jobscheduler/JobSchedulerSettings.java rename to src/main/java/com/colasoft/opensearch/jobscheduler/JobSchedulerSettings.java index fa9b8d31..3d46874a 100644 --- a/src/main/java/org/opensearch/jobscheduler/JobSchedulerSettings.java +++ b/src/main/java/com/colasoft/opensearch/jobscheduler/JobSchedulerSettings.java @@ -6,10 +6,10 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler; +package com.colasoft.opensearch.jobscheduler; -import org.opensearch.common.settings.Setting; -import org.opensearch.common.unit.TimeValue; +import com.colasoft.opensearch.common.settings.Setting; +import com.colasoft.opensearch.common.unit.TimeValue; public class JobSchedulerSettings { public static final Setting REQUEST_TIMEOUT = Setting.positiveTimeSetting( diff --git a/src/main/java/org/opensearch/jobscheduler/LegacyOpenDistroJobSchedulerSettings.java b/src/main/java/com/colasoft/opensearch/jobscheduler/LegacyOpenDistroJobSchedulerSettings.java similarity index 92% rename from src/main/java/org/opensearch/jobscheduler/LegacyOpenDistroJobSchedulerSettings.java rename to src/main/java/com/colasoft/opensearch/jobscheduler/LegacyOpenDistroJobSchedulerSettings.java index ea185907..29a2b589 100644 --- a/src/main/java/org/opensearch/jobscheduler/LegacyOpenDistroJobSchedulerSettings.java +++ b/src/main/java/com/colasoft/opensearch/jobscheduler/LegacyOpenDistroJobSchedulerSettings.java @@ -6,10 +6,10 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler; +package com.colasoft.opensearch.jobscheduler; -import org.opensearch.common.settings.Setting; -import org.opensearch.common.unit.TimeValue; +import com.colasoft.opensearch.common.settings.Setting; +import com.colasoft.opensearch.common.unit.TimeValue; public class LegacyOpenDistroJobSchedulerSettings { public static final Setting REQUEST_TIMEOUT = Setting.positiveTimeSetting( diff --git a/src/main/java/org/opensearch/jobscheduler/ScheduledJobProvider.java b/src/main/java/com/colasoft/opensearch/jobscheduler/ScheduledJobProvider.java similarity index 84% rename from src/main/java/org/opensearch/jobscheduler/ScheduledJobProvider.java rename to src/main/java/com/colasoft/opensearch/jobscheduler/ScheduledJobProvider.java index 6a263779..8f87afab 100644 --- a/src/main/java/org/opensearch/jobscheduler/ScheduledJobProvider.java +++ b/src/main/java/com/colasoft/opensearch/jobscheduler/ScheduledJobProvider.java @@ -6,10 +6,10 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler; +package com.colasoft.opensearch.jobscheduler; -import org.opensearch.jobscheduler.spi.ScheduledJobParser; -import org.opensearch.jobscheduler.spi.ScheduledJobRunner; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParser; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobRunner; public class ScheduledJobProvider { private String jobType; diff --git a/src/main/java/org/opensearch/jobscheduler/scheduler/JobScheduler.java b/src/main/java/com/colasoft/opensearch/jobscheduler/scheduler/JobScheduler.java similarity index 90% rename from src/main/java/org/opensearch/jobscheduler/scheduler/JobScheduler.java rename to src/main/java/com/colasoft/opensearch/jobscheduler/scheduler/JobScheduler.java index afbcf4ce..c0bb3098 100644 --- a/src/main/java/org/opensearch/jobscheduler/scheduler/JobScheduler.java +++ b/src/main/java/com/colasoft/opensearch/jobscheduler/scheduler/JobScheduler.java @@ -6,21 +6,21 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -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; +package com.colasoft.opensearch.jobscheduler.scheduler; + +import com.colasoft.opensearch.jobscheduler.JobSchedulerPlugin; +import com.colasoft.opensearch.jobscheduler.spi.JobExecutionContext; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParameter; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobRunner; +import com.colasoft.opensearch.jobscheduler.spi.JobDocVersion; +import com.colasoft.opensearch.jobscheduler.spi.utils.LockService; +import com.colasoft.opensearch.jobscheduler.utils.VisibleForTesting; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.common.Randomness; -import org.opensearch.common.unit.TimeValue; -import org.opensearch.threadpool.Scheduler; -import org.opensearch.threadpool.ThreadPool; +import com.colasoft.opensearch.common.Randomness; +import com.colasoft.opensearch.common.unit.TimeValue; +import com.colasoft.opensearch.threadpool.Scheduler; +import com.colasoft.opensearch.threadpool.ThreadPool; import java.time.Clock; import java.time.Duration; diff --git a/src/main/java/org/opensearch/jobscheduler/scheduler/JobSchedulingInfo.java b/src/main/java/com/colasoft/opensearch/jobscheduler/scheduler/JobSchedulingInfo.java similarity index 92% rename from src/main/java/org/opensearch/jobscheduler/scheduler/JobSchedulingInfo.java rename to src/main/java/com/colasoft/opensearch/jobscheduler/scheduler/JobSchedulingInfo.java index f55c5dcc..0d677b05 100644 --- a/src/main/java/org/opensearch/jobscheduler/scheduler/JobSchedulingInfo.java +++ b/src/main/java/com/colasoft/opensearch/jobscheduler/scheduler/JobSchedulingInfo.java @@ -6,10 +6,10 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.scheduler; +package com.colasoft.opensearch.jobscheduler.scheduler; -import org.opensearch.jobscheduler.spi.ScheduledJobParameter; -import org.opensearch.threadpool.Scheduler; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParameter; +import com.colasoft.opensearch.threadpool.Scheduler; import java.time.Instant; diff --git a/src/main/java/org/opensearch/jobscheduler/scheduler/ScheduledJobInfo.java b/src/main/java/com/colasoft/opensearch/jobscheduler/scheduler/ScheduledJobInfo.java similarity index 96% rename from src/main/java/org/opensearch/jobscheduler/scheduler/ScheduledJobInfo.java rename to src/main/java/com/colasoft/opensearch/jobscheduler/scheduler/ScheduledJobInfo.java index 814d02a5..c7a9b2ec 100644 --- a/src/main/java/org/opensearch/jobscheduler/scheduler/ScheduledJobInfo.java +++ b/src/main/java/com/colasoft/opensearch/jobscheduler/scheduler/ScheduledJobInfo.java @@ -6,7 +6,7 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.scheduler; +package com.colasoft.opensearch.jobscheduler.scheduler; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java b/src/main/java/com/colasoft/opensearch/jobscheduler/sweeper/JobSweeper.java similarity index 87% rename from src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java rename to src/main/java/com/colasoft/opensearch/jobscheduler/sweeper/JobSweeper.java index 0f3dc27a..988f99f6 100644 --- a/src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java +++ b/src/main/java/com/colasoft/opensearch/jobscheduler/sweeper/JobSweeper.java @@ -6,53 +6,53 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.sweeper; - -import org.opensearch.jobscheduler.JobSchedulerSettings; -import org.opensearch.jobscheduler.ScheduledJobProvider; -import org.opensearch.jobscheduler.scheduler.JobScheduler; -import org.opensearch.jobscheduler.spi.LockModel; -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; +package com.colasoft.opensearch.jobscheduler.sweeper; + +import com.colasoft.opensearch.jobscheduler.JobSchedulerSettings; +import com.colasoft.opensearch.jobscheduler.ScheduledJobProvider; +import com.colasoft.opensearch.jobscheduler.scheduler.JobScheduler; +import com.colasoft.opensearch.jobscheduler.spi.LockModel; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParameter; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobRunner; +import com.colasoft.opensearch.jobscheduler.spi.JobDocVersion; +import com.colasoft.opensearch.jobscheduler.spi.utils.LockService; +import com.colasoft.opensearch.jobscheduler.utils.VisibleForTesting; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.OpenSearchException; -import org.opensearch.action.ActionListener; -import org.opensearch.action.bulk.BackoffPolicy; -import org.opensearch.action.search.SearchRequest; -import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; -import org.opensearch.cluster.ClusterChangedEvent; -import org.opensearch.cluster.ClusterState; -import org.opensearch.cluster.ClusterStateListener; -import org.opensearch.cluster.routing.IndexShardRoutingTable; -import org.opensearch.cluster.routing.Murmur3HashFunction; -import org.opensearch.cluster.routing.ShardRouting; -import org.opensearch.cluster.service.ClusterService; -import org.opensearch.common.bytes.BytesReference; -import org.opensearch.common.component.LifecycleListener; -import org.opensearch.common.settings.Settings; -import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.OpenSearchExecutors; -import org.opensearch.common.util.set.Sets; -import org.opensearch.common.xcontent.LoggingDeprecationHandler; -import org.opensearch.core.xcontent.NamedXContentRegistry; -import org.opensearch.common.xcontent.XContentHelper; -import org.opensearch.core.xcontent.XContentParser; -import org.opensearch.common.xcontent.XContentType; -import org.opensearch.index.engine.Engine; -import org.opensearch.index.query.QueryBuilders; -import org.opensearch.index.shard.IndexingOperationListener; -import org.opensearch.index.shard.ShardId; -import org.opensearch.rest.RestStatus; -import org.opensearch.search.SearchHit; -import org.opensearch.search.builder.SearchSourceBuilder; -import org.opensearch.search.sort.FieldSortBuilder; -import org.opensearch.threadpool.Scheduler; -import org.opensearch.threadpool.ThreadPool; +import com.colasoft.opensearch.OpenSearchException; +import com.colasoft.opensearch.action.ActionListener; +import com.colasoft.opensearch.action.bulk.BackoffPolicy; +import com.colasoft.opensearch.action.search.SearchRequest; +import com.colasoft.opensearch.action.search.SearchResponse; +import com.colasoft.opensearch.client.Client; +import com.colasoft.opensearch.cluster.ClusterChangedEvent; +import com.colasoft.opensearch.cluster.ClusterState; +import com.colasoft.opensearch.cluster.ClusterStateListener; +import com.colasoft.opensearch.cluster.routing.IndexShardRoutingTable; +import com.colasoft.opensearch.cluster.routing.Murmur3HashFunction; +import com.colasoft.opensearch.cluster.routing.ShardRouting; +import com.colasoft.opensearch.cluster.service.ClusterService; +import com.colasoft.opensearch.common.bytes.BytesReference; +import com.colasoft.opensearch.common.component.LifecycleListener; +import com.colasoft.opensearch.common.settings.Settings; +import com.colasoft.opensearch.common.unit.TimeValue; +import com.colasoft.opensearch.common.util.concurrent.OpenSearchExecutors; +import com.colasoft.opensearch.common.util.set.Sets; +import com.colasoft.opensearch.common.xcontent.LoggingDeprecationHandler; +import com.colasoft.opensearch.core.xcontent.NamedXContentRegistry; +import com.colasoft.opensearch.common.xcontent.XContentHelper; +import com.colasoft.opensearch.core.xcontent.XContentParser; +import com.colasoft.opensearch.common.xcontent.XContentType; +import com.colasoft.opensearch.index.engine.Engine; +import com.colasoft.opensearch.index.query.QueryBuilders; +import com.colasoft.opensearch.index.shard.IndexingOperationListener; +import com.colasoft.opensearch.index.shard.ShardId; +import com.colasoft.opensearch.rest.RestStatus; +import com.colasoft.opensearch.search.SearchHit; +import com.colasoft.opensearch.search.builder.SearchSourceBuilder; +import com.colasoft.opensearch.search.sort.FieldSortBuilder; +import com.colasoft.opensearch.threadpool.Scheduler; +import com.colasoft.opensearch.threadpool.ThreadPool; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/opensearch/jobscheduler/utils/VisibleForTesting.java b/src/main/java/com/colasoft/opensearch/jobscheduler/utils/VisibleForTesting.java similarity index 84% rename from src/main/java/org/opensearch/jobscheduler/utils/VisibleForTesting.java rename to src/main/java/com/colasoft/opensearch/jobscheduler/utils/VisibleForTesting.java index fbd8b2f6..14a67dae 100644 --- a/src/main/java/org/opensearch/jobscheduler/utils/VisibleForTesting.java +++ b/src/main/java/com/colasoft/opensearch/jobscheduler/utils/VisibleForTesting.java @@ -6,7 +6,7 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.utils; +package com.colasoft.opensearch.jobscheduler.utils; public @interface VisibleForTesting { } diff --git a/src/test/java/org/opensearch/jobscheduler/JobSchedulerPluginIT.java b/src/test/java/com/colasoft/opensearch/jobscheduler/JobSchedulerPluginIT.java similarity index 68% rename from src/test/java/org/opensearch/jobscheduler/JobSchedulerPluginIT.java rename to src/test/java/com/colasoft/opensearch/jobscheduler/JobSchedulerPluginIT.java index 266e2336..f2f33eef 100644 --- a/src/test/java/org/opensearch/jobscheduler/JobSchedulerPluginIT.java +++ b/src/test/java/com/colasoft/opensearch/jobscheduler/JobSchedulerPluginIT.java @@ -6,18 +6,18 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler; +package com.colasoft.opensearch.jobscheduler; import org.junit.Assert; -import org.opensearch.action.admin.cluster.health.ClusterHealthRequest; -import org.opensearch.action.admin.cluster.health.ClusterHealthResponse; -import org.opensearch.action.admin.cluster.node.info.NodeInfo; -import org.opensearch.action.admin.cluster.node.info.NodesInfoRequest; -import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse; -import org.opensearch.action.admin.cluster.node.info.PluginsAndModules; -import org.opensearch.cluster.health.ClusterHealthStatus; -import org.opensearch.plugins.PluginInfo; -import org.opensearch.test.OpenSearchIntegTestCase; +import com.colasoft.opensearch.action.admin.cluster.health.ClusterHealthRequest; +import com.colasoft.opensearch.action.admin.cluster.health.ClusterHealthResponse; +import com.colasoft.opensearch.action.admin.cluster.node.info.NodeInfo; +import com.colasoft.opensearch.action.admin.cluster.node.info.NodesInfoRequest; +import com.colasoft.opensearch.action.admin.cluster.node.info.NodesInfoResponse; +import com.colasoft.opensearch.action.admin.cluster.node.info.PluginsAndModules; +import com.colasoft.opensearch.cluster.health.ClusterHealthStatus; +import com.colasoft.opensearch.plugins.PluginInfo; +import com.colasoft.opensearch.test.OpenSearchIntegTestCase; import java.util.List; import java.util.function.Function; diff --git a/src/test/java/org/opensearch/jobscheduler/JobSchedulerPluginRestIT.java b/src/test/java/com/colasoft/opensearch/jobscheduler/JobSchedulerPluginRestIT.java similarity index 73% rename from src/test/java/org/opensearch/jobscheduler/JobSchedulerPluginRestIT.java rename to src/test/java/com/colasoft/opensearch/jobscheduler/JobSchedulerPluginRestIT.java index 02ec9593..b10314b8 100644 --- a/src/test/java/org/opensearch/jobscheduler/JobSchedulerPluginRestIT.java +++ b/src/test/java/com/colasoft/opensearch/jobscheduler/JobSchedulerPluginRestIT.java @@ -6,15 +6,15 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler; +package com.colasoft.opensearch.jobscheduler; import org.junit.Assert; -import org.opensearch.client.Request; -import org.opensearch.client.Response; -import org.opensearch.common.xcontent.LoggingDeprecationHandler; -import org.opensearch.core.xcontent.NamedXContentRegistry; -import org.opensearch.common.xcontent.json.JsonXContent; -import org.opensearch.test.rest.OpenSearchRestTestCase; +import com.colasoft.opensearch.client.Request; +import com.colasoft.opensearch.client.Response; +import com.colasoft.opensearch.common.xcontent.LoggingDeprecationHandler; +import com.colasoft.opensearch.core.xcontent.NamedXContentRegistry; +import com.colasoft.opensearch.common.xcontent.json.JsonXContent; +import com.colasoft.opensearch.test.rest.OpenSearchRestTestCase; import java.io.IOException; import java.util.List; diff --git a/src/test/java/org/opensearch/jobscheduler/JobSchedulerSettingsTests.java b/src/test/java/com/colasoft/opensearch/jobscheduler/JobSchedulerSettingsTests.java similarity index 94% rename from src/test/java/org/opensearch/jobscheduler/JobSchedulerSettingsTests.java rename to src/test/java/com/colasoft/opensearch/jobscheduler/JobSchedulerSettingsTests.java index d0642d35..1724dfba 100644 --- a/src/test/java/org/opensearch/jobscheduler/JobSchedulerSettingsTests.java +++ b/src/test/java/com/colasoft/opensearch/jobscheduler/JobSchedulerSettingsTests.java @@ -6,16 +6,16 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler; +package com.colasoft.opensearch.jobscheduler; import java.util.Arrays; import java.util.List; import org.junit.Before; -import org.opensearch.common.settings.Setting; -import org.opensearch.common.settings.Settings; -import org.opensearch.common.unit.TimeValue; -import org.opensearch.test.OpenSearchTestCase; +import com.colasoft.opensearch.common.settings.Setting; +import com.colasoft.opensearch.common.settings.Settings; +import com.colasoft.opensearch.common.unit.TimeValue; +import com.colasoft.opensearch.test.OpenSearchTestCase; @SuppressWarnings({ "rawtypes" }) public class JobSchedulerSettingsTests extends OpenSearchTestCase { diff --git a/src/test/java/org/opensearch/jobscheduler/scheduler/JobSchedulerTests.java b/src/test/java/com/colasoft/opensearch/jobscheduler/scheduler/JobSchedulerTests.java similarity index 93% rename from src/test/java/org/opensearch/jobscheduler/scheduler/JobSchedulerTests.java rename to src/test/java/com/colasoft/opensearch/jobscheduler/scheduler/JobSchedulerTests.java index 51d4c5f1..c67367a9 100644 --- a/src/test/java/org/opensearch/jobscheduler/scheduler/JobSchedulerTests.java +++ b/src/test/java/com/colasoft/opensearch/jobscheduler/scheduler/JobSchedulerTests.java @@ -6,18 +6,18 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.scheduler; +package com.colasoft.opensearch.jobscheduler.scheduler; -import org.opensearch.jobscheduler.spi.JobDocVersion; -import org.opensearch.jobscheduler.spi.ScheduledJobParameter; -import org.opensearch.jobscheduler.spi.ScheduledJobRunner; -import org.opensearch.jobscheduler.spi.schedule.CronSchedule; -import org.opensearch.jobscheduler.spi.schedule.Schedule; +import com.colasoft.opensearch.jobscheduler.spi.JobDocVersion; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParameter; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobRunner; +import com.colasoft.opensearch.jobscheduler.spi.schedule.CronSchedule; +import com.colasoft.opensearch.jobscheduler.spi.schedule.Schedule; import com.carrotsearch.randomizedtesting.RandomizedRunner; -import org.opensearch.core.xcontent.XContentBuilder; -import org.opensearch.test.OpenSearchTestCase; -import org.opensearch.threadpool.Scheduler; -import org.opensearch.threadpool.ThreadPool; +import com.colasoft.opensearch.core.xcontent.XContentBuilder; +import com.colasoft.opensearch.test.OpenSearchTestCase; +import com.colasoft.opensearch.threadpool.Scheduler; +import com.colasoft.opensearch.threadpool.ThreadPool; import org.junit.Assert; import org.junit.Before; import org.junit.runner.RunWith; diff --git a/src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java b/src/test/java/com/colasoft/opensearch/jobscheduler/sweeper/JobSweeperTests.java similarity index 85% rename from src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java rename to src/test/java/com/colasoft/opensearch/jobscheduler/sweeper/JobSweeperTests.java index 769485c4..067258e8 100644 --- a/src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java +++ b/src/test/java/com/colasoft/opensearch/jobscheduler/sweeper/JobSweeperTests.java @@ -6,49 +6,49 @@ * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ -package org.opensearch.jobscheduler.sweeper; - -import org.opensearch.jobscheduler.JobSchedulerSettings; -import org.opensearch.jobscheduler.ScheduledJobProvider; -import org.opensearch.jobscheduler.scheduler.JobScheduler; -import org.opensearch.jobscheduler.spi.JobDocVersion; -import org.opensearch.jobscheduler.spi.ScheduledJobParameter; -import org.opensearch.jobscheduler.spi.ScheduledJobParser; -import org.opensearch.jobscheduler.spi.ScheduledJobRunner; -import org.opensearch.jobscheduler.spi.utils.LockService; +package com.colasoft.opensearch.jobscheduler.sweeper; + +import com.colasoft.opensearch.jobscheduler.JobSchedulerSettings; +import com.colasoft.opensearch.jobscheduler.ScheduledJobProvider; +import com.colasoft.opensearch.jobscheduler.scheduler.JobScheduler; +import com.colasoft.opensearch.jobscheduler.spi.JobDocVersion; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParameter; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobParser; +import com.colasoft.opensearch.jobscheduler.spi.ScheduledJobRunner; +import com.colasoft.opensearch.jobscheduler.spi.utils.LockService; import org.apache.lucene.index.Term; import org.apache.lucene.util.BytesRef; -import org.opensearch.Version; -import org.opensearch.action.ActionFuture; -import org.opensearch.action.delete.DeleteResponse; -import org.opensearch.client.Client; -import org.opensearch.cluster.ClusterName; -import org.opensearch.cluster.ClusterState; -import org.opensearch.cluster.OpenSearchAllocationTestCase; -import org.opensearch.cluster.metadata.IndexMetadata; -import org.opensearch.cluster.metadata.Metadata; -import org.opensearch.cluster.node.DiscoveryNode; -import org.opensearch.cluster.node.DiscoveryNodes; -import org.opensearch.cluster.routing.IndexRoutingTable; -import org.opensearch.cluster.routing.RoutingTable; -import org.opensearch.cluster.routing.ShardRoutingState; -import org.opensearch.cluster.routing.allocation.AllocationService; -import org.opensearch.cluster.service.ClusterService; -import org.opensearch.common.bytes.BytesArray; -import org.opensearch.common.bytes.BytesReference; -import org.opensearch.common.settings.ClusterSettings; -import org.opensearch.common.settings.Setting; -import org.opensearch.common.settings.Settings; -import org.opensearch.core.xcontent.NamedXContentRegistry; -import org.opensearch.index.Index; -import org.opensearch.index.engine.Engine; -import org.opensearch.index.mapper.ParseContext; -import org.opensearch.index.mapper.ParsedDocument; -import org.opensearch.index.shard.ShardId; -import org.opensearch.test.ClusterServiceUtils; -import org.opensearch.test.OpenSearchTestCase; -import org.opensearch.threadpool.Scheduler; -import org.opensearch.threadpool.ThreadPool; +import com.colasoft.opensearch.Version; +import com.colasoft.opensearch.action.ActionFuture; +import com.colasoft.opensearch.action.delete.DeleteResponse; +import com.colasoft.opensearch.client.Client; +import com.colasoft.opensearch.cluster.ClusterName; +import com.colasoft.opensearch.cluster.ClusterState; +import com.colasoft.opensearch.cluster.OpenSearchAllocationTestCase; +import com.colasoft.opensearch.cluster.metadata.IndexMetadata; +import com.colasoft.opensearch.cluster.metadata.Metadata; +import com.colasoft.opensearch.cluster.node.DiscoveryNode; +import com.colasoft.opensearch.cluster.node.DiscoveryNodes; +import com.colasoft.opensearch.cluster.routing.IndexRoutingTable; +import com.colasoft.opensearch.cluster.routing.RoutingTable; +import com.colasoft.opensearch.cluster.routing.ShardRoutingState; +import com.colasoft.opensearch.cluster.routing.allocation.AllocationService; +import com.colasoft.opensearch.cluster.service.ClusterService; +import com.colasoft.opensearch.common.bytes.BytesArray; +import com.colasoft.opensearch.common.bytes.BytesReference; +import com.colasoft.opensearch.common.settings.ClusterSettings; +import com.colasoft.opensearch.common.settings.Setting; +import com.colasoft.opensearch.common.settings.Settings; +import com.colasoft.opensearch.core.xcontent.NamedXContentRegistry; +import com.colasoft.opensearch.index.Index; +import com.colasoft.opensearch.index.engine.Engine; +import com.colasoft.opensearch.index.mapper.ParseContext; +import com.colasoft.opensearch.index.mapper.ParsedDocument; +import com.colasoft.opensearch.index.shard.ShardId; +import com.colasoft.opensearch.test.ClusterServiceUtils; +import com.colasoft.opensearch.test.OpenSearchTestCase; +import com.colasoft.opensearch.threadpool.Scheduler; +import com.colasoft.opensearch.threadpool.ThreadPool; import org.junit.Before; import org.mockito.Mockito; import org.mockito.stubbing.OngoingStubbing;