Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SOLR-17617: Add missing Inject to CollectionProperty and InstallCoreData #3023

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

SOLR-17617: Add missing Inject to CollectionProperty and InstallCoreData #3023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ab49b04
SOLR-17617: Add missing Inject to CollectionProperty and InstallCoreData
colvinco Jan 10, 2025
394c7b9
Merge remote-tracking branch 'apache/main' into SOLR-17617
colvinco Jan 18, 2025
238dd55
First pass at a smoke test
colvinco Jan 18, 2025
55e9405
First pass at a smoke test
colvinco Jan 18, 2025
cec6024
Merge remote-tracking branch 'colvinco/SOLR-17617' into SOLR-17617
colvinco Feb 9, 2025
6b4f193
First pass at a smoke test
colvinco Feb 9, 2025
1e3f4af
Add some more tests
colvinco Feb 14, 2025
e8c0710
Add some more tests
colvinco Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions solr/CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ Bug Fixes
doing distributed search (sharded collections). This could likely occur for fielded parameters such as
f.CASE_SENSITIVE_FIELD.facet.limit=50. (Yue Yu, 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)
Expand Down
3 changes: 3 additions & 0 deletions solr/core/src/java/org/apache/solr/handler/admin/api/CollectionProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -38,6 +40,7 @@
*/
public class CollectionProperty extends AdminAPIBase implements CollectionPropertyApi {

@Inject
public CollectionProperty(
CoreContainer coreContainer,
SolrQueryRequest solrQueryRequest,
Expand Down
3 changes: 3 additions & 0 deletions solr/core/src/java/org/apache/solr/handler/admin/api/InstallCoreData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -43,6 +45,7 @@
*/
public class InstallCoreData extends CoreAdminAPIBase implements InstallCoreDataApi {

@Inject
public InstallCoreData(
CoreContainer coreContainer,
CoreAdminHandler.CoreAdminAsyncTracker coreAdminAsyncTracker,
Expand Down
Loading