Fixing xcontent imports (#353)

* Fixing xcontent imports Signed-off-by: Joshua Palis <jpalis@amazon.com> * Updating parsefield import Signed-off-by: Joshua Palis <jpalis@amazon.com> --------- Signed-off-by: Joshua Palis <jpalis@amazon.com>
opensearch-project · Mar 28, 2023 · 5f11ac5 · 5f11ac5
1 parent 5081933
commit 5f11ac5
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 25 deletions.
diff --git a/...ugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java b/...ugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionPlugin.java
@@ -23,8 +23,8 @@
 import org.opensearch.common.settings.IndexScopedSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsFilter;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentParser;
+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;

diff --git a/...-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobParameter.java b/...-plugin/src/main/java/org/opensearch/jobscheduler/sampleextension/SampleJobParameter.java
@@ -10,7 +10,7 @@
 
 import org.opensearch.jobscheduler.spi.ScheduledJobParameter;
 import org.opensearch.jobscheduler.spi.schedule.Schedule;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.time.Instant;

diff --git a/...c/test/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionIntegTestCase.java b/...c/test/java/org/opensearch/jobscheduler/sampleextension/SampleExtensionIntegTestCase.java
@@ -20,7 +20,7 @@
 import org.opensearch.client.WarningsHandler;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
+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;

diff --git a/...xtension-plugin/src/test/resources/bwc/job-scheduler/1.13.0.0/job-scheduler-artifacts.zip b/...xtension-plugin/src/test/resources/bwc/job-scheduler/1.13.0.0/job-scheduler-artifacts.zip
diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/LockModel.java b/spi/src/main/java/org/opensearch/jobscheduler/spi/LockModel.java
@@ -9,9 +9,9 @@
 package org.opensearch.jobscheduler.spi;
 
 import org.opensearch.common.Strings;
-import org.opensearch.common.xcontent.ToXContentObject;
-import org.opensearch.common.xcontent.XContentBuilder;
-import org.opensearch.common.xcontent.XContentParser;
+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;

diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/ScheduledJobParameter.java b/spi/src/main/java/org/opensearch/jobscheduler/spi/ScheduledJobParameter.java
@@ -9,7 +9,7 @@
 package org.opensearch.jobscheduler.spi;
 
 import org.opensearch.jobscheduler.spi.schedule.Schedule;
-import org.opensearch.common.xcontent.ToXContentObject;
+import org.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/org/opensearch/jobscheduler/spi/ScheduledJobParser.java
@@ -8,7 +8,7 @@
  */
 package org.opensearch.jobscheduler.spi;
 
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.xcontent.XContentParser;
 
 import java.io.IOException;
 

diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/CronSchedule.java b/spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/CronSchedule.java
@@ -17,7 +17,7 @@
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentType;
 
 import java.io.IOException;

diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/IntervalSchedule.java b/spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/IntervalSchedule.java
@@ -14,7 +14,7 @@
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentType;
 
 import java.io.IOException;

diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/Schedule.java b/spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/Schedule.java
@@ -10,7 +10,7 @@
 
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.io.stream.Writeable;
-import org.opensearch.common.xcontent.ToXContentObject;
+import org.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/org/opensearch/jobscheduler/spi/schedule/ScheduleParser.java
@@ -8,7 +8,7 @@
  */
 package org.opensearch.jobscheduler.spi.schedule;
 
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentParserUtils;
 
 import java.io.IOException;

diff --git a/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java b/spi/src/main/java/org/opensearch/jobscheduler/spi/utils/LockService.java
@@ -25,10 +25,10 @@
 import org.opensearch.client.Client;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.ToXContent;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.engine.DocumentMissingException;

diff --git a/spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/ScheduleParserTests.java b/spi/src/test/java/org/opensearch/jobscheduler/spi/schedule/ScheduleParserTests.java
@@ -9,7 +9,7 @@
 package org.opensearch.jobscheduler.spi.schedule;
 
 import org.opensearch.common.bytes.BytesArray;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.test.OpenSearchTestCase;
 import org.junit.Assert;

diff --git a/spi/src/test/java/org/opensearch/jobscheduler/spi/utils/LockServiceIT.java b/spi/src/test/java/org/opensearch/jobscheduler/spi/utils/LockServiceIT.java
@@ -13,7 +13,7 @@
 import org.mockito.Mockito;
 import org.opensearch.action.ActionListener;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.jobscheduler.spi.JobDocVersion;
 import org.opensearch.jobscheduler.spi.JobExecutionContext;
 import org.opensearch.jobscheduler.spi.LockModel;

diff --git a/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java b/src/main/java/org/opensearch/jobscheduler/JobSchedulerPlugin.java
@@ -21,12 +21,12 @@
 import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.ParseField;
+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.common.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.env.Environment;
 import org.opensearch.env.NodeEnvironment;
 import org.opensearch.index.IndexModule;

diff --git a/src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java b/src/main/java/org/opensearch/jobscheduler/sweeper/JobSweeper.java
@@ -39,9 +39,9 @@
 import org.opensearch.common.util.concurrent.OpenSearchExecutors;
 import org.opensearch.common.util.set.Sets;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.common.xcontent.XContentHelper;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.index.engine.Engine;
 import org.opensearch.index.query.QueryBuilders;

diff --git a/src/test/java/org/opensearch/jobscheduler/JobSchedulerPluginRestIT.java b/src/test/java/org/opensearch/jobscheduler/JobSchedulerPluginRestIT.java
@@ -12,7 +12,7 @@
 import org.opensearch.client.Request;
 import org.opensearch.client.Response;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.common.xcontent.json.JsonXContent;
 import org.opensearch.test.rest.OpenSearchRestTestCase;
 

diff --git a/src/test/java/org/opensearch/jobscheduler/scheduler/JobSchedulerTests.java b/src/test/java/org/opensearch/jobscheduler/scheduler/JobSchedulerTests.java
@@ -14,7 +14,7 @@
 import org.opensearch.jobscheduler.spi.schedule.CronSchedule;
 import org.opensearch.jobscheduler.spi.schedule.Schedule;
 import com.carrotsearch.randomizedtesting.RandomizedRunner;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.threadpool.Scheduler;
 import org.opensearch.threadpool.ThreadPool;

diff --git a/src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java b/src/test/java/org/opensearch/jobscheduler/sweeper/JobSweeperTests.java
@@ -39,7 +39,7 @@
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.index.Index;
 import org.opensearch.index.engine.Engine;
 import org.opensearch.index.mapper.ParseContext;