Apache Solr open-source search software
SOLR-16391: Convert create-core, core-status to JAX-RS (#3054)
Jason Gerlowski5fafabdb13d6
diff --git a/solr/api/build.gradle b/solr/api/build.gradleindex 9550e53e13a..685b561da12 100644--- a/solr/api/build.gradle+++ b/solr/api/build.gradle@@ -64,7 +64,7 @@ dependencies {runtimeOnly libs.slf4j.apiimplementation libs.jakarta.ws.rsapi- implementation libs.fasterxml.jackson.core.annotations+ api libs.fasterxml.jackson.core.annotationsapi libs.swagger3.annotations.jakartaimplementation libs.semver4j.semver4jdiff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfileindex 23109570359..5035e4c86a3 100644--- a/solr/api/gradle.lockfile+++ b/solr/api/gradle.lockfile@@ -4,7 +4,7 @@com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=jarValidation,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-annotations:2.16.2=swaggerDeps-com.fasterxml.jackson.core:jackson-annotations:2.18.2=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.16.2=swaggerDepscom.fasterxml.jackson.core:jackson-core:2.18.2=jarValidation,swaggerBuild,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.16.2=swaggerDeps@@ -22,7 +22,7 @@ com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.16.2=swaggerDepscom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=jarValidation,swaggerBuild,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.16.2=swaggerDepscom.fasterxml.jackson:jackson-bom:2.16.2=swaggerDeps-com.fasterxml.jackson:jackson-bom:2.18.2=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/api/src/java/org/apache/solr/client/api/endpoint/CoreApis.java b/solr/api/src/java/org/apache/solr/client/api/endpoint/CoreApis.javanew file mode 100644index 00000000000..306e9136797--- /dev/null+++ b/solr/api/src/java/org/apache/solr/client/api/endpoint/CoreApis.java@@ -0,0 +1,56 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.apache.solr.client.api.endpoint;++import io.swagger.v3.oas.annotations.Operation;+import jakarta.ws.rs.GET;+import jakarta.ws.rs.POST;+import jakarta.ws.rs.Path;+import jakarta.ws.rs.PathParam;+import jakarta.ws.rs.QueryParam;+import org.apache.solr.client.api.model.CoreStatusResponse;+import org.apache.solr.client.api.model.CreateCoreParams;+import org.apache.solr.client.api.model.CreateCoreResponse;++public interface CoreApis {++ /** V2 API definition for creating a core on the receiving Solr node */+ @Path("/cores")+ interface Create {+ @POST+ @Operation(summary = "Create a new core on the receiving Solr node.", tags = "cores")+ CreateCoreResponse createCore(CreateCoreParams requestBody) throws Exception;+ }++ @Path("/cores")+ interface GetStatus {++ @GET+ @Operation(summary = "Fetch status info for all cores hosted on this node.", tags = "cores")+ CoreStatusResponse getAllCoreStatus(@QueryParam("indexInfo") Boolean indexInfo)+ throws Exception;++ @GET+ @Operation(+ summary = "Fetch status info for the core hosted on this node with the specified name.",+ tags = "cores")+ @Path("/{coreName}")+ CoreStatusResponse getCoreStatus(+ @PathParam("coreName") String coreName, @QueryParam("indexInfo") Boolean indexInfo)+ throws Exception;+ }+}diff --git a/solr/api/src/java/org/apache/solr/client/api/model/CoreStatusResponse.java b/solr/api/src/java/org/apache/solr/client/api/model/CoreStatusResponse.javanew file mode 100644index 00000000000..6d92390bae6--- /dev/null+++ b/solr/api/src/java/org/apache/solr/client/api/model/CoreStatusResponse.java@@ -0,0 +1,71 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.apache.solr.client.api.model;++import com.fasterxml.jackson.annotation.JsonProperty;+import java.util.Date;+import java.util.Map;++public class CoreStatusResponse extends SolrJerseyResponse {++ // Map values are often exceptions on the server side, but often serialized as strings.+ @JsonProperty public Map<String, Object> initFailures;++ @JsonProperty public Map<String, SingleCoreData> status;++ public static class SingleCoreData {+ @JsonProperty public String name;++ @JsonProperty public Boolean isLoaded;+ @JsonProperty public Boolean isLoading;++ @JsonProperty public String instanceDir;+ @JsonProperty public String dataDir;+ @JsonProperty public String config;+ @JsonProperty public String schema;+ @JsonProperty public Date startTime;+ @JsonProperty public Long uptime;+ @JsonProperty public String lastPublished;+ @JsonProperty public Integer configVersion;+ @JsonProperty public CloudDetails cloud;+ @JsonProperty public IndexDetails index;+ }++ public static class CloudDetails {+ @JsonProperty public String collection;+ @JsonProperty public String shard;+ @JsonProperty public String replica;+ @JsonProperty public String replicaType; // TODO enum?+ }++ public static class IndexDetails {+ @JsonProperty public Integer numDocs;+ @JsonProperty public Integer maxDoc;+ @JsonProperty public Integer deletedDocs;+ @JsonProperty public Long version;+ @JsonProperty public Integer segmentCount;+ @JsonProperty public Boolean current;+ @JsonProperty public Boolean hasDeletions;+ @JsonProperty public String directory;+ @JsonProperty public String segmentsFile;+ @JsonProperty public Long segmentsFileSizeInBytes;+ @JsonProperty public Map<String, String> userData;+ @JsonProperty public Date lastModified;+ @JsonProperty public Long sizeInBytes;+ @JsonProperty public String size; // Human readable representation of 'sizeInBytes'+ }+}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/CreateCorePayload.java b/solr/api/src/java/org/apache/solr/client/api/model/CreateCoreParams.javasimilarity index 71%rename from solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/CreateCorePayload.javarename to solr/api/src/java/org/apache/solr/client/api/model/CreateCoreParams.javaindex ff4a1a6425a..49de4b7fd5a 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/CreateCorePayload.java+++ b/solr/api/src/java/org/apache/solr/client/api/model/CreateCoreParams.java@@ -14,15 +14,14 @@* See the License for the specific language governing permissions and* limitations under the License.*/+package org.apache.solr.client.api.model;-package org.apache.solr.client.solrj.request.beans;-+import com.fasterxml.jackson.annotation.JsonProperty;+import io.swagger.v3.oas.annotations.media.Schema;import java.util.List;import java.util.Map;-import org.apache.solr.common.annotation.JsonProperty;-import org.apache.solr.common.util.ReflectMapWriter;-public class CreateCorePayload implements ReflectMapWriter {+public class CreateCoreParams {@JsonProperty(required = true)public String name;@@ -40,21 +39,21 @@ public class CreateCorePayload implements ReflectMapWriter {@JsonProperty public Boolean loadOnStartup;- // If our JsonProperty clone was more feature-rich here we could specify the property be called- // 'transient', but without that support it needs to be named something else to avoid conflicting- // with the 'transient' keyword in Java- @JsonProperty public Boolean isTransient;+ @Schema(name = "isTransient")+ @JsonProperty("transient")+ public Boolean isTransient;@JsonProperty public String shard;@JsonProperty public String collection;- // TODO - what type is 'roles' expected to be?@JsonProperty public List<String> roles;@JsonProperty public String replicaType;- @JsonProperty public Map<String, Object> properties;+ @JsonProperty public Map<String, String> properties;++ @JsonProperty public Map<String, String> collectionProperties;@JsonProperty public String coreNodeName;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreStatus.java b/solr/api/src/java/org/apache/solr/client/api/model/CreateCoreResponse.javasimilarity index 56%rename from solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreStatus.javarename to solr/api/src/java/org/apache/solr/client/api/model/CreateCoreResponse.javaindex ac720640c01..b9c4e576de7 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreStatus.java+++ b/solr/api/src/java/org/apache/solr/client/api/model/CreateCoreResponse.java@@ -14,34 +14,11 @@* See the License for the specific language governing permissions and* limitations under the License.*/+package org.apache.solr.client.api.model;-package org.apache.solr.client.solrj.request;+import com.fasterxml.jackson.annotation.JsonProperty;-import java.util.Date;-import org.apache.solr.common.util.NamedList;--public class CoreStatus {-- private final NamedList<Object> response;-- public CoreStatus(NamedList<Object> response) {- this.response = response;- }-- public String getDataDirectory() {- return (String) response.get("dataDir");- }-- public String getInstanceDirectory() {- return (String) response.findRecursive("instanceDir");- }-- @Override- public String toString() {- return response.toString();- }-- public Date getCoreStartTime() {- return (Date) response.get("startTime");- }+/** Response for {@link org.apache.solr.client.api.endpoint.CoreApis} 'create' API */+public class CreateCoreResponse extends SolrJerseyResponse {+ @JsonProperty public String core;}diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfileindex c41e84314b3..5e595d3b5f2 100644--- a/solr/benchmark/gradle.lockfile+++ b/solr/benchmark/gradle.lockfile@@ -3,13 +3,13 @@# This file is expected to be part of source control.com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=jarValidation,runtimeClasspath,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=jarValidation,runtimeClasspath,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=jarValidation,runtimeClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=jarValidation,runtimeClasspath,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=jarValidation,runtimeClasspath,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=jarValidation,runtimeClasspath,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=jarValidation,runtimeClasspath,testRuntimeClasspath-com.fasterxml.jackson:jackson-bom:2.18.2=jarValidation,runtimeClasspath,testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/core/src/java/org/apache/solr/cli/CLIUtils.java b/solr/core/src/java/org/apache/solr/cli/CLIUtils.javaindex b3336eb2361..93fb1403957 100644--- a/solr/core/src/java/org/apache/solr/cli/CLIUtils.java+++ b/solr/core/src/java/org/apache/solr/cli/CLIUtils.java@@ -19,7 +19,6 @@ package org.apache.solr.cli;import static org.apache.solr.common.SolrException.ErrorCode.FORBIDDEN;import static org.apache.solr.common.SolrException.ErrorCode.UNAUTHORIZED;-import static org.apache.solr.common.params.CommonParams.NAME;import static org.apache.solr.common.params.CommonParams.SYSTEM_INFO_PATH;import java.io.IOException;@@ -45,7 +44,7 @@ import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.impl.Http2SolrClient;import org.apache.solr.client.solrj.impl.SolrZkClientTimeout;import org.apache.solr.client.solrj.request.CollectionAdminRequest;-import org.apache.solr.client.solrj.request.CoreAdminRequest;+import org.apache.solr.client.solrj.request.CoresApi;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.common.SolrException;import org.apache.solr.common.cloud.SolrZkClient;@@ -321,16 +320,15 @@ public final class CLIUtils {final int clamPeriodForStatusPollMs = 1000;Thread.sleep(clamPeriodForStatusPollMs);}- NamedList<Object> existsCheckResult =- CoreAdminRequest.getStatus(coreName, solrClient).getResponse();- NamedList<Object> status = (NamedList<Object>) existsCheckResult.get("status");- NamedList<Object> coreStatus = (NamedList<Object>) status.get(coreName);- Map<String, Object> failureStatus =- (Map<String, Object>) existsCheckResult.get("initFailures");- String errorMsg = (String) failureStatus.get(coreName);- final boolean hasName = coreStatus != null && coreStatus.get(NAME) != null;- exists = hasName || errorMsg != null;- wait = hasName && errorMsg == null && "true".equals(coreStatus.get("isLoading"));+ final var coreStatusReq = new CoresApi.GetCoreStatus(coreName);+ final var coreStatusRsp = coreStatusReq.process(solrClient).getParsed();+ final var coreStatusByName = coreStatusRsp.status;+ final var coreStatus = coreStatusByName.get(coreName);+ final var failureStatus = coreStatusRsp.initFailures;+ final var initFailureForCore = failureStatus.get(coreName);+ final boolean hasName = coreStatus != null && coreStatus.name != null;+ exists = hasName || initFailureForCore != null;+ wait = hasName && initFailureForCore == null && Boolean.TRUE.equals(coreStatus.isLoading);} while (wait && System.nanoTime() - startWaitAt < MAX_WAIT_FOR_CORE_LOAD_NANOS);} catch (Exception exc) {// just ignore it since we're only interested in a positive result herediff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.javaindex 85ad5cdc4a9..b073bc1bf5f 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java@@ -29,7 +29,6 @@ import java.lang.invoke.MethodHandles;import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;-import java.util.Iterator;import java.util.List;import java.util.Locale;import java.util.Map;@@ -41,25 +40,22 @@ import org.apache.solr.api.AnnotatedApi;import org.apache.solr.api.Api;import org.apache.solr.api.JerseyResource;import org.apache.solr.cloud.CloudDescriptor;-import org.apache.solr.cloud.ZkController;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.CommonAdminParams;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.common.params.ModifiableSolrParams;-import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.EnvUtils;import org.apache.solr.common.util.ExecutorUtil;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SolrNamedThreadFactory;-import org.apache.solr.common.util.StrUtils;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.CoreDescriptor;import org.apache.solr.handler.RequestHandlerBase;-import org.apache.solr.handler.admin.api.AllCoresStatusAPI;import org.apache.solr.handler.admin.api.CoreSnapshot;-import org.apache.solr.handler.admin.api.CreateCoreAPI;+import org.apache.solr.handler.admin.api.CoreStatus;+import org.apache.solr.handler.admin.api.CreateCore;import org.apache.solr.handler.admin.api.CreateCoreBackup;import org.apache.solr.handler.admin.api.GetNodeCommandStatus;import org.apache.solr.handler.admin.api.InstallCoreData;@@ -74,7 +70,6 @@ import org.apache.solr.handler.admin.api.RequestBufferUpdatesAPI;import org.apache.solr.handler.admin.api.RequestCoreRecoveryAPI;import org.apache.solr.handler.admin.api.RequestSyncShardAPI;import org.apache.solr.handler.admin.api.RestoreCore;-import org.apache.solr.handler.admin.api.SingleCoreStatusAPI;import org.apache.solr.handler.admin.api.SplitCoreAPI;import org.apache.solr.handler.admin.api.SwapCores;import org.apache.solr.handler.admin.api.UnloadCore;@@ -289,35 +284,6 @@ public class CoreAdminHandler extends RequestHandlerBase implements PermissionNareturn opMap;}- protected static Map<String, String> buildCoreParams(SolrParams params) {-- Map<String, String> coreParams = new HashMap<>();-- // standard core create parameters- for (Map.Entry<String, String> entry : paramToProp.entrySet()) {- String value = params.get(entry.getKey(), null);- if (StrUtils.isNotNullOrEmpty(value)) {- coreParams.put(entry.getValue(), value);- }- }-- // extra properties- Iterator<String> paramsIt = params.getParameterNamesIterator();- while (paramsIt.hasNext()) {- String param = paramsIt.next();- if (param.startsWith(CoreAdminParams.PROPERTY_PREFIX)) {- String propName = param.substring(CoreAdminParams.PROPERTY_PREFIX.length());- String propValue = params.get(param);- coreParams.put(propName, propValue);- }- if (param.startsWith(ZkController.COLLECTION_PARAM_PREFIX)) {- coreParams.put(param, params.get(param));- }- }-- return coreParams;- }-public static ModifiableSolrParams params(String... params) {ModifiableSolrParams msp = new ModifiableSolrParams();for (int i = 0; i < params.length; i += 2) {@@ -374,9 +340,6 @@ public class CoreAdminHandler extends RequestHandlerBase implements PermissionNa@Overridepublic Collection<Api> getApis() {final List<Api> apis = new ArrayList<>();- apis.addAll(AnnotatedApi.getApis(new AllCoresStatusAPI(this)));- apis.addAll(AnnotatedApi.getApis(new SingleCoreStatusAPI(this)));- apis.addAll(AnnotatedApi.getApis(new CreateCoreAPI(this)));apis.addAll(AnnotatedApi.getApis(new RejoinLeaderElectionAPI(this)));apis.addAll(AnnotatedApi.getApis(new OverseerOperationAPI(this)));apis.addAll(AnnotatedApi.getApis(new SplitCoreAPI(this)));@@ -394,7 +357,9 @@ public class CoreAdminHandler extends RequestHandlerBase implements PermissionNapublic Collection<Class<? extends JerseyResource>> getJerseyResources() {return List.of(CoreSnapshot.class,+ CoreStatus.class,InstallCoreData.class,+ CreateCore.class,CreateCoreBackup.class,RestoreCore.class,ReloadCore.class,diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.javaindex 67bebb00efd..0a15462f13f 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java@@ -16,8 +16,6 @@*/package org.apache.solr.handler.admin;-import static org.apache.solr.common.params.CommonParams.NAME;-import static org.apache.solr.common.params.CoreAdminParams.COLLECTION;import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.BACKUPCORE;import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.CREATE;import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.CREATESNAPSHOT;@@ -40,18 +38,9 @@ import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.SPLIimport static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.STATUS;import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.SWAP;import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.UNLOAD;-import static org.apache.solr.common.params.CoreAdminParams.REPLICA;-import static org.apache.solr.common.params.CoreAdminParams.REPLICA_TYPE;-import static org.apache.solr.common.params.CoreAdminParams.SHARD;import static org.apache.solr.handler.admin.CoreAdminHandler.CallInfo;-import static org.apache.solr.handler.admin.CoreAdminHandler.buildCoreParams;-import static org.apache.solr.util.FileUtils.normalizeToOsPathSeparator;-import java.io.IOException;import java.lang.invoke.MethodHandles;-import java.nio.file.Path;-import java.util.Locale;-import java.util.Map;import org.apache.solr.client.api.endpoint.SwapCoresApi;import org.apache.solr.client.api.model.ListCoreSnapshotsResponse;import org.apache.solr.client.api.model.ReloadCoreRequestBody;@@ -64,26 +53,18 @@ import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.common.params.SolrParams;-import org.apache.solr.common.util.NamedList;-import org.apache.solr.common.util.PropertiesUtil;-import org.apache.solr.common.util.SimpleOrderedMap;-import org.apache.solr.common.util.StrUtils;import org.apache.solr.core.CoreContainer;-import org.apache.solr.core.CoreDescriptor;import org.apache.solr.core.SolrCore;import org.apache.solr.handler.admin.CoreAdminHandler.CoreAdminOp;import org.apache.solr.handler.admin.api.CoreSnapshot;+import org.apache.solr.handler.admin.api.CreateCore;import org.apache.solr.handler.admin.api.GetNodeCommandStatus;import org.apache.solr.handler.admin.api.ReloadCore;import org.apache.solr.handler.admin.api.RenameCore;import org.apache.solr.handler.admin.api.SwapCores;import org.apache.solr.handler.admin.api.UnloadCore;import org.apache.solr.handler.api.V2ApiUtils;-import org.apache.solr.search.SolrIndexSearcher;import org.apache.solr.update.UpdateLog;-import org.apache.solr.util.NumberUtils;-import org.apache.solr.util.RefCounted;-import org.apache.solr.util.TestInjection;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -92,32 +73,12 @@ public enum CoreAdminOperation implements CoreAdminOp {CREATE_OP(CREATE,it -> {- assert TestInjection.injectRandomDelayInCoreCreation();-- SolrParams params = it.req.getParams();- log().info("core create command {}", params);- String coreName = params.required().get(CoreAdminParams.NAME);- Map<String, String> coreParams = buildCoreParams(params);- CoreContainer coreContainer = it.handler.coreContainer;- Path instancePath;-- // TODO: Should we nuke setting odd instance paths? They break core discovery, generally- String instanceDir = it.req.getParams().get(CoreAdminParams.INSTANCE_DIR);- if (instanceDir == null) instanceDir = it.req.getParams().get("property.instanceDir");- if (instanceDir != null) {- instanceDir =- PropertiesUtil.substituteProperty(- instanceDir, coreContainer.getContainerProperties());- instancePath = coreContainer.getCoreRootDirectory().resolve(instanceDir).normalize();- } else {- instancePath = coreContainer.getCoreRootDirectory().resolve(coreName);- }-- boolean newCollection = params.getBool(CoreAdminParams.NEW_COLLECTION, false);-- coreContainer.create(coreName, instancePath, coreParams, newCollection);-- it.rsp.add("core", coreName);+ final var createParams = CreateCore.createRequestBodyFromV1Params(it.req.getParams());+ final var createCoreApi =+ new CreateCore(+ it.handler.coreContainer, it.handler.getCoreAdminAsyncTracker(), it.req, it.rsp);+ final var response = createCoreApi.createCore(createParams);+ V2ApiUtils.squashIntoSolrResponseWithoutHeader(it.rsp, response);}),UNLOAD_OP(UNLOAD,@@ -317,91 +278,6 @@ public enum CoreAdminOperation implements CoreAdminOp {return fun.isExpensive();}- /**- * Returns the core status for a particular core.- *- * @param cores - the enclosing core container- * @param cname - the core to return- * @param isIndexInfoNeeded - add what may be expensive index information. NOT returned if the- * core is not loaded- * @return - a named list of key/value pairs from the core.- * @throws IOException - LukeRequestHandler can throw an I/O exception- */- @SuppressWarnings({"unchecked", "rawtypes"})- public static NamedList<Object> getCoreStatus(- CoreContainer cores, String cname, boolean isIndexInfoNeeded) throws IOException {- NamedList<Object> info = new SimpleOrderedMap<>();-- if (cores.isCoreLoading(cname)) {- info.add(NAME, cname);- info.add("isLoaded", "false");- info.add("isLoading", "true");- } else {- if (!cores.isLoaded(cname)) { // Lazily-loaded core, fill in what we can.- // It would be a real mistake to load the cores just to get the status- CoreDescriptor desc = cores.getCoreDescriptor(cname);- if (desc != null) {- info.add(NAME, desc.getName());- info.add("instanceDir", desc.getInstanceDir());- // None of the following are guaranteed to be present in a not-yet-loaded core.- String tmp = desc.getDataDir();- if (StrUtils.isNotBlank(tmp)) info.add("dataDir", tmp);- tmp = desc.getConfigName();- if (StrUtils.isNotBlank(tmp)) info.add("config", tmp);- tmp = desc.getSchemaName();- if (StrUtils.isNotBlank(tmp)) info.add("schema", tmp);- info.add("isLoaded", "false");- }- } else {- try (SolrCore core = cores.getCore(cname)) {- if (core != null) {- info.add(NAME, core.getName());- info.add("instanceDir", core.getInstancePath().toString());- info.add("dataDir", normalizeToOsPathSeparator(core.getDataDir()));- info.add("config", core.getConfigResource());- info.add("schema", core.getSchemaResource());- info.add("startTime", core.getStartTimeStamp());- info.add("uptime", core.getUptimeMs());- if (cores.isZooKeeperAware()) {- info.add(- "lastPublished",- core.getCoreDescriptor()- .getCloudDescriptor()- .getLastPublished()- .toString()- .toLowerCase(Locale.ROOT));- info.add("configVersion", core.getSolrConfig().getZnodeVersion());- SimpleOrderedMap<String> cloudInfo = new SimpleOrderedMap<>();- cloudInfo.add(- COLLECTION, core.getCoreDescriptor().getCloudDescriptor().getCollectionName());- cloudInfo.add(SHARD, core.getCoreDescriptor().getCloudDescriptor().getShardId());- cloudInfo.add(- REPLICA, core.getCoreDescriptor().getCloudDescriptor().getCoreNodeName());- cloudInfo.add(- REPLICA_TYPE,- core.getCoreDescriptor().getCloudDescriptor().getReplicaType().name());- info.add("cloud", cloudInfo);- }- if (isIndexInfoNeeded) {- RefCounted<SolrIndexSearcher> searcher = core.getSearcher();- try {- SimpleOrderedMap<Object> indexInfo =- LukeRequestHandler.getIndexInfo(searcher.get().getIndexReader());- long size = core.getIndexSize();- indexInfo.add("sizeInBytes", size);- indexInfo.add("size", NumberUtils.readableSize(size));- info.add("index", indexInfo);- } finally {- searcher.decref();- }- }- }- }- }- }- return info;- }-@Overridepublic void execute(CallInfo it) throws Exception {try {diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.javaindex f06ec4369b1..5840371b18d 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java@@ -66,6 +66,7 @@ import org.apache.lucene.util.BytesRef;import org.apache.lucene.util.CharsRefBuilder;import org.apache.lucene.util.PriorityQueue;import org.apache.solr.analysis.TokenizerChain;+import org.apache.solr.client.api.model.CoreStatusResponse;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrException.ErrorCode;import org.apache.solr.common.luke.FieldFlag;@@ -74,6 +75,7 @@ import org.apache.solr.common.params.SolrParams;import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.SimpleOrderedMap;import org.apache.solr.handler.RequestHandlerBase;+import org.apache.solr.handler.api.V2ApiUtils;import org.apache.solr.request.SolrQueryRequest;import org.apache.solr.response.SolrQueryResponse;import org.apache.solr.schema.CopyField;@@ -136,8 +138,9 @@ public class LukeRequestHandler extends RequestHandlerBase {ShowStyle style = ShowStyle.get(params.get("show"));// If no doc is given, show all fields and top terms-- rsp.add("index", getIndexInfo(reader));+ final var indexVals = new SimpleOrderedMap<>();+ V2ApiUtils.squashIntoNamedList(indexVals, getIndexInfo(reader));+ rsp.add("index", indexVals);if (ShowStyle.INDEX == style) {return; // that's all we need@@ -622,28 +625,29 @@ public class LukeRequestHandler extends RequestHandlerBase {// This method just gets the top-most level of information. This was conflated with getting// detailed info for *all* the fields, called from CoreAdminHandler etc.- public static SimpleOrderedMap<Object> getIndexInfo(DirectoryReader reader) throws IOException {+ public static CoreStatusResponse.IndexDetails getIndexInfo(DirectoryReader reader)+ throws IOException {Directory dir = reader.directory();- SimpleOrderedMap<Object> indexInfo = new SimpleOrderedMap<>();+ final var indexInfo = new CoreStatusResponse.IndexDetails();- indexInfo.add("numDocs", reader.numDocs());- indexInfo.add("maxDoc", reader.maxDoc());- indexInfo.add("deletedDocs", reader.maxDoc() - reader.numDocs());+ indexInfo.numDocs = reader.numDocs();+ indexInfo.maxDoc = reader.maxDoc();+ indexInfo.deletedDocs = reader.maxDoc() - reader.numDocs();// TODO? Is this different then: IndexReader.getCurrentVersion( dir )?- indexInfo.add("version", reader.getVersion());- indexInfo.add("segmentCount", reader.leaves().size());- indexInfo.add("current", closeSafe(reader::isCurrent));- indexInfo.add("hasDeletions", reader.hasDeletions());- indexInfo.add("directory", dir);+ indexInfo.version = reader.getVersion();+ indexInfo.segmentCount = reader.leaves().size();+ indexInfo.current = closeSafe(reader::isCurrent);+ indexInfo.hasDeletions = reader.hasDeletions();+ indexInfo.directory = dir.toString();IndexCommit indexCommit = reader.getIndexCommit();String segmentsFileName = indexCommit.getSegmentsFileName();- indexInfo.add("segmentsFile", segmentsFileName);- indexInfo.add("segmentsFileSizeInBytes", getSegmentsFileLength(indexCommit));+ indexInfo.segmentsFile = segmentsFileName;+ indexInfo.segmentsFileSizeInBytes = getSegmentsFileLength(indexCommit);Map<String, String> userData = indexCommit.getUserData();- indexInfo.add("userData", userData);+ indexInfo.userData = userData;String s = userData.get(SolrIndexWriter.COMMIT_TIME_MSEC_KEY);if (s != null) {- indexInfo.add("lastModified", new Date(Long.parseLong(s)));+ indexInfo.lastModified = new Date(Long.parseLong(s));}return indexInfo;}@@ -653,7 +657,7 @@ public class LukeRequestHandler extends RequestHandlerBase {boolean get() throws IOException;}- private static Object closeSafe(IOSupplier isCurrent) {+ private static boolean closeSafe(IOSupplier isCurrent) {try {return isCurrent.get();} catch (AlreadyClosedException | IOException exception) {diff --git a/solr/core/src/java/org/apache/solr/handler/admin/StatusOp.java b/solr/core/src/java/org/apache/solr/handler/admin/StatusOp.javaindex c42e7c43c2d..95af7758c79 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/StatusOp.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/StatusOp.java@@ -17,49 +17,23 @@package org.apache.solr.handler.admin;-import java.util.Collections;-import java.util.HashMap;-import java.util.List;-import java.util.Map;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.common.params.SolrParams;-import org.apache.solr.common.util.NamedList;-import org.apache.solr.common.util.SimpleOrderedMap;-import org.apache.solr.core.CoreContainer;+import org.apache.solr.handler.admin.api.CoreStatus;+import org.apache.solr.handler.api.V2ApiUtils;class StatusOp implements CoreAdminHandler.CoreAdminOp {+@Overridepublic void execute(CoreAdminHandler.CallInfo it) throws Exception {SolrParams params = it.req.getParams();-String cname = params.get(CoreAdminParams.CORE);String indexInfo = params.get(CoreAdminParams.INDEX_INFO);boolean isIndexInfoNeeded = Boolean.parseBoolean(null == indexInfo ? "true" : indexInfo);- NamedList<Object> status = new SimpleOrderedMap<>();- Map<String, Exception> failures = new HashMap<>();- for (Map.Entry<String, CoreContainer.CoreLoadFailure> failure :- it.handler.coreContainer.getCoreInitFailures().entrySet()) {- failures.put(failure.getKey(), failure.getValue().exception);- }- if (cname == null) {- List<String> nameList = it.handler.coreContainer.getAllCoreNames();- nameList.sort(null);- for (String name : nameList) {- status.add(- name,- CoreAdminOperation.getCoreStatus(it.handler.coreContainer, name, isIndexInfoNeeded));- }- it.rsp.add("initFailures", failures);- } else {- failures =- failures.containsKey(cname)- ? Collections.singletonMap(cname, failures.get(cname))- : Collections.<String, Exception>emptyMap();- it.rsp.add("initFailures", failures);- status.add(- cname,- CoreAdminOperation.getCoreStatus(it.handler.coreContainer, cname, isIndexInfoNeeded));- }- it.rsp.add("status", status);++ final var response =+ CoreStatus.fetchStatusInfo(it.handler.coreContainer, cname, isIndexInfoNeeded);++ V2ApiUtils.squashIntoSolrResponseWithoutHeader(it.rsp, response);}}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/AllCoresStatusAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/AllCoresStatusAPI.javadeleted file mode 100644index 87f7c9bffa9..00000000000--- a/solr/core/src/java/org/apache/solr/handler/admin/api/AllCoresStatusAPI.java+++ /dev/null@@ -1,54 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package org.apache.solr.handler.admin.api;--import static org.apache.solr.client.solrj.SolrRequest.METHOD.GET;-import static org.apache.solr.common.params.CommonParams.ACTION;-import static org.apache.solr.common.params.CommonParams.STATUS;-import static org.apache.solr.handler.ClusterAPI.wrapParams;-import static org.apache.solr.security.PermissionNameProvider.Name.CORE_READ_PERM;--import org.apache.solr.api.EndPoint;-import org.apache.solr.handler.admin.CoreAdminHandler;-import org.apache.solr.request.SolrQueryRequest;-import org.apache.solr.response.SolrQueryResponse;--/**- * V2 API for retrieving status information for all cores on the receiving node.- *- * <p>This API (GET /v2/cores is analogous to the v1 /admin/cores?action=status command.- *- * @see SingleCoreStatusAPI- */-public class AllCoresStatusAPI {-- private final CoreAdminHandler coreAdminHandler;-- public AllCoresStatusAPI(CoreAdminHandler coreAdminHandler) {- this.coreAdminHandler = coreAdminHandler;- }-- @EndPoint(- path = {"/cores"},- method = GET,- permission = CORE_READ_PERM)- public void getStatusOfAllCores(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {- req = wrapParams(req, ACTION, STATUS);- coreAdminHandler.handleRequestBody(req, rsp);- }-}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CoreStatus.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CoreStatus.javanew file mode 100644index 00000000000..9f7f27e3146--- /dev/null+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CoreStatus.java@@ -0,0 +1,177 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.handler.admin.api;++import static org.apache.solr.security.PermissionNameProvider.Name.CORE_READ_PERM;+import static org.apache.solr.util.FileUtils.normalizeToOsPathSeparator;++import jakarta.inject.Inject;+import java.io.IOException;+import java.util.HashMap;+import java.util.List;+import java.util.Locale;+import java.util.Map;+import org.apache.solr.client.api.endpoint.CoreApis;+import org.apache.solr.client.api.model.CoreStatusResponse;+import org.apache.solr.common.util.StrUtils;+import org.apache.solr.core.CoreContainer;+import org.apache.solr.core.CoreDescriptor;+import org.apache.solr.core.SolrCore;+import org.apache.solr.handler.admin.CoreAdminHandler;+import org.apache.solr.handler.admin.LukeRequestHandler;+import org.apache.solr.jersey.PermissionName;+import org.apache.solr.request.SolrQueryRequest;+import org.apache.solr.response.SolrQueryResponse;+import org.apache.solr.search.SolrIndexSearcher;+import org.apache.solr.util.NumberUtils;+import org.apache.solr.util.RefCounted;++/**+ * V2 APIs for getting the status of one or all cores.+ *+ * <p>This API (GET /v2/cores/coreName is analogous to the v1 /admin/cores?action=status command.+ */+public class CoreStatus extends CoreAdminAPIBase implements CoreApis.GetStatus {++ @Inject+ public CoreStatus(+ CoreContainer coreContainer,+ CoreAdminHandler.CoreAdminAsyncTracker coreAdminAsyncTracker,+ SolrQueryRequest solrQueryRequest,+ SolrQueryResponse solrQueryResponse) {+ super(coreContainer, coreAdminAsyncTracker, solrQueryRequest, solrQueryResponse);+ }++ @Override+ @PermissionName(CORE_READ_PERM)+ public CoreStatusResponse getAllCoreStatus(Boolean indexInfo) throws IOException {+ return fetchStatusInfo(coreContainer, null, indexInfo);+ }++ @Override+ @PermissionName(CORE_READ_PERM)+ public CoreStatusResponse getCoreStatus(String coreName, Boolean indexInfo) throws IOException {+ return fetchStatusInfo(coreContainer, coreName, indexInfo);+ }++ public static CoreStatusResponse fetchStatusInfo(+ CoreContainer coreContainer, String coreName, Boolean indexInfo) throws IOException {+ final var response = new CoreStatusResponse();+ response.initFailures = new HashMap<>();++ for (Map.Entry<String, CoreContainer.CoreLoadFailure> failure :+ coreContainer.getCoreInitFailures().entrySet()) {++ // Skip irrelevant initFailures if we're only interested in a single core+ if (coreName != null && !failure.getKey().equals(coreName)) continue;++ response.initFailures.put(failure.getKey(), failure.getValue().exception);+ }++ // Populate status for each core+ final var coreNameList =+ (coreName != null) ? List.of(coreName) : coreContainer.getAllCoreNames();+ if (coreNameList.size() > 1) coreNameList.sort(null);+ response.status = new HashMap<>();+ for (String toPopulate : coreNameList) {+ response.status.put(toPopulate, getCoreStatus(coreContainer, toPopulate, indexInfo));+ }++ return response;+ }++ /**+ * Returns the core status for a particular core.+ *+ * @param cores - the enclosing core container+ * @param cname - the core to return+ * @param isIndexInfoNeeded - add what may be expensive index information. NOT returned if the+ * core is not loaded+ * @return - a named list of key/value pairs from the core.+ * @throws IOException - LukeRequestHandler can throw an I/O exception+ */+ public static CoreStatusResponse.SingleCoreData getCoreStatus(+ CoreContainer cores, String cname, boolean isIndexInfoNeeded) throws IOException {+ final var info = new CoreStatusResponse.SingleCoreData();+ if (cores.isCoreLoading(cname)) {+ info.name = cname;+ info.isLoaded = false;+ info.isLoading = true;+ } else {+ if (!cores.isLoaded(cname)) { // Lazily-loaded core, fill in what we can.+ // It would be a real mistake to load the cores just to get the status+ CoreDescriptor desc = cores.getCoreDescriptor(cname);+ if (desc != null) {+ info.name = desc.getName();+ info.instanceDir = desc.getInstanceDir().toString();+ // None of the following are guaranteed to be present in a not-yet-loaded core.+ String tmp = desc.getDataDir();+ if (StrUtils.isNotBlank(tmp)) info.dataDir = tmp;+ tmp = desc.getConfigName();+ if (StrUtils.isNotBlank(tmp)) info.config = tmp;+ tmp = desc.getSchemaName();+ if (StrUtils.isNotBlank(tmp)) info.schema = tmp;+ info.isLoaded = false;+ }+ } else {+ try (SolrCore core = cores.getCore(cname)) {+ if (core != null) {+ info.name = core.getName();+ info.instanceDir = core.getInstancePath().toString();+ info.dataDir = normalizeToOsPathSeparator(core.getDataDir());+ info.config = core.getConfigResource();+ info.schema = core.getSchemaResource();+ info.startTime = core.getStartTimeStamp();+ info.uptime = core.getUptimeMs();+ if (cores.isZooKeeperAware()) {+ info.lastPublished =+ core.getCoreDescriptor()+ .getCloudDescriptor()+ .getLastPublished()+ .toString()+ .toLowerCase(Locale.ROOT);+ info.configVersion = core.getSolrConfig().getZnodeVersion();+ final var cloudInfo = new CoreStatusResponse.CloudDetails();+ cloudInfo.collection =+ core.getCoreDescriptor().getCloudDescriptor().getCollectionName();+ cloudInfo.shard = core.getCoreDescriptor().getCloudDescriptor().getShardId();+ cloudInfo.replica = core.getCoreDescriptor().getCloudDescriptor().getCoreNodeName();+ cloudInfo.replicaType =+ core.getCoreDescriptor().getCloudDescriptor().getReplicaType().name();+ info.cloud = cloudInfo;+ }+ if (isIndexInfoNeeded) {+ RefCounted<SolrIndexSearcher> searcher = core.getSearcher();+ try {+ final var indexInfo =+ LukeRequestHandler.getIndexInfo(searcher.get().getIndexReader());+ long size = core.getIndexSize();+ indexInfo.sizeInBytes = size;+ indexInfo.size = NumberUtils.readableSize(size);+ info.index = indexInfo;+ } finally {+ searcher.decref();+ }+ }+ }+ }+ }+ }+ return info;+ }+}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCore.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCore.javanew file mode 100644index 00000000000..14807e3a36a--- /dev/null+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCore.java@@ -0,0 +1,201 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package org.apache.solr.handler.admin.api;++import static org.apache.solr.cloud.ZkController.COLLECTION_PARAM_PREFIX;+import static org.apache.solr.common.params.CollectionAdminParams.PROPERTY_PREFIX;+import static org.apache.solr.common.params.CommonAdminParams.ASYNC;+import static org.apache.solr.common.params.CoreAdminParams.ACTION;+import static org.apache.solr.common.params.CoreAdminParams.ROLES;+import static org.apache.solr.handler.admin.CoreAdminHandler.paramToProp;+import static org.apache.solr.security.PermissionNameProvider.Name.CORE_EDIT_PERM;++import com.fasterxml.jackson.core.type.TypeReference;+import jakarta.inject.Inject;+import java.lang.invoke.MethodHandles;+import java.nio.file.Path;+import java.util.HashMap;+import java.util.Iterator;+import java.util.List;+import java.util.Map;+import org.apache.solr.client.api.endpoint.CoreApis;+import org.apache.solr.client.api.model.CreateCoreParams;+import org.apache.solr.client.api.model.CreateCoreResponse;+import org.apache.solr.cloud.ZkController;+import org.apache.solr.common.params.SolrParams;+import org.apache.solr.common.util.CollectionUtil;+import org.apache.solr.common.util.PropertiesUtil;+import org.apache.solr.common.util.StrUtils;+import org.apache.solr.common.util.Utils;+import org.apache.solr.core.CoreContainer;+import org.apache.solr.handler.admin.CoreAdminHandler;+import org.apache.solr.jersey.PermissionName;+import org.apache.solr.jersey.SolrJacksonMapper;+import org.apache.solr.request.SolrQueryRequest;+import org.apache.solr.response.SolrQueryResponse;+import org.apache.solr.util.TestInjection;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++/**+ * V2 API for creating a new core on the receiving node.+ *+ * <p>This API (POST /api/cores {...}) is analogous to the v1 /admin/cores?action=CREATE command.+ */+public class CreateCore extends CoreAdminAPIBase implements CoreApis.Create {+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());++ @Inject+ public CreateCore(+ CoreContainer coreContainer,+ CoreAdminHandler.CoreAdminAsyncTracker coreAdminAsyncTracker,+ SolrQueryRequest solrQueryRequest,+ SolrQueryResponse solrQueryResponse) {+ super(coreContainer, coreAdminAsyncTracker, solrQueryRequest, solrQueryResponse);+ }++ @Override+ @PermissionName(CORE_EDIT_PERM)+ public CreateCoreResponse createCore(CreateCoreParams requestBody) throws Exception {+ final var response = instantiateJerseyResponse(CreateCoreResponse.class);++ ensureRequiredRequestBodyProvided(requestBody);+ ensureRequiredParameterProvided("name", requestBody.name);++ assert TestInjection.injectRandomDelayInCoreCreation();+ ensureRequiredRequestBodyProvided(requestBody);+ ensureRequiredParameterProvided("name", requestBody.name);++ return handlePotentiallyAsynchronousTask(+ response,+ requestBody.name,+ requestBody.async,+ "create",+ () -> {+ return doCreate(requestBody, response);+ });+ }++ private CreateCoreResponse doCreate(CreateCoreParams requestBody, CreateCoreResponse response) {+ assert TestInjection.injectRandomDelayInCoreCreation();++ if (log.isInfoEnabled()) {+ log.info("core create command {}", Utils.toJSONString(requestBody));+ }+ Map<String, String> coreParams = buildCoreParams(requestBody);+ final var instancePath = determineInstancePath(requestBody);++ boolean newCollection = Boolean.TRUE.equals(requestBody.newCollection);++ coreContainer.create(requestBody.name, instancePath, coreParams, newCollection);++ response.core = requestBody.name;+ return response;+ }++ // TODO: Should we nuke setting odd instance paths? They break core discovery, generally+ private Path determineInstancePath(CreateCoreParams createParams) {+ String instanceDir = createParams.instanceDir;+ if (instanceDir == null && CollectionUtil.isNotEmpty(createParams.properties))+ instanceDir = createParams.properties.get("instanceDir");++ if (instanceDir != null) {+ instanceDir =+ PropertiesUtil.substituteProperty(instanceDir, coreContainer.getContainerProperties());+ return coreContainer.getCoreRootDirectory().resolve(instanceDir).normalize();+ } else {+ return coreContainer.getCoreRootDirectory().resolve(createParams.name);+ }+ }++ // TODO create-core API accepts a strongly-typed object, but CoreContainer, CoreDescriptor, et al.+ // still consume a Map<String,String> of properties, persist this to disk as a properties file.+ // We should think through how far to push the strong-typing down into things, if/how it impacts+ // on-disk representations (e.g. core.properties), etc.+ private Map<String, String> buildCoreParams(CreateCoreParams createParams) {+ final var createParamMap =+ SolrJacksonMapper.getObjectMapper()+ .convertValue(createParams, new TypeReference<Map<String, Object>>() {});+ final var coreParams = new HashMap<String, String>();++ // Copy standard core create parameters from paramToProp allowlist+ for (Map.Entry<String, String> entry : paramToProp.entrySet()) {+ if (createParamMap.containsKey(entry.getKey())) {+ Object value = createParamMap.get(entry.getKey());+ if (value != null) {+ if (entry.getKey().equals(ROLES) && value instanceof List) {+ @SuppressWarnings("unchecked")+ final var values = (List<String>) value;+ value = StrUtils.join(values, ',');+ }+ coreParams.put(entry.getValue(), value.toString());+ }+ }+ }++ // User-properties are added without any prefix+ if (CollectionUtil.isNotEmpty(createParams.properties)) {+ coreParams.putAll(createParams.properties);+ }+ // "Collection"-specific properties are given a "collection." prefix in the flattened map+ if (CollectionUtil.isNotEmpty(createParams.collectionProperties)) {+ createParams.collectionProperties.entrySet().stream()+ .forEach(+ entry -> {+ coreParams.put(+ ZkController.COLLECTION_PARAM_PREFIX + entry.getKey(), entry.getValue());+ });+ }++ return coreParams;+ }++ public static CreateCoreParams createRequestBodyFromV1Params(SolrParams solrParams) {+ final var v1ParamMap = solrParams.toMap(new HashMap<>());+ v1ParamMap.remove(ACTION);+ v1ParamMap.remove(ASYNC);++ final var coreProperties = new HashMap<String, String>();+ final var collectionProperties = new HashMap<String, String>();++ Iterator<String> paramIterator = solrParams.getParameterNamesIterator();+ while (paramIterator.hasNext()) {+ final String key = paramIterator.next();+ final Object value = v1ParamMap.get(key);+ if (key.startsWith(PROPERTY_PREFIX)) {+ v1ParamMap.remove(key);+ coreProperties.put(key.substring(PROPERTY_PREFIX.length()), value.toString());+ }+ if (key.startsWith(COLLECTION_PARAM_PREFIX)) {+ v1ParamMap.remove(key);+ collectionProperties.put(key.substring(COLLECTION_PARAM_PREFIX.length()), value.toString());+ }+ if (key.equals(ROLES)) {+ v1ParamMap.put(ROLES, value.toString().split(","));+ }+ }+ if (CollectionUtil.isNotEmpty(coreProperties)) {+ v1ParamMap.put("properties", coreProperties);+ }+ if (CollectionUtil.isNotEmpty(collectionProperties)) {+ v1ParamMap.put("collectionProperties", collectionProperties);+ }++ return SolrJacksonMapper.getObjectMapper().convertValue(v1ParamMap, CreateCoreParams.class);+ }+}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCoreAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCoreAPI.javadeleted file mode 100644index d797c88e0be..00000000000--- a/solr/core/src/java/org/apache/solr/handler/admin/api/CreateCoreAPI.java+++ /dev/null@@ -1,79 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package org.apache.solr.handler.admin.api;--import static org.apache.solr.client.solrj.SolrRequest.METHOD.POST;-import static org.apache.solr.common.params.CollectionAdminParams.PROPERTY_PREFIX;-import static org.apache.solr.common.params.CoreAdminParams.ACTION;-import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.CREATE;-import static org.apache.solr.handler.ClusterAPI.wrapParams;-import static org.apache.solr.handler.api.V2ApiUtils.flattenMapWithPrefix;-import static org.apache.solr.handler.api.V2ApiUtils.flattenToCommaDelimitedString;-import static org.apache.solr.security.PermissionNameProvider.Name.CORE_EDIT_PERM;--import java.util.HashMap;-import java.util.Locale;-import java.util.Map;-import org.apache.solr.api.Command;-import org.apache.solr.api.EndPoint;-import org.apache.solr.api.PayloadObj;-import org.apache.solr.client.solrj.request.beans.CreateCorePayload;-import org.apache.solr.handler.admin.CoreAdminHandler;--/**- * V2 API for creating a new core on the receiving node.- *- * <p>This API (POST /v2/cores {'create': {...}}) is analogous to the v1 /admin/cores?action=CREATE- * command.- *- * @see CreateCorePayload- */-@EndPoint(- path = {"/cores"},- method = POST,- permission = CORE_EDIT_PERM)-public class CreateCoreAPI {- public static final String V2_CREATE_CORE_CMD = "create";-- private final CoreAdminHandler coreAdminHandler;-- public CreateCoreAPI(CoreAdminHandler coreAdminHandler) {- this.coreAdminHandler = coreAdminHandler;- }-- @Command(name = V2_CREATE_CORE_CMD)- public void createCore(PayloadObj<CreateCorePayload> obj) throws Exception {- final CreateCorePayload v2Body = obj.get();- final Map<String, Object> v1Params = v2Body.toMap(new HashMap<>());- v1Params.put(ACTION, CREATE.name().toLowerCase(Locale.ROOT));-- if (v2Body.isTransient != null) {- v1Params.put("transient", v1Params.remove("isTransient"));- }- if (v2Body.properties != null) {- v1Params.remove("properties");- flattenMapWithPrefix(v2Body.properties, v1Params, PROPERTY_PREFIX);- }- if (v2Body.roles != null && !v2Body.roles.isEmpty()) {- v1Params.remove("roles"); // Not strictly needed, since the method below would overwrite it.- flattenToCommaDelimitedString(v1Params, v2Body.roles, "roles");- }-- coreAdminHandler.handleRequestBody(wrapParams(obj.getRequest(), v1Params), obj.getResponse());- }-}diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/SingleCoreStatusAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/SingleCoreStatusAPI.javadeleted file mode 100644index 7253bd35b69..00000000000--- a/solr/core/src/java/org/apache/solr/handler/admin/api/SingleCoreStatusAPI.java+++ /dev/null@@ -1,56 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package org.apache.solr.handler.admin.api;--import static org.apache.solr.client.solrj.SolrRequest.METHOD.GET;-import static org.apache.solr.common.params.CommonParams.ACTION;-import static org.apache.solr.common.params.CommonParams.STATUS;-import static org.apache.solr.common.params.CoreAdminParams.CORE;-import static org.apache.solr.handler.ClusterAPI.wrapParams;-import static org.apache.solr.security.PermissionNameProvider.Name.CORE_READ_PERM;--import org.apache.solr.api.EndPoint;-import org.apache.solr.handler.admin.CoreAdminHandler;-import org.apache.solr.request.SolrQueryRequest;-import org.apache.solr.response.SolrQueryResponse;--/**- * V2 API for checking the status of a specific core.- *- * <p>This API (GET /v2/cores/coreName is analogous to the v1- * /admin/cores?action=status&core=coreName command.- *- * @see AllCoresStatusAPI- */-public class SingleCoreStatusAPI {-- private final CoreAdminHandler coreAdminHandler;-- public SingleCoreStatusAPI(CoreAdminHandler coreAdminHandler) {- this.coreAdminHandler = coreAdminHandler;- }-- @EndPoint(- path = {"/cores/{core}"},- method = GET,- permission = CORE_READ_PERM)- public void getStatusOfSingleCore(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {- req = wrapParams(req, ACTION, STATUS, CORE, req.getPathTemplateValues().get(CORE));- coreAdminHandler.handleRequestBody(req, rsp);- }-}diff --git a/solr/core/src/java/org/apache/solr/jersey/SolrJacksonMapper.java b/solr/core/src/java/org/apache/solr/jersey/SolrJacksonMapper.javaindex b3444070701..7f57715993c 100644--- a/solr/core/src/java/org/apache/solr/jersey/SolrJacksonMapper.java+++ b/solr/core/src/java/org/apache/solr/jersey/SolrJacksonMapper.java@@ -19,6 +19,7 @@ package org.apache.solr.jersey;import com.fasterxml.jackson.annotation.JsonInclude;import com.fasterxml.jackson.core.JsonGenerator;+import com.fasterxml.jackson.databind.DeserializationFeature;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.SerializerProvider;import com.fasterxml.jackson.databind.module.SimpleModule;@@ -49,6 +50,9 @@ public class SolrJacksonMapper implements ContextResolver<ObjectMapper> {customTypeModule.addSerializer(new NamedListSerializer(NamedList.class));return new ObjectMapper()+ // TODO Should failOnUnknown=false be made available on a "permissive" object mapper instead+ // of the "main" one?+ .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).setSerializationInclusion(JsonInclude.Include.NON_NULL).registerModule(customTypeModule);}diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.javaindex 1c67b5e5af0..591a25b5267 100644--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java@@ -52,7 +52,6 @@ import org.apache.solr.client.solrj.impl.CloudSolrClient;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CollectionsApi;import org.apache.solr.client.solrj.request.CoreAdminRequest;-import org.apache.solr.client.solrj.request.CoreStatus;import org.apache.solr.client.solrj.request.V2Request;import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.client.solrj.response.CoreAdminResponse;@@ -449,9 +448,9 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {DocCollection testCollection = getCollectionState(collectionName);Replica replica1 = testCollection.getReplicas().iterator().next();- CoreStatus coreStatus = getCoreStatus(replica1);+ final var coreStatus = getCoreStatus(replica1);- assertEquals(Paths.get(coreStatus.getDataDirectory()).toString(), dataDir.toString());+ assertEquals(Paths.get(coreStatus.dataDir).toString(), dataDir.toString());}@Test@@ -882,7 +881,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {ZkStateReader.from(solrClient).getLeaderRetry(collectionName, "shard1", DEFAULT_TIMEOUT);final AtomicReference<Long> coreStartTime =- new AtomicReference<>(getCoreStatus(leader).getCoreStartTime().getTime());+ new AtomicReference<>(getCoreStatus(leader).startTime.getTime());// Check for value changeCollectionAdminRequest.modifyCollection(@@ -903,7 +902,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {() -> {long restartTime = 0;try {- restartTime = getCoreStatus(leader).getCoreStartTime().getTime();+ restartTime = getCoreStatus(leader).startTime.getTime();} catch (Exception e) {log.warn("Exception getting core start time: ", e);return false;@@ -911,7 +910,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {return restartTime > coreStartTime.get();});- coreStartTime.set(getCoreStatus(leader).getCoreStartTime().getTime());+ coreStartTime.set(getCoreStatus(leader).startTime.getTime());// check for docs - reloading should have committed the new docs// this also verifies that searching works in read-only mode@@ -974,7 +973,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {() -> {long restartTime = 0;try {- restartTime = getCoreStatus(leader).getCoreStartTime().getTime();+ restartTime = getCoreStatus(leader).startTime.getTime();} catch (Exception e) {log.warn("Exception getting core start time: ", e);return false;diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.javaindex 63fe4929af0..b92b8006b76 100644--- a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java@@ -31,7 +31,6 @@ import java.util.concurrent.atomic.AtomicBoolean;import java.util.concurrent.atomic.AtomicInteger;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CollectionAdminRequest.Create;-import org.apache.solr.client.solrj.request.CoreStatus;import org.apache.solr.cloud.overseer.OverseerAction;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;@@ -97,8 +96,8 @@ public class DeleteReplicaTest extends SolrCloudTestCase {getRandomReplica(shard, (r) -> (r.getState() == Replica.State.ACTIVE && !r.equals(shard.getLeader())));- CoreStatus coreStatus = getCoreStatus(replica);- Path dataDir = Paths.get(coreStatus.getDataDirectory());+ final var coreStatus = getCoreStatus(replica);+ Path dataDir = Paths.get(coreStatus.dataDir);Exception e =expectThrows(@@ -164,12 +163,9 @@ public class DeleteReplicaTest extends SolrCloudTestCase {Replica leader = cluster.getZkStateReader().getLeaderRetry(collectionName, "shard1");// Confirm that the instance and data directory exist- CoreStatus coreStatus = getCoreStatus(leader);- assertTrue(- "Instance directory doesn't exist",- Files.exists(Paths.get(coreStatus.getInstanceDirectory())));- assertTrue(- "DataDirectory doesn't exist", Files.exists(Paths.get(coreStatus.getDataDirectory())));+ final var coreStatus = getCoreStatus(leader);+ assertTrue("Instance directory doesn't exist", Files.exists(Paths.get(coreStatus.instanceDir)));+ assertTrue("DataDirectory doesn't exist", Files.exists(Paths.get(coreStatus.dataDir)));CollectionAdminRequest.deleteReplica(collectionName, "shard1", leader.getName()).process(cluster.getSolrClient());@@ -179,11 +175,8 @@ public class DeleteReplicaTest extends SolrCloudTestCase {assertNotEquals(leader, newLeader);// Confirm that the instance and data directory were deleted by default- assertFalse(- "Instance directory still exists",- Files.exists(Paths.get(coreStatus.getInstanceDirectory())));- assertFalse(- "DataDirectory still exists", Files.exists(Paths.get(coreStatus.getDataDirectory())));+ assertFalse("Instance directory still exists", Files.exists(Paths.get(coreStatus.instanceDir)));+ assertFalse("DataDirectory still exists", Files.exists(Paths.get(coreStatus.dataDir)));}@Testdiff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.javaindex 73375d8981e..dec630995cb 100644--- a/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java@@ -19,7 +19,6 @@ package org.apache.solr.cloud;import java.io.IOException;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;-import org.apache.solr.client.solrj.request.CoreStatus;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.Replica;import org.apache.solr.common.cloud.Slice;@@ -87,11 +86,9 @@ public class DeleteShardTest extends SolrCloudTestCase {// Get replica detailsReplica leader = getCollectionState(collection).getLeader("a");- CoreStatus coreStatus = getCoreStatus(leader);- assertTrue(- "Instance directory doesn't exist",- FileUtils.fileExists(coreStatus.getInstanceDirectory()));- assertTrue("Data directory doesn't exist", FileUtils.fileExists(coreStatus.getDataDirectory()));+ var coreStatus = getCoreStatus(leader);+ assertTrue("Instance directory doesn't exist", FileUtils.fileExists(coreStatus.instanceDir));+ assertTrue("Data directory doesn't exist", FileUtils.fileExists(coreStatus.dataDir));assertEquals(3, getCollectionState(collection).getActiveSlices().size());@@ -101,9 +98,8 @@ public class DeleteShardTest extends SolrCloudTestCase {waitForState("Expected 'a' to be removed", collection, c -> c.getSlice("a") == null);assertEquals(2, getCollectionState(collection).getActiveSlices().size());- assertFalse(- "Instance directory still exists", FileUtils.fileExists(coreStatus.getInstanceDirectory()));- assertFalse("Data directory still exists", FileUtils.fileExists(coreStatus.getDataDirectory()));+ assertFalse("Instance directory still exists", FileUtils.fileExists(coreStatus.instanceDir));+ assertFalse("Data directory still exists", FileUtils.fileExists(coreStatus.dataDir));leader = getCollectionState(collection).getLeader("b");coreStatus = getCoreStatus(leader);@@ -117,9 +113,8 @@ public class DeleteShardTest extends SolrCloudTestCase {waitForState("Expected 'b' to be removed", collection, c -> c.getSlice("b") == null);assertEquals(1, getCollectionState(collection).getActiveSlices().size());- assertTrue(- "Instance directory still exists", FileUtils.fileExists(coreStatus.getInstanceDirectory()));- assertTrue("Data directory still exists", FileUtils.fileExists(coreStatus.getDataDirectory()));+ assertTrue("Instance directory still exists", FileUtils.fileExists(coreStatus.instanceDir));+ assertTrue("Data directory still exists", FileUtils.fileExists(coreStatus.dataDir));}private void setSliceState(String collectionName, String shardId, Slice.State state)diff --git a/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java b/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.javaindex af7c2d1cd54..a67094098b0 100644--- a/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/SystemCollectionCompatTest.java@@ -101,7 +101,7 @@ public class SystemCollectionCompatTest extends SolrCloudTestCase {DocCollection coll =cloudManager.getClusterStateProvider().getCollection(CollectionAdminParams.SYSTEM_COLL);for (Replica r : coll.getReplicas()) {- coreStartTimes.put(r.getName(), getCoreStatus(r).getCoreStartTime().getTime());+ coreStartTimes.put(r.getName(), getCoreStatus(r).startTime.getTime());}// trigger compat report by changing the schemaSchemaRequest req = new SchemaRequest();@@ -130,7 +130,7 @@ public class SystemCollectionCompatTest extends SolrCloudTestCase {for (Replica r : coll.getReplicas()) {long previousTime = coreStartTimes.get(r.getName());try {- long currentTime = getCoreStatus(r).getCoreStartTime().getTime();+ long currentTime = getCoreStatus(r).startTime.getTime();allReloaded = allReloaded && (previousTime < currentTime);} catch (Exception e) {log.warn("Error retrieving replica status of {}", Utils.toJSONString(r), e);diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionReloadTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionReloadTest.javaindex f46e0a6225a..99761457974 100644--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionReloadTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionReloadTest.java@@ -61,7 +61,7 @@ public class CollectionReloadTest extends SolrCloudTestCase {Replica leader =cluster.getZkStateReader().getLeaderRetry(testCollectionName, "shard1", DEFAULT_TIMEOUT);- long coreStartTime = getCoreStatus(leader).getCoreStartTime().getTime();+ long coreStartTime = getCoreStatus(leader).startTime.getTime();CollectionAdminRequest.reloadCollection(testCollectionName).process(cluster.getSolrClient());RetryUtil.retryUntil(@@ -72,7 +72,7 @@ public class CollectionReloadTest extends SolrCloudTestCase {() -> {long restartTime;try {- restartTime = getCoreStatus(leader).getCoreStartTime().getTime();+ restartTime = getCoreStatus(leader).startTime.getTime();} catch (Exception e) {log.warn("Exception getting core start time: ", e);return false;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.javaindex 81a16ab858f..ae50c308f90 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java@@ -16,17 +16,20 @@*/package org.apache.solr.handler.admin;+import com.fasterxml.jackson.core.type.TypeReference;import java.io.File;import java.io.IOException;import java.io.Reader;import java.nio.charset.StandardCharsets;import java.nio.file.Files;import java.nio.file.Path;+import java.util.Map;import java.util.Properties;import org.apache.solr.SolrTestCaseJ4;+import org.apache.solr.client.api.model.CoreStatusResponse;+import org.apache.solr.client.solrj.JacksonContentWriter;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CoreAdminParams;-import org.apache.solr.common.util.NamedList;import org.apache.solr.core.CorePropertiesLocator;import org.apache.solr.response.SolrQueryResponse;import org.junit.AfterClass;@@ -247,11 +250,14 @@ public class CoreAdminCreateDiscoverTest extends SolrTestCaseJ4 {CoreAdminParams.CORE,"testInstanceDirAsPropertyParam"),resp);- NamedList<?> status = (NamedList<?>) resp.getValues().get("status");- assertNotNull(status);- NamedList<?> coreProps = (NamedList<?>) status.get("testInstanceDirAsPropertyParam");- assertNotNull(status);- String instanceDir = (String) coreProps.get("instanceDir");+ final var statusByCore =+ JacksonContentWriter.DEFAULT_MAPPER.convertValue(+ resp.getValues().get("status"),+ new TypeReference<Map<String, CoreStatusResponse.SingleCoreData>>() {});+ assertNotNull(statusByCore);+ final var coreProps = statusByCore.get("testInstanceDirAsPropertyParam");+ assertNotNull(coreProps);+ String instanceDir = coreProps.instanceDir;assertNotNull(instanceDir);assertEquals("Instance dir does not match param given in property.instanceDir syntax",diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.javaindex 3f7ec3080d5..3e17d115a93 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java@@ -18,6 +18,7 @@ package org.apache.solr.handler.admin;import static org.apache.solr.handler.admin.CoreAdminHandler.CoreAdminAsyncTracker.COMPLETED;+import com.fasterxml.jackson.core.type.TypeReference;import java.io.Reader;import java.nio.charset.StandardCharsets;import java.nio.file.Files;@@ -32,16 +33,16 @@ import java.util.concurrent.atomic.AtomicLong;import org.apache.commons.io.file.PathUtils;import org.apache.lucene.util.Constants;import org.apache.solr.SolrTestCaseJ4;+import org.apache.solr.client.api.model.CoreStatusResponse;+import org.apache.solr.client.solrj.JacksonContentWriter;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CoreAdminRequest;-import org.apache.solr.client.solrj.request.CoreStatus;import org.apache.solr.client.solrj.response.QueryResponse;import org.apache.solr.common.SolrException;import org.apache.solr.common.SolrInputDocument;import org.apache.solr.common.params.CoreAdminParams;-import org.apache.solr.common.util.NamedList;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.CoreDescriptor;import org.apache.solr.core.SolrCore;@@ -229,8 +230,11 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {Map<String, Exception> failures = (Map<String, Exception>) resp.getValues().get("initFailures");assertNotNull("core failures is null", failures);- NamedList<?> status = (NamedList<?>) resp.getValues().get("status");- assertNotNull("core status is null", status);+ final var statusByCore =+ JacksonContentWriter.DEFAULT_MAPPER.convertValue(+ resp.getValues().get("status"),+ new TypeReference<Map<String, CoreStatusResponse.SingleCoreData>>() {});+ assertNotNull("core status is null", statusByCore);assertEquals("wrong number of core failures", 1, failures.size());Exception fail = failures.get("bogus_dir_core");@@ -239,10 +243,10 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {"init failure doesn't mention problem: " + fail.getCause().getMessage(),0 < fail.getCause().getMessage().indexOf("dir_does_not_exist"));- assertEquals(- "bogus_dir_core status isn't empty",- 0,- ((NamedList<?>) status.get("bogus_dir_core")).size());+ assertTrue("bogus_dir_core status isn't empty", statusByCore.containsKey("bogus_dir_core"));+ final var bogusDirCoreStatus = statusByCore.get("bogus_dir_core");+ assertNull(bogusDirCoreStatus.name);+ assertNull(bogusDirCoreStatus.config);// Try renaming the core, we should fail// First assert that the props core exists@@ -464,8 +468,8 @@ public class CoreAdminHandlerTest extends SolrTestCaseJ4 {Path dataDir = null;try (SolrClient client = getHttpSolrClient(runner.getBaseUrl().toString())) {- CoreStatus status = CoreAdminRequest.getCoreStatus("corex", true, client);- String dataDirectory = status.getDataDirectory();+ final var status = CoreAdminRequest.getCoreStatus("corex", true, client);+ String dataDirectory = status.dataDir;dataDir = Paths.get(dataDirectory);assertTrue(Files.exists(dataDir));}diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminOperationTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminOperationTest.javaindex 928e2e94862..97f40bdecc9 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminOperationTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminOperationTest.java@@ -35,6 +35,7 @@ public class CoreAdminOperationTest extends SolrTestCaseJ4 {private CoreAdminHandler.CallInfo callInfo;private SolrQueryRequest mockRequest;+ private CoreAdminHandler mockHandler;@BeforeClasspublic static void setUpClass() {@@ -47,7 +48,8 @@ public class CoreAdminOperationTest extends SolrTestCaseJ4 {super.setUp();mockRequest = mock(SolrQueryRequest.class);- callInfo = new CoreAdminHandler.CallInfo(null, mockRequest, null, null);+ mockHandler = mock(CoreAdminHandler.class);+ callInfo = new CoreAdminHandler.CallInfo(mockHandler, mockRequest, null, null);}@Overridediff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java b/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.javaindex 24c0f6c88a4..337a56205c8 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java@@ -24,14 +24,22 @@ import static org.apache.solr.common.params.CommonParams.COLLECTIONS_HANDLER_PATimport static org.apache.solr.common.params.CommonParams.CONFIGSETS_HANDLER_PATH;import static org.apache.solr.common.params.CommonParams.CORES_HANDLER_PATH;import static org.apache.solr.common.util.ValidatingJsonMap.NOT_NULL;+import static org.mockito.ArgumentMatchers.any;+import static org.mockito.ArgumentMatchers.anyBoolean;+import static org.mockito.Mockito.doAnswer;+import static org.mockito.Mockito.mock;+import static org.mockito.Mockito.when;import java.io.ByteArrayInputStream;import java.io.InputStream;+import java.nio.file.Path;+import java.nio.file.Paths;import java.util.Collections;import java.util.HashMap;import java.util.HashSet;import java.util.List;import java.util.Map;+import java.util.Properties;import java.util.Set;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.api.Api;@@ -71,7 +79,7 @@ public class TestApiFramework extends SolrTestCaseJ4 {public void testFramework() {Map<String, Object[]> calls = new HashMap<>();Map<String, Object> out = new HashMap<>();- CoreContainer mockCC = TestCoreAdminApis.getCoreContainerMock(calls, out);+ CoreContainer mockCC = getCoreContainerMock(calls, out);PluginBag<SolrRequestHandler> containerHandlers =new PluginBag<>(SolrRequestHandler.class, null, false);TestCollectionAPIs.MockCollectionsHandler collectionsHandler =@@ -362,4 +370,40 @@ public class TestApiFramework extends SolrTestCaseJ4 {}}}++ @SuppressWarnings("unchecked")+ public static CoreContainer getCoreContainerMock(+ final Map<String, Object[]> in, Map<String, Object> out) {+ assumeWorkingMockito();++ CoreContainer mockCC = mock(CoreContainer.class);+ when(mockCC.create(any(String.class), any(Path.class), any(Map.class), anyBoolean()))+ .thenAnswer(+ invocationOnMock -> {+ in.put("create", invocationOnMock.getArguments());+ return null;+ });++ doAnswer(+ invocationOnMock -> {+ in.put("rename", invocationOnMock.getArguments());+ return null;+ })+ .when(mockCC)+ .rename(any(String.class), any(String.class));++ doAnswer(+ invocationOnMock -> {+ in.put("unload", invocationOnMock.getArguments());+ return null;+ })+ .when(mockCC)+ .unload(any(String.class), anyBoolean(), anyBoolean(), anyBoolean());++ when(mockCC.getCoreRootDirectory()).thenReturn(Paths.get("coreroot"));+ when(mockCC.getContainerProperties()).thenReturn(new Properties());++ when(mockCC.getRequestHandlers()).thenAnswer(invocationOnMock -> out.get("getRequestHandlers"));+ return mockCC;+ }}diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java b/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.javadeleted file mode 100644index 8a8ac0652bf..00000000000--- a/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java+++ /dev/null@@ -1,97 +0,0 @@-/*- * Licensed to the Apache Software Foundation (ASF) under one or more- * contributor license agreements. See the NOTICE file distributed with- * this work for additional information regarding copyright ownership.- * The ASF licenses this file to You under the Apache License, Version 2.0- * (the "License"); you may not use this file except in compliance with- * the License. You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package org.apache.solr.handler.admin;--import static org.apache.solr.common.util.Utils.fromJSONString;-import static org.mockito.Mockito.any;-import static org.mockito.Mockito.anyBoolean;-import static org.mockito.Mockito.doAnswer;-import static org.mockito.Mockito.mock;-import static org.mockito.Mockito.when;--import java.nio.file.Path;-import java.nio.file.Paths;-import java.util.Collections;-import java.util.HashMap;-import java.util.Map;-import java.util.Properties;-import org.apache.solr.SolrTestCaseJ4;-import org.apache.solr.api.Api;-import org.apache.solr.api.ApiBag;-import org.apache.solr.client.solrj.SolrRequest;-import org.apache.solr.core.CoreContainer;--public class TestCoreAdminApis extends SolrTestCaseJ4 {-- public void testCalls() throws Exception {- Map<String, Object[]> calls = new HashMap<>();- CoreContainer mockCC = getCoreContainerMock(calls, new HashMap<>());-- ApiBag apiBag;- try (CoreAdminHandler coreAdminHandler = new CoreAdminHandler(mockCC)) {- apiBag = new ApiBag(false);- for (Api api : coreAdminHandler.getApis()) {- apiBag.register(api, Collections.emptyMap());- }- }- TestCollectionAPIs.makeCall(- apiBag,- "/cores",- SolrRequest.METHOD.POST,- "{create:{name: hello, instanceDir : someDir, schema: 'schema.xml'}}");- Object[] params = calls.get("create");- assertEquals("hello", params[0]);- assertEquals(fromJSONString("{schema : schema.xml}"), params[2]);- }-- @SuppressWarnings({"unchecked"})- public static CoreContainer getCoreContainerMock(- final Map<String, Object[]> in, Map<String, Object> out) {- assumeWorkingMockito();-- CoreContainer mockCC = mock(CoreContainer.class);- when(mockCC.create(any(String.class), any(Path.class), any(Map.class), anyBoolean()))- .thenAnswer(- invocationOnMock -> {- in.put("create", invocationOnMock.getArguments());- return null;- });-- doAnswer(- invocationOnMock -> {- in.put("rename", invocationOnMock.getArguments());- return null;- })- .when(mockCC)- .rename(any(String.class), any(String.class));-- doAnswer(- invocationOnMock -> {- in.put("unload", invocationOnMock.getArguments());- return null;- })- .when(mockCC)- .unload(any(String.class), anyBoolean(), anyBoolean(), anyBoolean());-- when(mockCC.getCoreRootDirectory()).thenReturn(Paths.get("coreroot"));- when(mockCC.getContainerProperties()).thenReturn(new Properties());-- when(mockCC.getRequestHandlers()).thenAnswer(invocationOnMock -> out.get("getRequestHandlers"));- return mockCC;- }-}diff --git a/solr/core/src/test/org/apache/solr/handler/admin/V2CoresAPIMappingTest.java b/solr/core/src/test/org/apache/solr/handler/admin/V2CoresAPIMappingTest.javaindex 6c692880ec8..b67cb982197 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/V2CoresAPIMappingTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/V2CoresAPIMappingTest.java@@ -17,35 +17,8 @@package org.apache.solr.handler.admin;-import static org.apache.solr.common.params.CollectionAdminParams.NUM_SHARDS;-import static org.apache.solr.common.params.CommonAdminParams.ASYNC;-import static org.apache.solr.common.params.CommonParams.ACTION;-import static org.apache.solr.common.params.CoreAdminParams.COLLECTION;-import static org.apache.solr.common.params.CoreAdminParams.CONFIG;-import static org.apache.solr.common.params.CoreAdminParams.CONFIGSET;-import static org.apache.solr.common.params.CoreAdminParams.CORE;-import static org.apache.solr.common.params.CoreAdminParams.CORE_NODE_NAME;-import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.CREATE;-import static org.apache.solr.common.params.CoreAdminParams.CoreAdminAction.STATUS;-import static org.apache.solr.common.params.CoreAdminParams.DATA_DIR;-import static org.apache.solr.common.params.CoreAdminParams.INDEX_INFO;-import static org.apache.solr.common.params.CoreAdminParams.INSTANCE_DIR;-import static org.apache.solr.common.params.CoreAdminParams.LOAD_ON_STARTUP;-import static org.apache.solr.common.params.CoreAdminParams.NAME;-import static org.apache.solr.common.params.CoreAdminParams.NEW_COLLECTION;-import static org.apache.solr.common.params.CoreAdminParams.REPLICA_TYPE;-import static org.apache.solr.common.params.CoreAdminParams.ROLES;-import static org.apache.solr.common.params.CoreAdminParams.SCHEMA;-import static org.apache.solr.common.params.CoreAdminParams.SHARD;-import static org.apache.solr.common.params.CoreAdminParams.TRANSIENT;-import static org.apache.solr.common.params.CoreAdminParams.ULOG_DIR;--import java.util.Locale;-import java.util.Map;-import org.apache.solr.common.params.SolrParams;-import org.apache.solr.handler.admin.api.AllCoresStatusAPI;-import org.apache.solr.handler.admin.api.CreateCoreAPI;-import org.apache.solr.handler.admin.api.SingleCoreStatusAPI;+import org.apache.solr.common.params.ModifiableSolrParams;+import org.apache.solr.handler.admin.api.CreateCore;import org.junit.Test;/**@@ -61,9 +34,6 @@ public class V2CoresAPIMappingTest extends V2ApiMappingTest<CoreAdminHandler> {@Overridepublic void populateApiBag() {final CoreAdminHandler handler = getRequestHandler();- apiBag.registerObject(new CreateCoreAPI(handler));- apiBag.registerObject(new SingleCoreStatusAPI(handler));- apiBag.registerObject(new AllCoresStatusAPI(handler));}@Override@@ -77,72 +47,57 @@ public class V2CoresAPIMappingTest extends V2ApiMappingTest<CoreAdminHandler> {}@Test- public void testCreateCoreAllProperties() throws Exception {- final SolrParams v1Params =- captureConvertedV1Params(- "/cores",- "POST",- "{'create': {"- + "'name': 'someCoreName', "- + "'instanceDir': 'someInstanceDir', "- + "'dataDir': 'someDataDir', "- + "'ulogDir': 'someUpdateLogDirectory', "- + "'schema': 'some-schema-file-name', "- + "'config': 'some-config-file-name', "- + "'configSet': 'someConfigSetName', "- + "'loadOnStartup': true, "- + "'isTransient': true, "- + "'shard': 'someShardName', "- + "'collection': 'someCollectionName', "- + "'replicaType': 'TLOG', "- + "'coreNodeName': 'someNodeName', "- + "'numShards': 123, "- + "'roles': ['role1', 'role2'], "- + "'properties': {'prop1': 'val1', 'prop2': 'val2'}, "- + "'newCollection': true, "- + "'async': 'requestTrackingId' "- + "}}");-- assertEquals(CREATE.name().toLowerCase(Locale.ROOT), v1Params.get(ACTION));- assertEquals("someCoreName", v1Params.get(NAME));- assertEquals("someInstanceDir", v1Params.get(INSTANCE_DIR));- assertEquals("someDataDir", v1Params.get(DATA_DIR));- assertEquals("someUpdateLogDirectory", v1Params.get(ULOG_DIR));- assertEquals("some-schema-file-name", v1Params.get(SCHEMA));- assertEquals("some-config-file-name", v1Params.get(CONFIG));- assertEquals("someConfigSetName", v1Params.get(CONFIGSET));- assertTrue(v1Params.getPrimitiveBool(LOAD_ON_STARTUP));- assertTrue(v1Params.getPrimitiveBool(TRANSIENT));- assertEquals("someShardName", v1Params.get(SHARD));- assertEquals("someCollectionName", v1Params.get(COLLECTION));- assertEquals("TLOG", v1Params.get(REPLICA_TYPE));- assertEquals("someNodeName", v1Params.get(CORE_NODE_NAME));- assertEquals(123, v1Params.getPrimitiveInt(NUM_SHARDS));- assertEquals("role1,role2", v1Params.get(ROLES));- assertEquals("val1", v1Params.get("property.prop1"));- assertEquals("val2", v1Params.get("property.prop2"));- assertTrue(v1Params.getPrimitiveBool(NEW_COLLECTION));- assertEquals("requestTrackingId", v1Params.get(ASYNC));- }+ public void testCreateCoreRequestBodyMappingAllParams() throws Exception {+ final ModifiableSolrParams v1Params = new ModifiableSolrParams();+ v1Params.add("action", "create");+ v1Params.add("name", "someCoreName");+ v1Params.add("instanceDir", "some/instance/dir");+ v1Params.add("config", "some-config.xml");+ v1Params.add("schema", "some-schema.xml");+ v1Params.add("dataDir", "some/data/dir");+ v1Params.add("ulogDir", "some/ulog/dir");+ v1Params.add("configSet", "someConfigset");+ v1Params.add("shard", "shard1");+ v1Params.add("loadOnStartup", "true");+ v1Params.add("transient", "true");+ v1Params.add("coreNodeName", "someNodeName");+ v1Params.add("newCollection", "true");+ v1Params.add("async", "someAsyncId");+ v1Params.add("roles", "role1,role2");+ v1Params.add("collection", "someCollection");+ v1Params.add("property.foo", "fooVal");+ v1Params.add("property.bar", "barVal");+ v1Params.add("collection.abc", "abcVal");+ v1Params.add("collection.xyz", "xyzVal");- @Test- public void testSpecificCoreStatusApiAllParams() throws Exception {- final SolrParams v1Params =- captureConvertedV1Params(- "/cores/someCore", "GET", Map.of(INDEX_INFO, new String[] {"true"}));+ final var createRequestBody = CreateCore.createRequestBodyFromV1Params(v1Params);- assertEquals(STATUS.name().toLowerCase(Locale.ROOT), v1Params.get(ACTION));- assertEquals("someCore", v1Params.get(CORE));- assertTrue(v1Params.getPrimitiveBool(INDEX_INFO));- }-- @Test- public void testAllCoreStatusApiAllParams() throws Exception {- final SolrParams v1Params =- captureConvertedV1Params("/cores", "GET", Map.of(INDEX_INFO, new String[] {"true"}));+ assertEquals("someCoreName", createRequestBody.name);+ assertEquals("some/instance/dir", createRequestBody.instanceDir);+ assertEquals("some-config.xml", createRequestBody.config);+ assertEquals("some-schema.xml", createRequestBody.schema);+ assertEquals("some/data/dir", createRequestBody.dataDir);+ assertEquals("some/ulog/dir", createRequestBody.ulogDir);+ assertEquals("someConfigset", createRequestBody.configSet);+ assertEquals("someCollection", createRequestBody.collection);+ assertEquals("shard1", createRequestBody.shard);+ assertEquals(Boolean.TRUE, createRequestBody.loadOnStartup);+ assertEquals(Boolean.TRUE, createRequestBody.isTransient);+ assertEquals(Boolean.TRUE, createRequestBody.newCollection);+ assertEquals("someNodeName", createRequestBody.coreNodeName);+ assertEquals(2, createRequestBody.roles.size());+ assertEquals("role1", createRequestBody.roles.get(0));+ assertEquals("role2", createRequestBody.roles.get(1));+ assertNotNull(createRequestBody.properties);+ assertEquals(2, createRequestBody.properties.size());+ assertEquals("fooVal", createRequestBody.properties.get("foo"));+ assertEquals("barVal", createRequestBody.properties.get("bar"));+ assertNotNull(createRequestBody.collectionProperties);+ assertEquals(2, createRequestBody.collectionProperties.size());+ assertEquals("abcVal", createRequestBody.collectionProperties.get("abc"));+ assertEquals("xyzVal", createRequestBody.collectionProperties.get("xyz"));- assertEquals(STATUS.name().toLowerCase(Locale.ROOT), v1Params.get(ACTION));- assertNull("Expected 'core' parameter to be null", v1Params.get(CORE));- assertTrue(v1Params.getPrimitiveBool(INDEX_INFO));+ // V1 codepath handles the async/taskId differently, and it's not passed down the v2 code+ assertEquals(null, createRequestBody.async);}}diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.javaindex 5c0f4f49d22..e758b7326f1 100644--- a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java+++ b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java@@ -16,9 +16,13 @@*/package org.apache.solr.schema;+import com.fasterxml.jackson.core.type.TypeReference;import java.nio.charset.StandardCharsets;import java.util.List;+import java.util.Map;import java.util.concurrent.TimeUnit;+import org.apache.solr.client.api.model.CoreStatusResponse;+import org.apache.solr.client.solrj.JacksonContentWriter;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.QueryRequest;@@ -60,14 +64,17 @@ public class TestCloudManagedSchema extends AbstractFullDistribZkTestBase {try (SolrClient rootClient =new HttpSolrClient.Builder(buildUrl(jettys.get(which).getLocalPort())).build()) {NamedList<?> namedListResponse = rootClient.request(request);- NamedList<?> status = (NamedList<?>) namedListResponse.get("status");- NamedList<?> collectionStatus = (NamedList<?>) status.getVal(0);- String collectionSchema = (String) collectionStatus.get(CoreAdminParams.SCHEMA);+ final var statusByCore =+ JacksonContentWriter.DEFAULT_MAPPER.convertValue(+ namedListResponse.get("status"),+ new TypeReference<Map<String, CoreStatusResponse.SingleCoreData>>() {});+ final String coreName = statusByCore.keySet().stream().findFirst().get();+ final var collectionStatus = statusByCore.get(coreName);// Make sure the upgrade to managed schema happenedassertEquals("Schema resource name differs from expected name","managed-schema.xml",- collectionSchema);+ collectionStatus.schema);}try (SolrZkClient zkClient =diff --git a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.javaindex ec5d288bc7f..7efbdf09aa9 100644--- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java+++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java@@ -16,6 +16,7 @@*/package org.apache.solr.schema;+import com.fasterxml.jackson.core.type.TypeReference;import java.io.File;import java.io.InputStream;import java.lang.invoke.MethodHandles;@@ -26,6 +27,8 @@ import java.util.HashMap;import java.util.Map;import java.util.regex.Pattern;import org.apache.commons.io.FileUtils;+import org.apache.solr.client.api.model.CoreStatusResponse;+import org.apache.solr.client.solrj.JacksonContentWriter;import org.apache.solr.common.SolrException;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.common.util.NamedList;@@ -158,13 +161,14 @@ public class TestManagedSchema extends AbstractBadConfigTestBase {admin.handleRequestBody(request, response);assertNull("Exception on create", response.getException());NamedList<?> responseValues = response.getValues();- NamedList<?> status = (NamedList<?>) responseValues.get("status");- NamedList<?> collectionStatus = (NamedList<?>) status.get(collection);- String collectionSchema = (String) collectionStatus.get(CoreAdminParams.SCHEMA);+ final var statusByCore =+ JacksonContentWriter.DEFAULT_MAPPER.convertValue(+ responseValues.get("status"),+ new TypeReference<Map<String, CoreStatusResponse.SingleCoreData>>() {});assertEquals("Schema resource name differs from expected name",expectedSchemaResource,- collectionSchema);+ statusByCore.get(collection).schema);}public void testAddFieldWhenNotMutable() throws Exception {diff --git a/solr/core/src/test/org/apache/solr/util/tracing/TestSimplePropagatorDistributedTracing.java b/solr/core/src/test/org/apache/solr/util/tracing/TestSimplePropagatorDistributedTracing.javaindex 36a4788d93e..8b1af81c59e 100644--- a/solr/core/src/test/org/apache/solr/util/tracing/TestSimplePropagatorDistributedTracing.java+++ b/solr/core/src/test/org/apache/solr/util/tracing/TestSimplePropagatorDistributedTracing.java@@ -35,7 +35,7 @@ import org.apache.solr.client.solrj.response.CollectionAdminResponse;import org.apache.solr.cloud.SolrCloudTestCase;import org.apache.solr.common.util.SuppressForbidden;import org.apache.solr.core.SolrCore;-import org.apache.solr.handler.admin.CoreAdminOperation;+import org.apache.solr.handler.admin.api.CreateCore;import org.apache.solr.logging.MDCLoggingContext;import org.apache.solr.update.processor.LogUpdateProcessorFactory;import org.apache.solr.util.LogListener;@@ -191,7 +191,7 @@ public class TestSimplePropagatorDistributedTracing extends SolrCloudTestCase {}private void verifyCollectionCreation(String collection) throws Exception {- try (LogListener reqLog = LogListener.info(CoreAdminOperation.class.getName())) {+ try (LogListener reqLog = LogListener.info(CreateCore.class.getName())) {var a1 = CollectionAdminRequest.createCollection(collection, 2, 2);CollectionAdminResponse r1 = a1.process(cluster.getSolrClient());assertEquals(0, r1.getStatus());diff --git a/solr/documentation/gradle.lockfile b/solr/documentation/gradle.lockfileindex 45fbc16d3be..a31ed3e96c7 100644--- a/solr/documentation/gradle.lockfile+++ b/solr/documentation/gradle.lockfile@@ -4,7 +4,7 @@org.apache.lucene:lucene-analysis-common:9.12.1=javadocsorg.apache.lucene:lucene-analysis-stempel:9.12.1=javadocsorg.apache.lucene:lucene-core:9.12.1=javadocs-org.apache.lucene:lucene-queryparser:9.12.1=javadocsorg.apache.lucene:lucene-queries:9.12.1=javadocs+org.apache.lucene:lucene-queryparser:9.12.1=javadocsorg.apache.lucene:lucene-spatial-extras:9.12.1=javadocsempty=changesHtml,jarValidation,minimalSite,sitediff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfileindex a305af25637..677b1e80105 100644--- a/solr/modules/analysis-extras/gradle.lockfile+++ b/solr/modules/analysis-extras/gradle.lockfile@@ -3,13 +3,13 @@# This file is expected to be part of source control.com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson:jackson-bom:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfileindex d563943f247..519d9dbb045 100644--- a/solr/modules/clustering/gradle.lockfile+++ b/solr/modules/clustering/gradle.lockfile@@ -3,13 +3,13 @@# This file is expected to be part of source control.com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson:jackson-bom:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfileindex 0903c44ffb2..aa3799687ce 100644--- a/solr/modules/cross-dc/gradle.lockfile+++ b/solr/modules/cross-dc/gradle.lockfile@@ -3,13 +3,13 @@# This file is expected to be part of source control.com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson:jackson-bom:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfileindex 94354787536..2d020e3b251 100644--- a/solr/modules/gcs-repository/gradle.lockfile+++ b/solr/modules/gcs-repository/gradle.lockfile@@ -3,7 +3,7 @@# This file is expected to be part of source control.com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfileindex 9a640ee8235..ed04af88595 100644--- a/solr/modules/jwt-auth/gradle.lockfile+++ b/solr/modules/jwt-auth/gradle.lockfile@@ -3,7 +3,7 @@# This file is expected to be part of source control.com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=jarValidation,permitTestUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=compileClasspath,jarValidation,permitTestUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=jarValidation,permitTestUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=jarValidation,permitTestUnusedDeclared,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathdiff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfileindex bbb067b0248..2b68140f164 100644--- a/solr/modules/langid/gradle.lockfile+++ b/solr/modules/langid/gradle.lockfile@@ -4,13 +4,13 @@com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.cybozu.labs:langdetect:1.1-20120112=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson:jackson-bom:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/modules/llm/gradle.lockfile b/solr/modules/llm/gradle.lockfileindex 133e1db612f..4032768953b 100644--- a/solr/modules/llm/gradle.lockfile+++ b/solr/modules/llm/gradle.lockfile@@ -3,13 +3,13 @@# This file is expected to be part of source control.com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson:jackson-bom:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfileindex 088d3e3b6ee..8c3494666eb 100644--- a/solr/modules/ltr/gradle.lockfile+++ b/solr/modules/ltr/gradle.lockfile@@ -3,13 +3,13 @@# This file is expected to be part of source control.com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson:jackson-bom:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfileindex b8d5824fcbc..836a7f64c77 100644--- a/solr/modules/opentelemetry/gradle.lockfile+++ b/solr/modules/opentelemetry/gradle.lockfile@@ -3,13 +3,13 @@# This file is expected to be part of source control.com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson:jackson-bom:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfileindex ed6257fef58..561cc83e01f 100644--- a/solr/modules/s3-repository/gradle.lockfile+++ b/solr/modules/s3-repository/gradle.lockfile@@ -10,7 +10,7 @@ com.amazonaws:aws-java-sdk-s3:1.12.501=jarValidation,testCompileClasspath,testRucom.amazonaws:jmespath-java:1.12.501=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath@@ -20,7 +20,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.2=jarValidation,testCocom.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2=jarValidation,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-parameter-names:2.18.2=jarValidation,testCompileClasspath,testRuntimeClasspath-com.fasterxml.jackson:jackson-bom:2.18.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfileindex 50e8991f24b..33c64ab8e67 100644--- a/solr/modules/scripting/gradle.lockfile+++ b/solr/modules/scripting/gradle.lockfile@@ -3,13 +3,13 @@# This file is expected to be part of source control.com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath-com.fasterxml.jackson:jackson-bom:2.18.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfileindex e425da75b2f..7786904bf81 100644--- a/solr/solr-ref-guide/gradle.lockfile+++ b/solr/solr-ref-guide/gradle.lockfile@@ -3,13 +3,13 @@# This file is expected to be part of source control.com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=testRuntimeClasspath-com.fasterxml.jackson:jackson-bom:2.18.2=testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,errorprone,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/coreadmin-api.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/coreadmin-api.adocindex c1053d93c43..bf83da1c5d8 100644--- a/solr/solr-ref-guide/modules/configuration-guide/pages/coreadmin-api.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/coreadmin-api.adoc@@ -138,10 +138,8 @@ V2 API::----curl -X POST http://localhost:8983/api/cores -H 'Content-Type: application/json' -d '{- "create": {- "name": "techproducts_v2",- "configSet": "sample_techproducts_configs"- }+ "name": "techproducts_v2",+ "configSet": "sample_techproducts_configs"}'----@@ -247,6 +245,7 @@ For more information, see the section xref:config-sets.adoc[].The name of the collection to which this core belongs.The default is the name of the core.`collection._param_=_value_` causes a property of `_param_=_value_` to be set if a new collection is being created.+(For v2 API calls, these collection properties may be specified in the request body as an object or map under the key, `collectionProperties`.)Use `collection.configName=_config-name_` to point to the configuration for a new collection.+WARNING: While it's possible to create a core for a non-existent collection, this approach is not supported and not recommended.@@ -270,6 +269,7 @@ This should only be required in special circumstances; normally you want to be a|===+Sets the core property _name_ to _value_.+(For v2 API calls, these properties may be specified in the request body as an object or map under the key, `properties`.)See the section on defining xref:core-discovery.adoc#defining-core-properties-files[core.properties file contents].`async`::diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfileindex c903156b45e..d3cae3f079d 100644--- a/solr/solrj-streaming/gradle.lockfile+++ b/solr/solrj-streaming/gradle.lockfile@@ -5,13 +5,13 @@ ch.qos.logback:logback-classic:1.2.13=permitTestUnusedDeclaredch.qos.logback:logback-core:1.2.13=permitTestUnusedDeclaredcom.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=jarValidation,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=jarValidation,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=jarValidation,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=jarValidation,testRuntimeClasspath-com.fasterxml.jackson:jackson-bom:2.18.2=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfileindex 191c3163dfb..c94adbdbecf 100644--- a/solr/solrj-zookeeper/gradle.lockfile+++ b/solr/solrj-zookeeper/gradle.lockfile@@ -3,13 +3,13 @@# This file is expected to be part of source control.com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=jarValidation,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=jarValidation,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=jarValidation,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=jarValidation,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=jarValidation,testRuntimeClasspath-com.fasterxml.jackson:jackson-bom:2.18.2=jarValidation,permitTestUsedUndeclared,runtimeClasspath,testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=compileClasspath,jarValidation,permitTestUsedUndeclared,runtimeClasspath,testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=jarValidation,testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradleindex 2e6636519ff..ed75ecceace 100644--- a/solr/solrj/build.gradle+++ b/solr/solrj/build.gradle@@ -29,6 +29,7 @@ description = 'Solrj - Solr Java Client'dependencies {implementation libs.fasterxml.jackson.core.databindimplementation libs.fasterxml.jackson.core.annotations+ implementation libs.fasterxml.jackson.core.coreapi project(":solr:api")implementation libs.slf4j.apidiff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.javaindex d31b5651fbe..db078ca2ebc 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java@@ -19,6 +19,7 @@ package org.apache.solr.client.solrj.request;import java.io.IOException;import java.util.Arrays;import java.util.List;+import org.apache.solr.client.api.model.CoreStatusResponse;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;@@ -708,17 +709,18 @@ public class CoreAdminRequest extends SolrRequest<CoreAdminResponse> {return req.process(client);}- public static CoreStatus getCoreStatus(String coreName, SolrClient client)+ public static CoreStatusResponse.SingleCoreData getCoreStatus(String coreName, SolrClient client)throws SolrServerException, IOException {return getCoreStatus(coreName, true, client);}- public static CoreStatus getCoreStatus(String coreName, boolean getIndexInfo, SolrClient client)+ public static CoreStatusResponse.SingleCoreData getCoreStatus(+ String coreName, boolean getIndexInfo, SolrClient client)throws SolrServerException, IOException {CoreAdminRequest req = new CoreAdminRequest();req.setAction(CoreAdminAction.STATUS);req.setIndexInfoNeeded(getIndexInfo);- return new CoreStatus(req.process(client).getCoreStatus(coreName));+ return req.process(client).getCoreStatus(coreName);}public static CoreAdminResponse getStatus(String name, SolrClient client)diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/CoreAdminResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/CoreAdminResponse.javaindex 0226593891f..d7c4899a898 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/CoreAdminResponse.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/CoreAdminResponse.java@@ -16,35 +16,40 @@*/package org.apache.solr.client.solrj.response;+import com.fasterxml.jackson.core.type.TypeReference;import java.util.Date;-import org.apache.solr.common.util.NamedList;+import java.util.Map;+import org.apache.solr.client.api.model.CoreStatusResponse;+import org.apache.solr.client.solrj.JacksonContentWriter;/*** @since solr 1.3*/public class CoreAdminResponse extends SolrResponseBase {- @SuppressWarnings("unchecked")- public NamedList<NamedList<Object>> getCoreStatus() {- return (NamedList<NamedList<Object>>) getResponse().get("status");++ public Map<String, CoreStatusResponse.SingleCoreData> getCoreStatus() {+ final var allCoreStatus = getResponse().get("status");+ return JacksonContentWriter.DEFAULT_MAPPER.convertValue(+ allCoreStatus, new TypeReference<Map<String, CoreStatusResponse.SingleCoreData>>() {});}- public NamedList<Object> getCoreStatus(String core) {+ public CoreStatusResponse.SingleCoreData getCoreStatus(String core) {return getCoreStatus().get(core);}public Date getStartTime(String core) {- NamedList<Object> v = getCoreStatus(core);+ final var v = getCoreStatus(core);if (v == null) {return null;}- return (Date) v.get("startTime");+ return v.startTime;}public Long getUptime(String core) {- NamedList<Object> v = getCoreStatus(core);+ final var v = getCoreStatus(core);if (v == null) {return null;}- return (Long) v.get("uptime");+ return v.uptime;}}diff --git a/solr/solrj/src/java/org/apache/solr/common/util/CollectionUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/CollectionUtil.javaindex 92282e1ccfc..3b40f14bf5c 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/CollectionUtil.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/CollectionUtil.java@@ -20,6 +20,7 @@ import java.util.Collection;import java.util.HashMap;import java.util.HashSet;import java.util.LinkedHashMap;+import java.util.Map;/*** Methods for creating collections with exact sizes, and other convenience methods@@ -69,4 +70,12 @@ public final class CollectionUtil {public static boolean isNotEmpty(Collection<?> collection) {return !isEmpty(collection);}++ public static boolean isEmpty(Map<?, ?> map) {+ return map == null || map.isEmpty();+ }++ public static boolean isNotEmpty(Map<?, ?> map) {+ return !isEmpty(map);+ }}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.javaindex d8630d016ff..ddcd76d9a5d 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java@@ -264,7 +264,7 @@ public class TestCoreAdmin extends AbstractEmbeddedSolrServerTestCase {try {cores = CoreContainer.createAndLoad(SOLR_HOME);- String ddir = CoreAdminRequest.getCoreStatus("core0", getSolrCore0()).getDataDirectory();+ String ddir = CoreAdminRequest.getCoreStatus("core0", getSolrCore0()).dataDir;Path data = Paths.get(ddir, "index");assumeTrue("test can't handle relative data directory paths (yet?)", data.isAbsolute());diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradleindex 0dfa58b829b..c9f1be0450c 100644--- a/solr/test-framework/build.gradle+++ b/solr/test-framework/build.gradle@@ -32,6 +32,7 @@ dependencies {api project(':solr:core')api project(':solr:solrj')+ api project(':solr:api')implementation project(':solr:solrj-zookeeper')api libs.apache.lucene.testframeworkdiff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfileindex 283cc57eb61..14132528644 100644--- a/solr/test-framework/gradle.lockfile+++ b/solr/test-framework/gradle.lockfile@@ -3,13 +3,13 @@# This file is expected to be part of source control.com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathcom.carrotsearch:hppc:0.10.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath-com.fasterxml.jackson.core:jackson-annotations:2.18.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath+com.fasterxml.jackson.core:jackson-annotations:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-core:2.18.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspathcom.fasterxml.jackson.core:jackson-databind:2.18.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspathcom.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspathcom.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.18.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath-com.fasterxml.jackson:jackson-bom:2.18.2=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath+com.fasterxml.jackson:jackson-bom:2.18.2=apiHelper,compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspathcom.fasterxml.woodstox:woodstox-core:7.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspathcom.github.ben-manes.caffeine:caffeine:3.1.8=annotationProcessor,apiHelper,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testRuntimeClasspathcom.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorprone,testAnnotationProcessordiff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.javaindex 73baf2b8c84..2ca97dbbbe4 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractMoveReplicaTestBase.java@@ -25,6 +25,7 @@ import java.util.Collections;import java.util.List;import java.util.Map;import java.util.Set;+import org.apache.solr.client.api.model.CoreStatusResponse;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;@@ -376,17 +377,16 @@ public abstract class AbstractMoveReplicaTestBase extends SolrCloudTestCase {}// filter size by collection nameint size = 0;- for (Map.Entry<String, NamedList<Object>> stringNamedListEntry : status.getCoreStatus()) {+ for (Map.Entry<String, CoreStatusResponse.SingleCoreData> coreStatusEntry :+ status.getCoreStatus().entrySet()) {if (collectionName != null) {- String coll =- (String) stringNamedListEntry.getValue().findRecursive("cloud", "collection");+ String coll = coreStatusEntry.getValue().cloud.collection;if (!collectionName.equals(coll)) {continue;}}if (replicaType != null) {- String type =- (String) stringNamedListEntry.getValue().findRecursive("cloud", "replicaType");+ String type = coreStatusEntry.getValue().cloud.replicaType;if (!replicaType.equals(type)) {continue;}diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.javaindex 83ad32ca523..bb0f60e2a9b 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java@@ -39,13 +39,13 @@ import java.util.concurrent.atomic.AtomicReference;import java.util.function.Predicate;import org.apache.lucene.tests.util.LuceneTestCase;import org.apache.solr.SolrTestCaseJ4;+import org.apache.solr.client.api.model.CoreStatusResponse;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrRequest;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.impl.CloudLegacySolrClient;import org.apache.solr.client.solrj.impl.HttpSolrClient;import org.apache.solr.client.solrj.request.CoreAdminRequest;-import org.apache.solr.client.solrj.request.CoreStatus;import org.apache.solr.common.cloud.CollectionStatePredicate;import org.apache.solr.common.cloud.DocCollection;import org.apache.solr.common.cloud.LiveNodesPredicate;@@ -369,11 +369,12 @@ public class SolrCloudTestCase extends SolrTestCaseJ4 {}/**- * Get the {@link CoreStatus} data for a {@link Replica}+ * Get the {@link org.apache.solr.client.api.model.CoreStatusResponse.SingleCoreData} data for a+ * {@link Replica}** <p>This assumes that the replica is hosted on a live node.*/- protected static CoreStatus getCoreStatus(Replica replica)+ protected static CoreStatusResponse.SingleCoreData getCoreStatus(Replica replica)throws IOException, SolrServerException {JettySolrRunner jetty = cluster.getReplicaJetty(replica);try (SolrClient client =diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.javaindex d0e250e59c7..2b1973a09ec 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/api/collections/AbstractCollectionsAPIDistributedZkTestBase.java@@ -40,12 +40,12 @@ import javax.management.MBeanServer;import javax.management.MBeanServerFactory;import javax.management.ObjectName;import org.apache.lucene.tests.util.TestUtil;+import org.apache.solr.client.api.model.CoreStatusResponse;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.SolrQuery;import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.request.CollectionAdminRequest;import org.apache.solr.client.solrj.request.CoreAdminRequest;-import org.apache.solr.client.solrj.request.CoreStatus;import org.apache.solr.client.solrj.request.QueryRequest;import org.apache.solr.client.solrj.request.UpdateRequest;import org.apache.solr.client.solrj.response.CollectionAdminResponse;@@ -60,7 +60,6 @@ import org.apache.solr.common.cloud.ZkStateReader;import org.apache.solr.common.params.CollectionParams.CollectionAction;import org.apache.solr.common.params.CoreAdminParams;import org.apache.solr.common.params.ModifiableSolrParams;-import org.apache.solr.common.util.NamedList;import org.apache.solr.common.util.TimeSource;import org.apache.solr.core.CoreContainer;import org.apache.solr.core.SolrCore;@@ -568,11 +567,11 @@ public abstract class AbstractCollectionsAPIDistributedZkTestBase extends SolrClfor (Slice shard : collectionState) {for (Replica replica : shard) {ZkCoreNodeProps coreProps = new ZkCoreNodeProps(replica);- CoreStatus coreStatus;+ CoreStatusResponse.SingleCoreData coreStatus;try (SolrClient server = getHttpSolrClient(coreProps.getBaseUrl())) {coreStatus = CoreAdminRequest.getCoreStatus(coreProps.getCoreName(), false, server);}- long before = coreStatus.getCoreStartTime().getTime();+ long before = coreStatus.startTime.getTime();urlToTime.put(coreProps.getCoreUrl(), before);}}@@ -660,8 +659,8 @@ public abstract class AbstractCollectionsAPIDistributedZkTestBase extends SolrCltry (SolrClient coreclient = getHttpSolrClient(newReplica.getBaseUrl())) {CoreAdminResponse status = CoreAdminRequest.getStatus(newReplica.getStr("core"), coreclient);- NamedList<Object> coreStatus = status.getCoreStatus(newReplica.getStr("core"));- String instanceDirStr = (String) coreStatus.get("instanceDir");+ final var coreStatus = status.getCoreStatus(newReplica.getStr("core"));+ String instanceDirStr = coreStatus.instanceDir;assertEquals(instanceDirStr, instancePath.toString());}diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.javaindex 9c033827241..7d121096a36 100644--- a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java+++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java@@ -34,7 +34,6 @@ import java.nio.file.Files;import java.nio.file.Path;import java.util.ArrayList;import java.util.EnumSet;-import java.util.LinkedHashMap;import java.util.List;import java.util.Locale;import java.util.Map;@@ -58,16 +57,14 @@ import javax.servlet.http.HttpServletRequest;import javax.servlet.http.HttpServletResponse;import org.apache.lucene.util.Constants;import org.apache.solr.client.solrj.SolrClient;+import org.apache.solr.client.solrj.SolrServerException;import org.apache.solr.client.solrj.cloud.SocketProxy;import org.apache.solr.client.solrj.embedded.SSLConfig;import org.apache.solr.client.solrj.impl.HttpSolrClient;-import org.apache.solr.common.util.NamedList;-import org.apache.solr.common.util.SimpleOrderedMap;+import org.apache.solr.client.solrj.request.CoresApi;import org.apache.solr.common.util.TimeSource;+import org.apache.solr.common.util.Utils;import org.apache.solr.core.CoreContainer;-import org.apache.solr.core.SolrCore;-import org.apache.solr.handler.admin.CoreAdminOperation;-import org.apache.solr.handler.admin.LukeRequestHandler;import org.apache.solr.metrics.SolrMetricManager;import org.apache.solr.servlet.CoreContainerProvider;import org.apache.solr.servlet.SolrDispatchFilter;@@ -96,7 +93,6 @@ import org.eclipse.jetty.servlet.Source;import org.eclipse.jetty.util.ssl.SslContextFactory;import org.eclipse.jetty.util.thread.QueuedThreadPool;import org.eclipse.jetty.util.thread.ReservedThreadExecutor;-import org.noggit.JSONUtil;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.slf4j.MDC;@@ -714,21 +710,14 @@ public class JettySolrRunner {public void dumpCoresInfo(PrintStream pw) throws IOException {if (getCoreContainer() != null) {- List<SolrCore> cores = getCoreContainer().getCores();- for (SolrCore core : cores) {- NamedList<Object> coreStatus =- CoreAdminOperation.getCoreStatus(getCoreContainer(), core.getName(), false);- core.withSearcher(- solrIndexSearcher -> {- SimpleOrderedMap<Object> lukeIndexInfo =- LukeRequestHandler.getIndexInfo(solrIndexSearcher.getIndexReader());- Map<String, Object> indexInfoMap = coreStatus.toMap(new LinkedHashMap<>());- indexInfoMap.putAll(lukeIndexInfo.toMap(new LinkedHashMap<>()));- pw.println(JSONUtil.toJSON(indexInfoMap, 2));-- pw.println();- return null;- });+ final var coreStatusReq = new CoresApi.GetAllCoreStatus();+ coreStatusReq.setIndexInfo(true);+ try (final var client = newClient()) {+ final var coreStatusRsp = coreStatusReq.process(client).getParsed();+ Utils.writeJson(coreStatusRsp, pw, true);+ } catch (SolrServerException | IOException e) {+ // Worth logging but not re-throwing+ log.error("Unable to dump info for all cores", e);}}}