From 08ef8fa39a7e7ebe39f283d6f5ba1ec48626b796 Mon Sep 17 00:00:00 2001 From: lbownik Date: Mon, 1 Jun 2026 12:24:10 +0200 Subject: [PATCH] Closes #3306 Make solr collection names configurable in fairchive --- .../edu/harvard/iq/dataverse/search/SolrClientFactory.java | 4 +++- .../harvard/iq/dataverse/settings/SettingsServiceBean.java | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/search/SolrClientFactory.java b/fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/search/SolrClientFactory.java index 75252dc1a8..d3bf7f75eb 100644 --- a/fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/search/SolrClientFactory.java +++ b/fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/search/SolrClientFactory.java @@ -1,6 +1,7 @@ package edu.harvard.iq.dataverse.search; import static edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key.SolrHostColonPort; +import static edu.harvard.iq.dataverse.settings.SettingsServiceBean.Key.SolrMainIndexCollectionName; import java.io.IOException; @@ -25,7 +26,8 @@ public class SolrClientFactory { @Produces public SolrClient produceSolrClient() throws IOException { - return createClient("collection1"); + return createClient(this.settings.getValueForKey(SolrMainIndexCollectionName, + "collection1")); } @Produces diff --git a/fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java b/fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java index 072ee2ffd2..a12e9405ff 100644 --- a/fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java +++ b/fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/settings/SettingsServiceBean.java @@ -148,6 +148,9 @@ public enum Key { * Solr hostname and port, such as "localhost:8983". */ SolrHostColonPort, + + SolrMainIndexCollectionName, + /** * Enable full-text indexing in solr * Defaults to false