Skip to content

Commit d8dac3d

Browse files
committed
fix xcontent compiler error for classes only in 2.x
Signed-off-by: Kaituo Li <[email protected]>
1 parent 278b916 commit d8dac3d

7 files changed

+14
-14
lines changed

src/test/java/org/opensearch/EntityProfileRequest1_0.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.opensearch.common.Strings;
2626
import org.opensearch.common.io.stream.StreamInput;
2727
import org.opensearch.common.io.stream.StreamOutput;
28-
import org.opensearch.common.xcontent.ToXContentObject;
29-
import org.opensearch.common.xcontent.XContentBuilder;
28+
import org.opensearch.core.xcontent.ToXContentObject;
29+
import org.opensearch.core.xcontent.XContentBuilder;
3030

3131
public class EntityProfileRequest1_0 extends ActionRequest implements ToXContentObject {
3232
public static final String ENTITY = "entity";

src/test/java/org/opensearch/EntityProfileResponse1_0.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.opensearch.ad.constant.CommonName;
2222
import org.opensearch.common.io.stream.StreamInput;
2323
import org.opensearch.common.io.stream.StreamOutput;
24-
import org.opensearch.common.xcontent.ToXContentObject;
25-
import org.opensearch.common.xcontent.XContentBuilder;
24+
import org.opensearch.core.xcontent.ToXContentObject;
25+
import org.opensearch.core.xcontent.XContentBuilder;
2626

2727
public class EntityProfileResponse1_0 extends ActionResponse implements ToXContentObject {
2828
public static final String ACTIVE = "active";

src/test/java/org/opensearch/EntityResultRequest1_0.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.opensearch.common.Strings;
2525
import org.opensearch.common.io.stream.StreamInput;
2626
import org.opensearch.common.io.stream.StreamOutput;
27-
import org.opensearch.common.xcontent.ToXContentObject;
28-
import org.opensearch.common.xcontent.XContentBuilder;
27+
import org.opensearch.core.xcontent.ToXContentObject;
28+
import org.opensearch.core.xcontent.XContentBuilder;
2929

3030
public class EntityResultRequest1_0 extends ActionRequest implements ToXContentObject {
3131

src/test/java/org/opensearch/ModelProfile1_0.java

+2-2
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.ToXContent;
23-
import org.opensearch.common.xcontent.XContentBuilder;
22+
import org.opensearch.core.xcontent.ToXContent;
23+
import org.opensearch.core.xcontent.XContentBuilder;
2424

2525
public class ModelProfile1_0 implements Writeable, ToXContent {
2626
// field name in toXContent

src/test/java/org/opensearch/ProfileNodeResponse1_0.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import org.opensearch.cluster.node.DiscoveryNode;
2020
import org.opensearch.common.io.stream.StreamInput;
2121
import org.opensearch.common.io.stream.StreamOutput;
22-
import org.opensearch.common.xcontent.ToXContentFragment;
23-
import org.opensearch.common.xcontent.XContentBuilder;
22+
import org.opensearch.core.xcontent.ToXContentFragment;
23+
import org.opensearch.core.xcontent.XContentBuilder;
2424

2525
/**
2626
* Profile response on a node

src/test/java/org/opensearch/ProfileResponse1_0.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.opensearch.cluster.ClusterName;
2323
import org.opensearch.common.io.stream.StreamInput;
2424
import org.opensearch.common.io.stream.StreamOutput;
25-
import org.opensearch.common.xcontent.ToXContentFragment;
26-
import org.opensearch.common.xcontent.XContentBuilder;
25+
import org.opensearch.core.xcontent.ToXContentFragment;
26+
import org.opensearch.core.xcontent.XContentBuilder;
2727

2828
/**
2929
* This class consists of the aggregated responses from the nodes

src/test/java/org/opensearch/RCFResultResponse1_0.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import org.opensearch.action.ActionResponse;
1717
import org.opensearch.common.io.stream.StreamInput;
1818
import org.opensearch.common.io.stream.StreamOutput;
19-
import org.opensearch.common.xcontent.ToXContentObject;
20-
import org.opensearch.common.xcontent.XContentBuilder;
19+
import org.opensearch.core.xcontent.ToXContentObject;
20+
import org.opensearch.core.xcontent.XContentBuilder;
2121

2222
public class RCFResultResponse1_0 extends ActionResponse implements ToXContentObject {
2323
public static final String RCF_SCORE_JSON_KEY = "rcfScore";

0 commit comments

Comments
 (0)