Merge pull request #6004 from IQSS/4.15.1-patch-for-SolrServer

4.15.1 Patch - get solr server from search service bean
IQSS · Jul 10, 2019 · 2d18d18 · 2d18d18
2 parents 1b073e3 + b67eb84
commit 2d18d18
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -122,6 +122,7 @@
 import edu.harvard.iq.dataverse.search.FacetLabel;
 import edu.harvard.iq.dataverse.search.SearchConstants;
 import edu.harvard.iq.dataverse.search.SearchFields;
+import edu.harvard.iq.dataverse.search.SearchServiceBean;
 import edu.harvard.iq.dataverse.search.SearchUtil;
 import java.util.Comparator;
 import java.util.TimeZone;
@@ -190,6 +191,8 @@ public enum DisplayMode {
     @EJB
     SettingsServiceBean settingsService;
     @EJB
+    SearchServiceBean searchService;
+    @EJB
     AuthenticationServiceBean authService;
     @EJB
     SystemConfig systemConfig;
@@ -5132,13 +5135,7 @@ public void archiveVersion(Long id) {
     private SolrClient solrServer = null;
 
     private SolrClient getSolrServer () {
-        if (solrServer == null) {
-        }
-        String urlString = "http://" + systemConfig.getSolrHostColonPort() + "/solr/collection1";
-        solrServer = new HttpSolrClient.Builder(urlString).build();
-
-        return solrServer;
-
+        return searchService.getSolrServer();       
     }
 
     private static Date getFileDateToCompare(FileMetadata fileMetadata) {

diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
@@ -97,6 +97,14 @@ public void close() {
         }
     }
 
+     public SolrClient getSolrServer() {
+        return solrServer;
+    }
+
+    public void setSolrServer(SolrClient solrServer) {
+        this.solrServer = solrServer;
+    }
+
     /**
      * Import note: "onlyDatatRelatedToMe" relies on filterQueries for providing
      * access to Private Data for the correct user