Newer solr seems to need the collection as part of the url #4158

I am unsure if this is actually the correct approach but am committing it as this story is getting backlogged.
IQSS · Oct 25, 2017 · 8fef67b · 8fef67b
1 parent 79043f7
commit 8fef67b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/AutoCompleteBean.java b/src/main/java/edu/harvard/iq/dataverse/AutoCompleteBean.java
@@ -32,7 +32,7 @@ public class AutoCompleteBean implements java.io.Serializable {
 
     public SolrClient getSolrServer(){
         if(solrServer == null){
-            String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr";
+            String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr/collection1";
             solrServer = new HttpSolrClient.Builder(urlString).build();
         }
         return solrServer;

diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAISetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAISetServiceBean.java
@@ -123,7 +123,7 @@ public OAISet findById(Long id) {
     private SolrClient getSolrServer () {
         if (solrServer == null) {
         }
-        String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr";
+        String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr/collection1";
         solrServer = new HttpSolrClient.Builder(urlString).build();
 
         return solrServer;

diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
@@ -114,7 +114,7 @@ public class IndexServiceBean {
 
     @PostConstruct
     public void init(){
-        String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr";
+        String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr/collection1";
         solrServer = new HttpSolrClient.Builder(urlString).build();
 
         rootDataverseName = findRootDataverseCached().getName();

diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
@@ -88,7 +88,7 @@ public class SearchServiceBean {
 
     @PostConstruct
     public void init(){
-        String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr";
+        String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr/collection1";
         solrServer = new HttpSolrClient.Builder(urlString).build();
     }
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SolrIndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SolrIndexServiceBean.java
@@ -63,7 +63,7 @@ public class SolrIndexServiceBean {
 
     @PostConstruct
     public void init(){
-        String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr";
+        String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr/collection1";
         solrServer = new HttpSolrClient.Builder(urlString).build();
 
     }