Changeset 4502

Timestamp:

02/12/14 13:49:39 (10 years ago)

Author:

twagoo

Message:

Solr server is now injected into SOLR DAO's instead of URL, allowing for embedded (or mocked?) servers for testing etc

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo

Files:

• config/VloSpringConfig.java (modified) (2 diffs)
• service/impl/AutoCompleteDao.java (modified) (2 diffs)
• service/impl/SearchResultsDaoImpl.java (modified) (2 diffs)
• service/impl/SolrDaoImpl.java (modified) (2 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java

@@ -24 +24 @@
 import eu.clarin.cmdi.vlo.service.impl.SolrFacetFieldsService;
 import eu.clarin.cmdi.vlo.service.impl.SolrQueryFactoryImpl;
-import org.springframework.beans.factory.annotation.Value;
+import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrServer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -63 +64 @@
     @Bean
     public SearchResultsDao searchResultsDao() {
-        return new SearchResultsDaoImpl(vloConfig().getSolrUrl());
+        return new SearchResultsDaoImpl(solrServer());
     }
 
+    @Bean
     public SolrQueryFactory queryFactory() {
         return new SolrQueryFactoryImpl();
     }
+    
+    @Bean
+    public SolrServer solrServer() {
+        return new HttpSolrServer(vloConfig().getSolrUrl());
+    }
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/AutoCompleteDao.java

@@ -6 +6 @@
 
 import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.response.SpellCheckResponse.Suggestion;
@@ -17 +18 @@
 public class AutoCompleteDao extends SolrDaoImpl {
 
-    public AutoCompleteDao(String solrUrl) {
-        super(solrUrl);
+    public AutoCompleteDao(SolrServer solrServer) {
+        super(solrServer);
     }
     

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SearchResultsDaoImpl.java

@@ -5 +5 @@
 import java.util.List;
 import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.solr.client.solrj.response.QueryResponse;
@@ -11 +12 @@
 public class SearchResultsDaoImpl extends SolrDaoImpl implements SearchResultsDao {
 
-    public SearchResultsDaoImpl(String solrUrl) {
-        super(solrUrl);
+    public SearchResultsDaoImpl(SolrServer solrServer) {
+        super(solrServer);
     }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/SolrDaoImpl.java

@@ -2 +2 @@
 
 import eu.clarin.cmdi.vlo.config.VloConfig;
-import java.net.MalformedURLException;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.HttpSolrServer;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.util.ClientUtils;
@@ -17 +16 @@
 
 public class SolrDaoImpl {
+    
+    private final static Logger LOG = LoggerFactory.getLogger(SolrDaoImpl.class);
+    private final SolrServer solrServer;
 
-    private final static Logger LOG = LoggerFactory.getLogger(SolrDaoImpl.class);
-    private final HttpSolrServer solrServer;
-
-    public SolrDaoImpl(String solrUrl) {
-        solrServer = new HttpSolrServer(solrUrl);
+    public SolrDaoImpl(SolrServer solrServer) {
+        this.solrServer = solrServer;
     }
 
-    protected HttpSolrServer getSolrserver() {
+    protected SolrServer getSolrserver() {
         return solrServer;
     }