Skip to content

Commit 4766c7f

Browse files
kaituojackiehanyang
kaituo
and
jackiehanyang
authored
Xcontent backport (#854)
* Update xcontent imports (#822) Signed-off-by: Jackie Han <[email protected]> Signed-off-by: Kaituo Li <[email protected]> * Publish snapshots to maven via GHA, fix spotless errors, and bump bwc version (#827) We are de-coupling the task of publishing the maven snapshots from centralized build workflow to individual repositories. This PR publishes maven snapshots using GitHub Actions. Testing done: 1. ran ./gradlew publishPluginZipPublicationToSnapshotsRepository according to #813 Signed-off-by: Kaituo Li <[email protected]> * fix xcontent compiler error for classes only in 2.x Signed-off-by: Kaituo Li <[email protected]> --------- Signed-off-by: Jackie Han <[email protected]> Signed-off-by: Kaituo Li <[email protected]> Co-authored-by: Jackie Han <[email protected]>
1 parent 4358d43 commit 4766c7f

File tree

162 files changed

+364
-315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+364
-315
lines changed

‎.github/workflows/maven-publish.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Publish snapshots to maven
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- 'main'
8+
- '1.*'
9+
- '2.*'
10+
11+
jobs:
12+
build-and-publish-snapshots:
13+
strategy:
14+
fail-fast: false
15+
if: github.repository == 'opensearch-project/anomaly-detection'
16+
runs-on: ubuntu-latest
17+
18+
permissions:
19+
id-token: write
20+
contents: write
21+
22+
steps:
23+
- uses: actions/setup-java@v3
24+
with:
25+
distribution: temurin # Temurin is a distribution of adoptium
26+
java-version: 17
27+
- uses: actions/checkout@v3
28+
- uses: aws-actions/[email protected]
29+
with:
30+
role-to-assume: ${{ secrets.PUBLISH_SNAPSHOTS_ROLE }}
31+
aws-region: us-east-1
32+
- name: publish snapshots to maven
33+
run: |
34+
export SONATYPE_USERNAME=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-username --query SecretString --output text)
35+
export SONATYPE_PASSWORD=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-password --query SecretString --output text)
36+
echo "::add-mask::$SONATYPE_USERNAME"
37+
echo "::add-mask::$SONATYPE_PASSWORD"
38+
./gradlew publishPluginZipPublicationToSnapshotsRepository

‎build.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,17 @@ publishing {
176176
}
177177
}
178178
}
179+
180+
repositories {
181+
maven {
182+
name = "Snapshots"
183+
url = "https://aws.oss.sonatype.org/content/repositories/snapshots"
184+
credentials {
185+
username "$System.env.SONATYPE_USERNAME"
186+
password "$System.env.SONATYPE_PASSWORD"
187+
}
188+
}
189+
}
179190
}
180191

181192
tasks.named('forbiddenApisMain').configure {

‎src/main/java/org/opensearch/ad/AnomalyDetectorJobRunner.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@
4949
import org.opensearch.client.Client;
5050
import org.opensearch.common.settings.Settings;
5151
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
52-
import org.opensearch.common.xcontent.NamedXContentRegistry;
53-
import org.opensearch.common.xcontent.XContentBuilder;
54-
import org.opensearch.common.xcontent.XContentParser;
5552
import org.opensearch.common.xcontent.XContentType;
5653
import org.opensearch.commons.InjectSecurity;
5754
import org.opensearch.commons.authuser.User;
55+
import org.opensearch.core.xcontent.NamedXContentRegistry;
56+
import org.opensearch.core.xcontent.XContentBuilder;
57+
import org.opensearch.core.xcontent.XContentParser;
5858
import org.opensearch.jobscheduler.spi.JobExecutionContext;
5959
import org.opensearch.jobscheduler.spi.LockModel;
6060
import org.opensearch.jobscheduler.spi.ScheduledJobParameter;

‎src/main/java/org/opensearch/ad/AnomalyDetectorPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@
175175
import org.opensearch.common.settings.SettingsFilter;
176176
import org.opensearch.common.unit.TimeValue;
177177
import org.opensearch.common.util.concurrent.OpenSearchExecutors;
178-
import org.opensearch.common.xcontent.NamedXContentRegistry;
179-
import org.opensearch.common.xcontent.XContentParser;
180178
import org.opensearch.common.xcontent.XContentParserUtils;
179+
import org.opensearch.core.xcontent.NamedXContentRegistry;
180+
import org.opensearch.core.xcontent.XContentParser;
181181
import org.opensearch.env.Environment;
182182
import org.opensearch.env.NodeEnvironment;
183183
import org.opensearch.jobscheduler.spi.JobSchedulerExtension;

‎src/main/java/org/opensearch/ad/AnomalyDetectorProfileRunner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
import org.opensearch.client.Client;
6262
import org.opensearch.cluster.node.DiscoveryNode;
6363
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
64-
import org.opensearch.common.xcontent.NamedXContentRegistry;
65-
import org.opensearch.common.xcontent.XContentParser;
6664
import org.opensearch.common.xcontent.XContentType;
65+
import org.opensearch.core.xcontent.NamedXContentRegistry;
66+
import org.opensearch.core.xcontent.XContentParser;
6767
import org.opensearch.search.SearchHits;
6868
import org.opensearch.search.aggregations.Aggregation;
6969
import org.opensearch.search.aggregations.AggregationBuilder;

‎src/main/java/org/opensearch/ad/EntityProfileRunner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
import org.opensearch.client.Client;
4949
import org.opensearch.cluster.routing.Preference;
5050
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
51-
import org.opensearch.common.xcontent.NamedXContentRegistry;
52-
import org.opensearch.common.xcontent.XContentParser;
5351
import org.opensearch.common.xcontent.XContentType;
52+
import org.opensearch.core.xcontent.NamedXContentRegistry;
53+
import org.opensearch.core.xcontent.XContentParser;
5454
import org.opensearch.index.IndexNotFoundException;
5555
import org.opensearch.index.query.BoolQueryBuilder;
5656
import org.opensearch.index.query.NestedQueryBuilder;

‎src/main/java/org/opensearch/ad/NodeStateManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
import org.opensearch.common.settings.Settings;
4646
import org.opensearch.common.unit.TimeValue;
4747
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
48-
import org.opensearch.common.xcontent.NamedXContentRegistry;
49-
import org.opensearch.common.xcontent.XContentParser;
5048
import org.opensearch.common.xcontent.XContentType;
49+
import org.opensearch.core.xcontent.NamedXContentRegistry;
50+
import org.opensearch.core.xcontent.XContentParser;
5151

5252
/**
5353
* NodeStateManager is used to manage states shared by transport and ml components

‎src/main/java/org/opensearch/ad/cluster/ADDataMigrator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
import org.opensearch.ad.util.ExceptionUtil;
5252
import org.opensearch.client.Client;
5353
import org.opensearch.cluster.service.ClusterService;
54-
import org.opensearch.common.xcontent.NamedXContentRegistry;
5554
import org.opensearch.common.xcontent.XContentFactory;
56-
import org.opensearch.common.xcontent.XContentParser;
55+
import org.opensearch.core.xcontent.NamedXContentRegistry;
56+
import org.opensearch.core.xcontent.XContentParser;
5757
import org.opensearch.index.IndexNotFoundException;
5858
import org.opensearch.index.query.BoolQueryBuilder;
5959
import org.opensearch.index.query.MatchAllQueryBuilder;

‎src/main/java/org/opensearch/ad/feature/CompositeRetriever.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
3838
import org.opensearch.cluster.service.ClusterService;
3939
import org.opensearch.common.settings.Settings;
40-
import org.opensearch.common.xcontent.NamedXContentRegistry;
40+
import org.opensearch.core.xcontent.NamedXContentRegistry;
4141
import org.opensearch.index.IndexNotFoundException;
4242
import org.opensearch.index.query.BoolQueryBuilder;
4343
import org.opensearch.index.query.RangeQueryBuilder;

‎src/main/java/org/opensearch/ad/feature/SearchFeatureDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
import org.opensearch.client.Client;
5252
import org.opensearch.cluster.service.ClusterService;
5353
import org.opensearch.common.settings.Settings;
54-
import org.opensearch.common.xcontent.NamedXContentRegistry;
54+
import org.opensearch.core.xcontent.NamedXContentRegistry;
5555
import org.opensearch.index.query.BoolQueryBuilder;
5656
import org.opensearch.index.query.QueryBuilders;
5757
import org.opensearch.index.query.RangeQueryBuilder;

‎src/main/java/org/opensearch/ad/indices/AnomalyDetectionIndices.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@
7979
import org.opensearch.common.settings.Settings;
8080
import org.opensearch.common.unit.TimeValue;
8181
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
82-
import org.opensearch.common.xcontent.NamedXContentRegistry;
83-
import org.opensearch.common.xcontent.ToXContent;
84-
import org.opensearch.common.xcontent.XContentBuilder;
8582
import org.opensearch.common.xcontent.XContentHelper;
86-
import org.opensearch.common.xcontent.XContentParser;
87-
import org.opensearch.common.xcontent.XContentParser.Token;
8883
import org.opensearch.common.xcontent.XContentType;
8984
import org.opensearch.commons.InjectSecurity;
85+
import org.opensearch.core.xcontent.NamedXContentRegistry;
86+
import org.opensearch.core.xcontent.ToXContent;
87+
import org.opensearch.core.xcontent.XContentBuilder;
88+
import org.opensearch.core.xcontent.XContentParser;
89+
import org.opensearch.core.xcontent.XContentParser.Token;
9090
import org.opensearch.index.IndexNotFoundException;
9191
import org.opensearch.threadpool.Scheduler;
9292
import org.opensearch.threadpool.ThreadPool;

‎src/main/java/org/opensearch/ad/model/ADEntityTaskProfile.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.opensearch.common.io.stream.StreamInput;
2020
import org.opensearch.common.io.stream.StreamOutput;
2121
import org.opensearch.common.io.stream.Writeable;
22-
import org.opensearch.common.xcontent.ToXContentObject;
23-
import org.opensearch.common.xcontent.XContentBuilder;
24-
import org.opensearch.common.xcontent.XContentParser;
22+
import org.opensearch.core.xcontent.ToXContentObject;
23+
import org.opensearch.core.xcontent.XContentBuilder;
24+
import org.opensearch.core.xcontent.XContentParser;
2525

2626
/**
2727
* HC detector's entity task profile.

‎src/main/java/org/opensearch/ad/model/ADTask.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import org.opensearch.common.io.stream.StreamInput;
2323
import org.opensearch.common.io.stream.StreamOutput;
2424
import org.opensearch.common.io.stream.Writeable;
25-
import org.opensearch.common.xcontent.ToXContentObject;
26-
import org.opensearch.common.xcontent.XContentBuilder;
27-
import org.opensearch.common.xcontent.XContentParser;
2825
import org.opensearch.commons.authuser.User;
26+
import org.opensearch.core.xcontent.ToXContentObject;
27+
import org.opensearch.core.xcontent.XContentBuilder;
28+
import org.opensearch.core.xcontent.XContentParser;
2929

3030
import com.google.common.base.Objects;
3131

‎src/main/java/org/opensearch/ad/model/ADTaskProfile.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import org.opensearch.common.io.stream.StreamInput;
2525
import org.opensearch.common.io.stream.StreamOutput;
2626
import org.opensearch.common.io.stream.Writeable;
27-
import org.opensearch.common.xcontent.ToXContentObject;
28-
import org.opensearch.common.xcontent.XContentBuilder;
29-
import org.opensearch.common.xcontent.XContentParser;
27+
import org.opensearch.core.xcontent.ToXContentObject;
28+
import org.opensearch.core.xcontent.XContentBuilder;
29+
import org.opensearch.core.xcontent.XContentParser;
3030

3131
/**
3232
* One anomaly detection task means one detector starts to run until stopped.

‎src/main/java/org/opensearch/ad/model/AnomalyDetector.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@
3939
import org.opensearch.ad.settings.AnomalyDetectorSettings;
4040
import org.opensearch.ad.settings.NumericSetting;
4141
import org.opensearch.ad.util.ParseUtils;
42-
import org.opensearch.common.ParseField;
4342
import org.opensearch.common.ParsingException;
4443
import org.opensearch.common.io.stream.StreamInput;
4544
import org.opensearch.common.io.stream.StreamOutput;
4645
import org.opensearch.common.io.stream.Writeable;
4746
import org.opensearch.common.unit.TimeValue;
48-
import org.opensearch.common.xcontent.NamedXContentRegistry;
49-
import org.opensearch.common.xcontent.ToXContent;
50-
import org.opensearch.common.xcontent.ToXContentObject;
51-
import org.opensearch.common.xcontent.XContentBuilder;
52-
import org.opensearch.common.xcontent.XContentParseException;
53-
import org.opensearch.common.xcontent.XContentParser;
5447
import org.opensearch.commons.authuser.User;
48+
import org.opensearch.core.ParseField;
49+
import org.opensearch.core.xcontent.NamedXContentRegistry;
50+
import org.opensearch.core.xcontent.ToXContent;
51+
import org.opensearch.core.xcontent.ToXContentObject;
52+
import org.opensearch.core.xcontent.XContentBuilder;
53+
import org.opensearch.core.xcontent.XContentParseException;
54+
import org.opensearch.core.xcontent.XContentParser;
5555
import org.opensearch.index.query.QueryBuilder;
5656
import org.opensearch.index.query.QueryBuilders;
5757

‎src/main/java/org/opensearch/ad/model/AnomalyDetectorExecutionInput.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import org.opensearch.ad.annotation.Generated;
2020
import org.opensearch.ad.util.ParseUtils;
2121
import org.opensearch.common.Strings;
22-
import org.opensearch.common.xcontent.ToXContentObject;
23-
import org.opensearch.common.xcontent.XContentBuilder;
24-
import org.opensearch.common.xcontent.XContentParser;
22+
import org.opensearch.core.xcontent.ToXContentObject;
23+
import org.opensearch.core.xcontent.XContentBuilder;
24+
import org.opensearch.core.xcontent.XContentParser;
2525

2626
import com.google.common.base.Objects;
2727

‎src/main/java/org/opensearch/ad/model/AnomalyDetectorJob.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
import java.time.Instant;
1919

2020
import org.opensearch.ad.util.ParseUtils;
21-
import org.opensearch.common.ParseField;
2221
import org.opensearch.common.io.stream.StreamInput;
2322
import org.opensearch.common.io.stream.StreamOutput;
2423
import org.opensearch.common.io.stream.Writeable;
25-
import org.opensearch.common.xcontent.NamedXContentRegistry;
26-
import org.opensearch.common.xcontent.ToXContentObject;
27-
import org.opensearch.common.xcontent.XContentBuilder;
28-
import org.opensearch.common.xcontent.XContentParser;
2924
import org.opensearch.commons.authuser.User;
25+
import org.opensearch.core.ParseField;
26+
import org.opensearch.core.xcontent.NamedXContentRegistry;
27+
import org.opensearch.core.xcontent.ToXContentObject;
28+
import org.opensearch.core.xcontent.XContentBuilder;
29+
import org.opensearch.core.xcontent.XContentParser;
3030
import org.opensearch.jobscheduler.spi.ScheduledJobParameter;
3131
import org.opensearch.jobscheduler.spi.schedule.CronSchedule;
3232
import org.opensearch.jobscheduler.spi.schedule.IntervalSchedule;

‎src/main/java/org/opensearch/ad/model/AnomalyResult.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
import org.opensearch.ad.constant.CommonValue;
3030
import org.opensearch.ad.ml.ThresholdingResult;
3131
import org.opensearch.ad.util.ParseUtils;
32-
import org.opensearch.common.ParseField;
3332
import org.opensearch.common.io.stream.StreamInput;
3433
import org.opensearch.common.io.stream.StreamOutput;
3534
import org.opensearch.common.io.stream.Writeable;
36-
import org.opensearch.common.xcontent.NamedXContentRegistry;
37-
import org.opensearch.common.xcontent.ToXContentObject;
38-
import org.opensearch.common.xcontent.XContentBuilder;
39-
import org.opensearch.common.xcontent.XContentParser;
4035
import org.opensearch.commons.authuser.User;
36+
import org.opensearch.core.ParseField;
37+
import org.opensearch.core.xcontent.NamedXContentRegistry;
38+
import org.opensearch.core.xcontent.ToXContentObject;
39+
import org.opensearch.core.xcontent.XContentBuilder;
40+
import org.opensearch.core.xcontent.XContentParser;
4141

4242
import com.google.common.base.Objects;
4343

‎src/main/java/org/opensearch/ad/model/AnomalyResultBucket.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import org.opensearch.common.io.stream.StreamInput;
2020
import org.opensearch.common.io.stream.StreamOutput;
2121
import org.opensearch.common.io.stream.Writeable;
22-
import org.opensearch.common.xcontent.ToXContentObject;
23-
import org.opensearch.common.xcontent.XContentBuilder;
22+
import org.opensearch.core.xcontent.ToXContentObject;
23+
import org.opensearch.core.xcontent.XContentBuilder;
2424
import org.opensearch.search.aggregations.bucket.composite.CompositeAggregation.Bucket;
2525
import org.opensearch.search.aggregations.metrics.InternalMax;
2626

‎src/main/java/org/opensearch/ad/model/DataByFeatureId.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
import org.opensearch.common.io.stream.StreamInput;
1919
import org.opensearch.common.io.stream.StreamOutput;
2020
import org.opensearch.common.io.stream.Writeable;
21-
import org.opensearch.common.xcontent.ToXContent.Params;
22-
import org.opensearch.common.xcontent.ToXContentObject;
23-
import org.opensearch.common.xcontent.XContentBuilder;
24-
import org.opensearch.common.xcontent.XContentParser;
21+
import org.opensearch.core.xcontent.ToXContent.Params;
22+
import org.opensearch.core.xcontent.ToXContentObject;
23+
import org.opensearch.core.xcontent.XContentBuilder;
24+
import org.opensearch.core.xcontent.XContentParser;
2525

2626
import com.google.common.base.Objects;
2727

‎src/main/java/org/opensearch/ad/model/DetectionDateRange.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.opensearch.common.io.stream.StreamInput;
2323
import org.opensearch.common.io.stream.StreamOutput;
2424
import org.opensearch.common.io.stream.Writeable;
25-
import org.opensearch.common.xcontent.ToXContentObject;
26-
import org.opensearch.common.xcontent.XContentBuilder;
27-
import org.opensearch.common.xcontent.XContentParser;
25+
import org.opensearch.core.xcontent.ToXContentObject;
26+
import org.opensearch.core.xcontent.XContentBuilder;
27+
import org.opensearch.core.xcontent.XContentParser;
2828

2929
import com.google.common.base.Objects;
3030

‎src/main/java/org/opensearch/ad/model/DetectorInternalState.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
import org.opensearch.ad.annotation.Generated;
2020
import org.opensearch.ad.util.ParseUtils;
21-
import org.opensearch.common.ParseField;
22-
import org.opensearch.common.xcontent.NamedXContentRegistry;
23-
import org.opensearch.common.xcontent.ToXContentObject;
24-
import org.opensearch.common.xcontent.XContentBuilder;
25-
import org.opensearch.common.xcontent.XContentParser;
21+
import org.opensearch.core.ParseField;
22+
import org.opensearch.core.xcontent.NamedXContentRegistry;
23+
import org.opensearch.core.xcontent.ToXContentObject;
24+
import org.opensearch.core.xcontent.XContentBuilder;
25+
import org.opensearch.core.xcontent.XContentParser;
2626

2727
import com.google.common.base.Objects;
2828

‎src/main/java/org/opensearch/ad/model/DetectorProfile.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import org.opensearch.common.io.stream.StreamInput;
2121
import org.opensearch.common.io.stream.StreamOutput;
2222
import org.opensearch.common.io.stream.Writeable;
23-
import org.opensearch.common.xcontent.ToXContent;
24-
import org.opensearch.common.xcontent.ToXContentObject;
25-
import org.opensearch.common.xcontent.XContentBuilder;
23+
import org.opensearch.core.xcontent.ToXContent;
24+
import org.opensearch.core.xcontent.ToXContentObject;
25+
import org.opensearch.core.xcontent.XContentBuilder;
2626

2727
public class DetectorProfile implements Writeable, ToXContentObject, Mergeable {
2828
private DetectorState state;

‎src/main/java/org/opensearch/ad/model/DetectorValidationIssue.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import org.opensearch.common.io.stream.StreamInput;
1818
import org.opensearch.common.io.stream.StreamOutput;
1919
import org.opensearch.common.io.stream.Writeable;
20-
import org.opensearch.common.xcontent.ToXContentObject;
21-
import org.opensearch.common.xcontent.XContentBuilder;
20+
import org.opensearch.core.xcontent.ToXContentObject;
21+
import org.opensearch.core.xcontent.XContentBuilder;
2222

2323
import com.google.common.base.Objects;
2424

‎src/main/java/org/opensearch/ad/model/Entity.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
import org.opensearch.common.io.stream.StreamOutput;
3636
import org.opensearch.common.io.stream.Writeable;
3737
import org.opensearch.common.xcontent.LoggingDeprecationHandler;
38-
import org.opensearch.common.xcontent.NamedXContentRegistry;
39-
import org.opensearch.common.xcontent.ToXContentObject;
40-
import org.opensearch.common.xcontent.XContentBuilder;
41-
import org.opensearch.common.xcontent.XContentParser;
42-
import org.opensearch.common.xcontent.XContentParser.Token;
4338
import org.opensearch.common.xcontent.json.JsonXContent;
39+
import org.opensearch.core.xcontent.NamedXContentRegistry;
40+
import org.opensearch.core.xcontent.ToXContentObject;
41+
import org.opensearch.core.xcontent.XContentBuilder;
42+
import org.opensearch.core.xcontent.XContentParser;
43+
import org.opensearch.core.xcontent.XContentParser.Token;
4444
import org.opensearch.index.query.TermQueryBuilder;
4545

4646
import com.google.common.base.Joiner;

0 commit comments

Comments
 (0)