Migrate SchemaDesignerAPI to JAX-RS V2 annotations with RESTful improvements

CHANGELOG.md

@@ -24,7 +24,7 @@ This file lists Solr's raw release notes with details of every change to Solr. M
 - Added new ConcurrentUpdateJdkSolrClient that works with HttpJdkSolrClient [SOLR-18065](https://issues.apache.org/jira/browse/SOLR-18065) (James Dyer)
 - Support including stored fields in Export Writer output. [SOLR-18071](https://issues.apache.org/jira/browse/SOLR-18071) (Luke Kot-Zaniewski)
 - Introducing support for multi valued dense vector representation in documents through nested vectors [SOLR-18074](https://issues.apache.org/jira/browse/SOLR-18074) (Alessandro Benedetti)
-- CoreAdmin API (/admin/cores?action=UPGRADECOREINDEX) to upgrade an index in-place [SOLR-18096](https://issues.apache.org/jira/browse/SOLR-18096) (Rahul Goswami)
+- CoreAdmin API (/admin/cores?action=UPGRADEINDEX) to upgrade an index in-place [SOLR-18096](https://issues.apache.org/jira/browse/SOLR-18096) (Rahul Goswami)
 - CrossDC Consumer - add Prometheus metrics [SOLR-18060](https://issues.apache.org/jira/browse/SOLR-18060) (Andrzej Bialecki @ab)
 - CrossDC - support arbitrary Kafka properties [SOLR-18062](https://issues.apache.org/jira/browse/SOLR-18062) (Andrzej Bialecki @ab)
 

changelog/unreleased/PR#4367-filestore-getmetadata-delete-race.yml

@@ -0,0 +1,7 @@
+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
+title: Filestore metadata API no longer returns HTTP 500 when a file is deleted concurrently with a metadata read; the response now matches the not-found case (null entry).
+type: fixed # added, changed, fixed, deprecated, removed, dependency_update, security, other
+authors:
+  - name: Eric Pugh
+links: 
+  - https://github.com/apache/solr/pull/4367

changelog/unreleased/SOLR-17924-configset-creation-new-ui.yml

@@ -0,0 +1,10 @@
+title: SOLR 17845 - Implement Configset Creation and Importing in New UI
+type: added
+authors:
+  - name: Christos Malliaridis
+    nick: malliaridis
+links:
+  - name: SOLR-17924
+    url: https://issues.apache.org/jira/browse/SOLR-17924
+  - name: PR#4166
+    url: https://github.com/apache/solr/pull/4166

changelog/unreleased/SOLR-18152-add-configset-download-zip-to-solrj-fix-schema-designer-bug.yml

@@ -0,0 +1,8 @@
+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
+title: Schema Designer sample-doc analysis now works correctly when analyze sample documents.
+type: fixed # added, changed, fixed, deprecated, removed, dependency_update, security, other
+authors:
+  - name: Eric Pugh
+links:
+  - name: SOLR-18152
+    url: https://issues.apache.org/jira/browse/SOLR-18152

changelog/unreleased/SOLR-18198-support-missing-stats-count-in-rollup.yml

@@ -0,0 +1,8 @@
+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
+title: "Support 'missing' stats count in rollup function for streaming expressions"
+type: added
+authors:
+  - name: khushjain
+links:
+  - name: SOLR-18198
+    url: https://issues.apache.org/jira/browse/SOLR-18198

changelog/unreleased/SOLR-18210-fix-GPU-vector-indexing.yml

@@ -0,0 +1,7 @@
+title: Fix for GPU vector indexing silently falling back to using CPU instead
+type: fixed
+authors:
+  - name: Rahul Goswami
+links:
+  - name: SOLR-18210
+    url: https://issues.apache.org/jira/browse/SOLR-18210

gradle/libs.versions.toml

@@ -15,6 +15,9 @@
 [versions]
 adobe-testing-s3mock = "3.12.0"
 amazon-awssdk = "2.42.34"
+androidx-adaptive = "1.3.0-alpha07"
+androidx-lifecycle = "2.10.0"
+androidx-navigation3 = "1.1.0"
 # @keep Antora version used in ref-guide
 antora = "3.1.12"
 # @keep Most recent commit as of 2025-08-03, this repo does not have tags
@@ -236,6 +239,12 @@ amazon-awssdk-retries-spi = { module = "software.amazon.awssdk:retries-spi", ver
 amazon-awssdk-s3 = { module = "software.amazon.awssdk:s3", version.ref = "amazon-awssdk" }
 amazon-awssdk-sdkcore = { module = "software.amazon.awssdk:sdk-core", version.ref = "amazon-awssdk" }
 amazon-awssdk-sts = { module = "software.amazon.awssdk:sts", version.ref = "amazon-awssdk" }
+androidx-lifecycle-runtimeCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-viewmodelCompose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-viewModelNav3 = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "androidx-lifecycle" }
+androidx-material3-adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive", version.ref = "androidx-adaptive" }
+androidx-material3-adaptive-nav3 = { module = "org.jetbrains.compose.material3.adaptive:adaptive-navigation3", version.ref = "androidx-adaptive" }
+androidx-navigation3-ui = { module = "org.jetbrains.androidx.navigation3:navigation3-ui", version.ref = "androidx-navigation3" }
 apache-calcite-avatica-core = { module = "org.apache.calcite.avatica:avatica-core", version.ref = "apache-calcite-avatica" }
 apache-calcite-core = { module = "org.apache.calcite:calcite-core", version.ref = "apache-calcite" }
 apache-calcite-linq4j = { module = "org.apache.calcite:calcite-linq4j", version.ref = "apache-calcite" }

solr/api/src/java/org/apache/solr/client/api/endpoint/SchemaDesignerApi.java

@@ -0,0 +1,200 @@
+/*
+ * 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 static org.apache.solr.client.api.util.Constants.GENERIC_ENTITY_PROPERTY;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.extensions.Extension;
+import io.swagger.v3.oas.annotations.extensions.ExtensionProperty;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import java.io.InputStream;
+import java.util.List;
+import org.apache.solr.client.api.model.FlexibleSolrJerseyResponse;
+import org.apache.solr.client.api.model.SchemaDesignerAddRequestBody;
+import org.apache.solr.client.api.model.SchemaDesignerCollectionsResponse;
+import org.apache.solr.client.api.model.SchemaDesignerConfigsResponse;
+import org.apache.solr.client.api.model.SchemaDesignerInfoResponse;
+import org.apache.solr.client.api.model.SchemaDesignerPublishResponse;
+import org.apache.solr.client.api.model.SchemaDesignerResponse;
+import org.apache.solr.client.api.model.SchemaDesignerSchemaDiffResponse;
+import org.apache.solr.client.api.model.SchemaDesignerUpdateRequestBody;
+import org.apache.solr.client.api.model.SolrJerseyResponse;
+
+/** V2 API definitions for the Solr Schema Designer. */
+@Path("/schema-designer")
+public interface SchemaDesignerApi {
+
+  @GET
+  @Path("/{configSet}/info")
+  @Operation(
+      summary = "Get info about a configSet being designed.",
+      tags = {"schema-designer"})
+  SchemaDesignerInfoResponse getInfo(@PathParam("configSet") String configSet) throws Exception;
+
+  @POST
+  @Path("/{configSet}/prep")
+  @Operation(
+      summary = "Prepare a mutable configSet copy for schema design.",
+      tags = {"schema-designer"})
+  SchemaDesignerResponse prepNewSchema(
+      @PathParam("configSet") String configSet, @QueryParam("copyFrom") String copyFrom)
+      throws Exception;
+
+  @DELETE
+  @Path("/{configSet}")
+  @Operation(
+      summary = "Clean up temporary resources for a schema being designed.",
+      tags = {"schema-designer"})
+  SolrJerseyResponse cleanupTempSchema(@PathParam("configSet") String configSet) throws Exception;
+
+  @PUT
+  @Path("/{configSet}/file")
+  @Operation(
+      summary = "Update the contents of a file in a configSet being designed.",
+      tags = {"schema-designer"})
+  SchemaDesignerResponse updateFileContents(
+      @PathParam("configSet") String configSet,
+      @QueryParam("file") String file,
+      @RequestBody(
+              required = true,
+              extensions = {
+                @Extension(
+                    properties = {
+                      @ExtensionProperty(name = GENERIC_ENTITY_PROPERTY, value = "true")
+                    })
+              })
+          InputStream fileContents)
+      throws Exception;
+
+  @GET
+  @Path("/{configSet}/sample")
+  @Operation(
+      summary = "Get a sample value and analysis for a field.",
+      tags = {"schema-designer"})
+  FlexibleSolrJerseyResponse getSampleValue(
+      @PathParam("configSet") String configSet,
+      @QueryParam("field") String fieldName,
+      @QueryParam("uniqueKeyField") String idField,
+      @QueryParam("docId") String docId)
+      throws Exception;
+
+  @GET
+  @Path("/{configSet}/collectionsForConfig")
+  @Operation(
+      summary = "List collections that use a given configSet.",
+      tags = {"schema-designer"})
+  SchemaDesignerCollectionsResponse listCollectionsForConfig(
+      @PathParam("configSet") String configSet) throws Exception;
+
+  @GET
+  @Path("/configs")
+  @Operation(
+      summary = "List all configSets available for schema design.",
+      tags = {"schema-designer"})
+  SchemaDesignerConfigsResponse listConfigs() throws Exception;
+
+  @POST
+  @Path("/{configSet}/add")
+  @Operation(
+      summary = "Add a new field, field type, or dynamic field to the schema being designed.",
+      tags = {"schema-designer"})
+  SchemaDesignerResponse addSchemaObject(
+      @PathParam("configSet") String configSet,
+      @QueryParam("schemaVersion") Integer schemaVersion,
+      SchemaDesignerAddRequestBody requestBody)
+      throws Exception;
+
+  @PUT
+  @Path("/{configSet}/update")
+  @Operation(
+      summary = "Update an existing field or field type in the schema being designed.",
+      tags = {"schema-designer"})
+  SchemaDesignerResponse updateSchemaObject(
+      @PathParam("configSet") String configSet,
+      @QueryParam("schemaVersion") Integer schemaVersion,
+      SchemaDesignerUpdateRequestBody requestBody)
+      throws Exception;
+
+  @PUT
+  @Path("/{configSet}/publish")
+  @Operation(
+      summary = "Publish the designed schema to a live configSet.",
+      tags = {"schema-designer"})
+  SchemaDesignerPublishResponse publish(
+      @PathParam("configSet") String configSet,
+      @QueryParam("schemaVersion") Integer schemaVersion,
+      @QueryParam("newCollection") String newCollection,
+      @QueryParam("reloadCollections") @DefaultValue("false") Boolean reloadCollections,
+      @QueryParam("numShards") @DefaultValue("1") Integer numShards,
+      @QueryParam("replicationFactor") @DefaultValue("1") Integer replicationFactor,
+      @QueryParam("indexToCollection") @DefaultValue("false") Boolean indexToCollection,
+      @QueryParam("cleanupTemp") @DefaultValue("true") Boolean cleanupTempParam,
+      @QueryParam("disableDesigner") @DefaultValue("false") Boolean disableDesigner)
+      throws Exception;
+
+  /**
+   * Analyzes sample documents to suggest a schema.
+   *
+   * <p>Sample documents are read from the HTTP request body (not declared as a parameter on this
+   * interface — see {@code SchemaDesigner#loadSampleDocuments}) and dispatched to a parser based on
+   * the {@code Content-Type} header.
+   */
+  @POST
+  @Path("/{configSet}/analyze")
+  @Operation(
+      summary = "Analyze sample documents and suggest a schema.",
+      description =
+          "Sample documents are supplied in the request body. The Content-Type header selects the"
+              + " parser: application/json, text/xml or application/xml, text/csv or"
+              + " application/csv, or text/plain or application/octet-stream (treated as JSON"
+              + " lines). Capped at 5MB and 1000 documents.",
+      tags = {"schema-designer"})
+  SchemaDesignerResponse analyze(
+      @PathParam("configSet") String configSet,
+      @QueryParam("schemaVersion") Integer schemaVersion,
+      @QueryParam("copyFrom") String copyFrom,
+      @QueryParam("uniqueKeyField") String uniqueKeyField,
+      @QueryParam("languages") List<String> languages,
+      @QueryParam("enableDynamicFields") Boolean enableDynamicFields,
+      @QueryParam("enableFieldGuessing") Boolean enableFieldGuessing,
+      @QueryParam("enableNestedDocs") Boolean enableNestedDocs)
+      throws Exception;
+
+  @GET
+  @Path("/{configSet}/query")
+  @Operation(
+      summary = "Query the temporary collection used during schema design.",
+      tags = {"schema-designer"})
+  FlexibleSolrJerseyResponse query(@PathParam("configSet") String configSet) throws Exception;
+
+  @GET
+  @Path("/{configSet}/diff")
+  @Operation(
+      summary = "Get the diff between the designed schema and the published schema.",
+      tags = {"schema-designer"})
+  SchemaDesignerSchemaDiffResponse getSchemaDiff(@PathParam("configSet") String configSet)
+      throws Exception;
+}

solr/api/src/java/org/apache/solr/client/api/model/SchemaDesignerAddRequestBody.java

@@ -0,0 +1,45 @@
+/*
+ * 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 io.swagger.v3.oas.annotations.media.Schema;
+import java.util.Map;
+
+/**
+ * Request body for the Schema Designer add endpoint. Exactly one of the four fields should be
+ * populated; the populated field's name is the action and its value carries the schema-object
+ * attributes (e.g. for {@code addField}: {@code name}, {@code type}, {@code stored}, etc.).
+ */
+public class SchemaDesignerAddRequestBody {
+
+  @Schema(name = "addField")
+  @JsonProperty("add-field")
+  public Map<String, Object> addField;
+
+  @Schema(name = "addDynamicField")
+  @JsonProperty("add-dynamic-field")
+  public Map<String, Object> addDynamicField;
+
+  @Schema(name = "addCopyField")
+  @JsonProperty("add-copy-field")
+  public Map<String, Object> addCopyField;
+
+  @Schema(name = "addFieldType")
+  @JsonProperty("add-field-type")
+  public Map<String, Object> addFieldType;
+}

solr/ui/src/commonMain/kotlin/org/apache/solr/ui/components/configsets/overview/integration/DefaultConfigsetsOverviewComponent.kt → solr/api/src/java/org/apache/solr/client/api/model/SchemaDesignerCollectionsResponse.java

@@ -14,16 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.solr.ui.components.configsets.overview.integration
+package org.apache.solr.client.api.model;
 
-import com.arkivanov.mvikotlin.core.store.StoreFactory
-import io.ktor.client.HttpClient
-import org.apache.solr.ui.components.configsets.overview.ConfigsetsOverviewComponent
-import org.apache.solr.ui.utils.AppComponentContext
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
 
-class DefaultConfigsetsOverviewComponent(
-    componentContext: AppComponentContext,
-    storeFactory: StoreFactory,
-    httpClient: HttpClient,
-) : ConfigsetsOverviewComponent,
-    AppComponentContext by componentContext
+/** Response body for the Schema Designer list-collections-for-config endpoint. */
+public class SchemaDesignerCollectionsResponse extends SolrJerseyResponse {
+
+  @JsonProperty("collections")
+  public List<String> collections;
+}

solr/api/src/java/org/apache/solr/client/api/model/SchemaDesignerConfigsResponse.java

@@ -0,0 +1,31 @@
+/*
+ * 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.Map;
+
+/** Response body for the Schema Designer list-configs endpoint. */
+public class SchemaDesignerConfigsResponse extends SolrJerseyResponse {
+
+  /**
+   * Map of configSet name to status: 0 = in-progress (temp only), 1 = disabled, 2 = enabled and
+   * published.
+   */
+  @JsonProperty("configSets")
+  public Map<String, Integer> configSets;
+}