Apache Solr open-source search software
SOLR-16395: Avoid Jersey resource inheritance
Jason Gerlowski175fb87d94c4
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/GetSchemaFieldAPI.java b/solr/core/src/java/org/apache/solr/handler/admin/api/GetSchemaFieldAPI.javaindex b5c3fbbb2a7..2ad7db4d863 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/api/GetSchemaFieldAPI.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/GetSchemaFieldAPI.java@@ -28,6 +28,7 @@ import javax.ws.rs.Path;import javax.ws.rs.PathParam;import javax.ws.rs.Produces;import javax.ws.rs.core.MediaType;+import org.apache.solr.api.JerseyResource;import org.apache.solr.common.MapWriter;import org.apache.solr.common.SolrException;import org.apache.solr.common.cloud.SolrClassLoader;@@ -54,15 +55,17 @@ import org.apache.solr.security.PermissionNameProvider;* <li>/fieldtypes/{fieldTypeName}* </ul>*/-public class GetSchemaFieldAPI extends GetSchemaAPI {+@Path("/{a:cores|collections}/{collectionName}/schema")+public class GetSchemaFieldAPI /*extends GetSchemaAPI*/ extends JerseyResource {+ private final IndexSchema indexSchema;private final SolrParams params;// TODO Stop using SolrParams here and instead give API methods parameters representing only those// query-params that they support@Injectpublic GetSchemaFieldAPI(IndexSchema indexSchema, SolrParams params) {- super(indexSchema);+ this.indexSchema = indexSchema;this.params = params;}