Changeset 4852

Timestamp:

03/31/14 09:59:29 (11 years ago)

Author:

Twan Goosen

Message:

document query factory gets fields through constructor
created tests for this class

Location:

vlo/branches/vlo-3.0/vlo-web-app/src

Files:

• main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java (modified) (4 diffs)
• main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImpl.java (modified) (3 diffs)
• test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImplTest.java (added)

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.config;
 
+import com.google.common.collect.ImmutableList;
 import eu.clarin.cmdi.vlo.service.impl.ExclusiveFieldFilter;
 import eu.clarin.cmdi.vlo.service.impl.InclusiveFieldFilter;
 import com.google.common.collect.Sets;
+import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.VloWicketApplication;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
@@ -43 +45 @@
 import eu.clarin.cmdi.vlo.service.solr.impl.SolrFacetQueryFactoryImpl;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Properties;
 import javax.xml.transform.OutputKeys;
@@ -111 +115 @@
     @Bean
     public SolrDocumentQueryFactoryImpl documentQueryFactory() {
-        return new SolrDocumentQueryFactoryImpl();
+        return new SolrDocumentQueryFactoryImpl(DOCUMENT_FIELDS);
     }
 
@@ -162 +166 @@
                 vloConfig().getTechnicalFields());
     }
+
+    /**
+     * Fields to request for documents. TODO: Make configurable?
+     */
+    public static final Collection<String> DOCUMENT_FIELDS = ImmutableList.of(
+            FacetConstants.FIELD_NAME,
+            FacetConstants.FIELD_DESCRIPTION,
+            FacetConstants.FIELD_COLLECTION,
+            FacetConstants.FIELD_LANGUAGE,
+            FacetConstants.FIELD_MODALITY,
+            FacetConstants.FIELD_CONTINENT,
+            FacetConstants.FIELD_COUNTRY,
+            FacetConstants.FIELD_GENRE,
+            FacetConstants.FIELD_SUBJECT,
+            FacetConstants.FIELD_ORGANISATION,
+            FacetConstants.FIELD_KEYWORDS,
+            FacetConstants.FIELD_NATIONAL_PROJECT,
+            FacetConstants.FIELD_RESOURCE_CLASS,
+            FacetConstants.FIELD_RESOURCE,
+            FacetConstants.FIELD_ID,
+            FacetConstants.FIELD_DATA_PROVIDER,
+            FacetConstants.FIELD_FILENAME,
+            FacetConstants.FIELD_FORMAT,
+            FacetConstants.FIELD_LANDINGPAGE,
+            FacetConstants.FIELD_SEARCHPAGE,
+            FacetConstants.FIELD_SEARCH_SERVICE,
+            FacetConstants.FIELD_LAST_SEEN,
+            FacetConstants.FIELD_CLARIN_PROFILE
+    );
 }

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

@@ -20 +20 @@
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.solr.SolrDocumentQueryFactory;
+import java.util.Collection;
 import org.apache.solr.client.solrj.SolrQuery;
 
@@ -28 +29 @@
 public class SolrDocumentQueryFactoryImpl extends AbstractSolrQueryFactory implements SolrDocumentQueryFactory {
 
-    public static final String[] DOCUMENT_FIELDS = {
-        FacetConstants.FIELD_NAME,
-        FacetConstants.FIELD_DESCRIPTION,
-        FacetConstants.FIELD_COLLECTION,
-        FacetConstants.FIELD_LANGUAGE,
-        FacetConstants.FIELD_MODALITY,
-        FacetConstants.FIELD_CONTINENT,
-        FacetConstants.FIELD_COUNTRY,
-        FacetConstants.FIELD_GENRE,
-        FacetConstants.FIELD_SUBJECT,
-        FacetConstants.FIELD_ORGANISATION,
-        FacetConstants.FIELD_KEYWORDS,
-        FacetConstants.FIELD_NATIONAL_PROJECT,
-        FacetConstants.FIELD_RESOURCE_CLASS,
-        FacetConstants.FIELD_RESOURCE,
-        FacetConstants.FIELD_ID,
-        FacetConstants.FIELD_DATA_PROVIDER,
-        FacetConstants.FIELD_FILENAME,
-        FacetConstants.FIELD_FORMAT,
-        FacetConstants.FIELD_LANDINGPAGE,
-        FacetConstants.FIELD_SEARCHPAGE,
-        FacetConstants.FIELD_SEARCH_SERVICE,
-        FacetConstants.FIELD_LAST_SEEN,
-        FacetConstants.FIELD_CLARIN_PROFILE
-    };
+    /**
+     * Template query for new document queries
+     */
+    private final SolrQuery defaultQueryTemplate;
+
+    /**
+     * 
+     * @param documentFields fields that should be included in document queries
+     */
+    public SolrDocumentQueryFactoryImpl(Collection<String> documentFields) {
+        defaultQueryTemplate = new SolrQuery();
+        defaultQueryTemplate.setFields(documentFields.toArray(new String[]{}));
+        defaultQueryTemplate.setSort(SolrQuery.SortClause.asc(FacetConstants.FIELD_NAME));
+    }
 
     @Override
@@ -81 +71 @@
 
     private SolrQuery getDefaultDocumentQuery() {
-        SolrQuery query = new SolrQuery();
-        query.setFields(DOCUMENT_FIELDS);
-        query.setSort(SolrQuery.SortClause.asc(FacetConstants.FIELD_NAME));
-        return query;
+        return defaultQueryTemplate.getCopy();
     }
 }