From ab49b048c8277037c4f462f7a6aad361042c552e Mon Sep 17 00:00:00 2001 From: Colvin Cowie Date: Fri, 10 Jan 2025 17:10:24 +0000 Subject: [PATCH] SOLR-17617: Add missing Inject to CollectionProperty and InstallCoreData --- solr/CHANGES.txt | 2 ++ .../org/apache/solr/handler/admin/api/CollectionProperty.java | 3 +++ .../org/apache/solr/handler/admin/api/InstallCoreData.java | 3 +++ 3 files changed, 8 insertions(+) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 6e36e4ca99c..7f95131c96b 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -169,6 +169,8 @@ Bug Fixes * SOLR-17587: Metrics: wt=prometheus fix for non-compliant exposition format containing duplicate TYPE lines. (Matthew Biscocho via David Smiley) +* SOLR-17617: Fix v2 CollectionPropertyApi and InstallCoreDataApi. (Colvin Cowie) + Dependency Upgrades --------------------- * SOLR-17471: Upgrade Lucene to 9.12.1. (Pierre Salagnac, Christine Poerschke) diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/CollectionProperty.java b/solr/core/src/java/org/apache/solr/handler/admin/api/CollectionProperty.java index 55da1ea0d53..efc41cd370c 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/CollectionProperty.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/CollectionProperty.java @@ -20,6 +20,8 @@ import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERM; import java.io.IOException; + +import jakarta.inject.Inject; import org.apache.solr.client.api.endpoint.CollectionPropertyApi; import org.apache.solr.client.api.model.SolrJerseyResponse; import org.apache.solr.client.api.model.UpdateCollectionPropertyRequestBody; @@ -38,6 +40,7 @@ */ public class CollectionProperty extends AdminAPIBase implements CollectionPropertyApi { + @Inject public CollectionProperty( CoreContainer coreContainer, SolrQueryRequest solrQueryRequest, diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/InstallCoreData.java b/solr/core/src/java/org/apache/solr/handler/admin/api/InstallCoreData.java index a91a0688e0a..4261b408f25 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/api/InstallCoreData.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/api/InstallCoreData.java @@ -20,6 +20,8 @@ import static org.apache.solr.security.PermissionNameProvider.Name.CORE_EDIT_PERM; import java.net.URI; + +import jakarta.inject.Inject; import org.apache.solr.client.api.endpoint.InstallCoreDataApi; import org.apache.solr.client.api.model.InstallCoreDataRequestBody; import org.apache.solr.client.api.model.SolrJerseyResponse; @@ -43,6 +45,7 @@ */ public class InstallCoreData extends CoreAdminAPIBase implements InstallCoreDataApi { + @Inject public InstallCoreData( CoreContainer coreContainer, CoreAdminHandler.CoreAdminAsyncTracker coreAdminAsyncTracker,