[Refactor] XContent base classes from xcontent to core library (#5902) (#6470)

Refactors the xcontent base classes from the xcontent module to the core
library so serializable xcontent contracts can be used across libraries.

Signed-off-by: Nicholas Walter Knize <[email protected]>

Author: nknize

buildSrc/src/main/java/org/opensearch/gradle/precommit/ThirdPartyAuditTask.java

@@ -106,6 +106,8 @@ public class ThirdPartyAuditTask extends DefaultTask {
 
     private final Property<JavaVersion> targetCompatibility = getProject().getObjects().property(JavaVersion.class);
 
+    public boolean jarHellEnabled = true;
+
     @Input
     public Property<JavaVersion> getTargetCompatibility() {
         return targetCompatibility;
@@ -234,7 +236,10 @@ public void runThirdPartyAudit() throws IOException {
             violationsClasses.add(violationMatcher.group(1));
         }
 
-        Set<String> jdkJarHellClasses = runJdkJarHellCheck();
+        Set<String> jdkJarHellClasses = null;
+        if (this.jarHellEnabled) {
+            jdkJarHellClasses = runJdkJarHellCheck();
+        }
 
         if (missingClassExcludes != null) {
             assertNoPointlessExclusions("are not missing", missingClassExcludes, missingClasses);
@@ -251,7 +256,9 @@ public void runThirdPartyAudit() throws IOException {
             missingClasses.removeAll(missingClassExcludes);
         }
         assertNoPointlessExclusions("have no violations", violationsExcludes, violationsClasses);
-        assertNoPointlessExclusions("do not generate jar hell with the JDK", jdkJarHellExcludes, jdkJarHellClasses);
+        if (this.jarHellEnabled) {
+            assertNoPointlessExclusions("do not generate jar hell with the JDK", jdkJarHellExcludes, jdkJarHellClasses);
+        }
 
         if (missingClassExcludes == null && (missingClasses.isEmpty() == false)) {
             getLogger().info("Found missing classes, but task is configured to ignore all of them:\n {}", formatClassList(missingClasses));
@@ -272,7 +279,9 @@ public void runThirdPartyAudit() throws IOException {
             throw new IllegalStateException("Audit of third party dependencies failed");
         }
 
-        assertNoJarHell(jdkJarHellClasses);
+        if (this.jarHellEnabled) {
+            assertNoJarHell(jdkJarHellClasses);
+        }
 
         // Mark successful third party audit check
         getSuccessMarker().getParentFile().mkdirs();

client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/bulk/RestNoopBulkAction.java

@@ -40,7 +40,7 @@
 import org.opensearch.action.update.UpdateResponse;
 import org.opensearch.client.Requests;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;

client/rest-high-level/src/main/java/org/opensearch/client/GetAliasesResponse.java

@@ -35,10 +35,10 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.cluster.metadata.AliasMetadata;
 import org.opensearch.common.xcontent.StatusToXContentObject;
-import org.opensearch.common.xcontent.ToXContent;
-import org.opensearch.common.xcontent.XContentBuilder;
-import org.opensearch.common.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentParser.Token;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
+import org.opensearch.core.xcontent.XContentParser.Token;
 import org.opensearch.rest.RestStatus;
 
 import java.io.IOException;

client/rest-high-level/src/main/java/org/opensearch/client/NodesResponse.java

@@ -32,8 +32,8 @@
 
 package org.opensearch.client;
 
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.ConstructingObjectParser;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ConstructingObjectParser;
 
 /**
  * Base class for responses that are node responses. These responses always contain the cluster

client/rest-high-level/src/main/java/org/opensearch/client/NodesResponseHeader.java

@@ -34,11 +34,11 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.action.support.nodes.BaseNodesResponse;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.ConstructingObjectParser;
-import org.opensearch.common.xcontent.ToXContent;
-import org.opensearch.common.xcontent.XContentBuilder;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ConstructingObjectParser;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.rest.action.RestActions;
 
 import java.io.IOException;

client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java

@@ -78,15 +78,15 @@
 import org.opensearch.common.lucene.uid.Versions;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.CollectionUtils;
-import org.opensearch.common.xcontent.DeprecationHandler;
-import org.opensearch.common.xcontent.MediaType;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.ToXContent;
-import org.opensearch.common.xcontent.XContent;
-import org.opensearch.common.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentHelper;
-import org.opensearch.common.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.xcontent.DeprecationHandler;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.MediaType;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.VersionType;
 import org.opensearch.index.mapper.MapperService;
 import org.opensearch.index.rankeval.RankEvalRequest;

client/rest-high-level/src/main/java/org/opensearch/client/RestHighLevelClient.java

@@ -85,11 +85,11 @@
 import org.opensearch.client.tasks.TaskSubmissionResponse;
 import org.opensearch.common.CheckedConsumer;
 import org.opensearch.common.CheckedFunction;
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.ContextParser;
-import org.opensearch.common.xcontent.DeprecationHandler;
-import org.opensearch.common.xcontent.NamedXContentRegistry;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ContextParser;
+import org.opensearch.core.xcontent.DeprecationHandler;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.index.rankeval.RankEvalRequest;
 import org.opensearch.index.rankeval.RankEvalResponse;

client/rest-high-level/src/main/java/org/opensearch/client/cluster/RemoteConnectionInfo.java

@@ -32,16 +32,16 @@
 
 package org.opensearch.client.cluster;
 
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.ConstructingObjectParser;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ConstructingObjectParser;
+import org.opensearch.core.xcontent.XContentParser;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
 
-import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
-import static org.opensearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
+import static org.opensearch.core.xcontent.ConstructingObjectParser.constructorArg;
+import static org.opensearch.core.xcontent.ConstructingObjectParser.optionalConstructorArg;
 
 /**
  * This class encapsulates all remote cluster information to be rendered on

client/rest-high-level/src/main/java/org/opensearch/client/cluster/RemoteInfoResponse.java

@@ -31,7 +31,7 @@
 
 package org.opensearch.client.cluster;
 
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.xcontent.XContentParser;
 
 import java.io.IOException;
 import java.util.ArrayList;

client/rest-high-level/src/main/java/org/opensearch/client/core/AcknowledgedResponse.java

@@ -32,15 +32,15 @@
 
 package org.opensearch.client.core;
 
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.ConstructingObjectParser;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ConstructingObjectParser;
+import org.opensearch.core.xcontent.XContentParser;
 
 import java.io.IOException;
 import java.util.Objects;
 import java.util.function.Function;
 
-import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
+import static org.opensearch.core.xcontent.ConstructingObjectParser.constructorArg;
 
 public class AcknowledgedResponse {
 

client/rest-high-level/src/main/java/org/opensearch/client/core/BroadcastResponse.java

@@ -33,9 +33,9 @@
 package org.opensearch.client.core;
 
 import org.opensearch.action.support.DefaultShardOperationFailedException;
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.ConstructingObjectParser;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ConstructingObjectParser;
+import org.opensearch.core.xcontent.XContentParser;
 
 import java.io.IOException;
 import java.util.Collection;

client/rest-high-level/src/main/java/org/opensearch/client/core/CountRequest.java

@@ -37,8 +37,8 @@
 import org.opensearch.action.IndicesRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.common.Strings;
-import org.opensearch.common.xcontent.ToXContentObject;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.ToXContentObject;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.search.builder.SearchSourceBuilder;
 import org.opensearch.search.internal.SearchContext;

client/rest-high-level/src/main/java/org/opensearch/client/core/CountResponse.java

@@ -33,8 +33,8 @@
 package org.opensearch.client.core;
 
 import org.opensearch.action.search.ShardSearchFailure;
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.rest.RestStatus;
 
 import java.io.IOException;

client/rest-high-level/src/main/java/org/opensearch/client/core/GetSourceResponse.java

@@ -32,7 +32,7 @@
 
 package org.opensearch.client.core;
 
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.xcontent.XContentParser;
 
 import java.io.IOException;
 import java.util.Map;

client/rest-high-level/src/main/java/org/opensearch/client/core/IndexerJobStats.java

@@ -32,7 +32,7 @@
 
 package org.opensearch.client.core;
 
-import org.opensearch.common.ParseField;
+import org.opensearch.core.ParseField;
 
 import java.util.Objects;
 

client/rest-high-level/src/main/java/org/opensearch/client/core/MainResponse.java

@@ -32,9 +32,9 @@
 
 package org.opensearch.client.core;
 
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.ConstructingObjectParser;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ConstructingObjectParser;
+import org.opensearch.core.xcontent.XContentParser;
 
 import java.util.Objects;
 

client/rest-high-level/src/main/java/org/opensearch/client/core/MultiTermVectorsRequest.java

@@ -33,8 +33,8 @@
 package org.opensearch.client.core;
 
 import org.opensearch.client.Validatable;
-import org.opensearch.common.xcontent.ToXContentObject;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.ToXContentObject;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.util.ArrayList;

client/rest-high-level/src/main/java/org/opensearch/client/core/MultiTermVectorsResponse.java

@@ -32,14 +32,14 @@
 
 package org.opensearch.client.core;
 
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.ConstructingObjectParser;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ConstructingObjectParser;
+import org.opensearch.core.xcontent.XContentParser;
 
 import java.util.List;
 import java.util.Objects;
 
-import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
+import static org.opensearch.core.xcontent.ConstructingObjectParser.constructorArg;
 
 public class MultiTermVectorsResponse {
     private final List<TermVectorsResponse> responses;

client/rest-high-level/src/main/java/org/opensearch/client/core/PageParams.java

@@ -32,10 +32,10 @@
 package org.opensearch.client.core;
 
 import org.opensearch.common.Nullable;
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.ConstructingObjectParser;
-import org.opensearch.common.xcontent.ToXContentObject;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ConstructingObjectParser;
+import org.opensearch.core.xcontent.ToXContentObject;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.util.Objects;

client/rest-high-level/src/main/java/org/opensearch/client/core/ShardsAcknowledgedResponse.java

@@ -31,13 +31,13 @@
 
 package org.opensearch.client.core;
 
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.ConstructingObjectParser;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ConstructingObjectParser;
+import org.opensearch.core.xcontent.XContentParser;
 
 import java.io.IOException;
 
-import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
+import static org.opensearch.core.xcontent.ConstructingObjectParser.constructorArg;
 
 public class ShardsAcknowledgedResponse extends AcknowledgedResponse {
 

client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsRequest.java

@@ -35,8 +35,8 @@
 import org.opensearch.client.Validatable;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.bytes.BytesReference;
-import org.opensearch.common.xcontent.ToXContentObject;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.ToXContentObject;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.io.InputStream;

client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsResponse.java

@@ -33,11 +33,11 @@
 package org.opensearch.client.core;
 
 import org.opensearch.common.Nullable;
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.ConstructingObjectParser;
-import org.opensearch.common.xcontent.XContentParser;
-import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
-import static org.opensearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ConstructingObjectParser;
+import org.opensearch.core.xcontent.XContentParser;
+import static org.opensearch.core.xcontent.ConstructingObjectParser.constructorArg;
+import static org.opensearch.core.xcontent.ConstructingObjectParser.optionalConstructorArg;
 
 import java.util.Collections;
 import java.util.List;

client/rest-high-level/src/main/java/org/opensearch/client/indices/AnalyzeRequest.java

@@ -35,9 +35,9 @@
 import org.opensearch.client.Validatable;
 import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.xcontent.ToXContentFragment;
-import org.opensearch.common.xcontent.ToXContentObject;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.ToXContentFragment;
+import org.opensearch.core.xcontent.ToXContentObject;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.util.ArrayList;

client/rest-high-level/src/main/java/org/opensearch/client/indices/AnalyzeResponse.java

@@ -32,18 +32,18 @@
 
 package org.opensearch.client.indices;
 
-import org.opensearch.common.ParseField;
-import org.opensearch.common.xcontent.ConstructingObjectParser;
-import org.opensearch.common.xcontent.ObjectParser;
-import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.xcontent.ConstructingObjectParser;
+import org.opensearch.core.xcontent.ObjectParser;
+import org.opensearch.core.xcontent.XContentParser;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import static org.opensearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
+import static org.opensearch.core.xcontent.ConstructingObjectParser.optionalConstructorArg;
 
 public class AnalyzeResponse {