Changeset 4646

Timestamp:

03/07/14 14:18:10 (10 years ago)

Author:

Twan Goosen

Message:

Created interface for service that convert to/from wicket page parameters. Implemented it for QueryFacetsSelection? based on logic that used to be in FacetedSearchPage?, and use that in the page instead

Location:

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

Files:

• main/java/eu/clarin/cmdi/vlo/config/VloSpringConfig.java (modified) (5 diffs)
• main/java/eu/clarin/cmdi/vlo/service/PageParametersConverter.java (added)
• main/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverter.java (added)
• main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java (modified) (5 diffs)
• test/java/eu/clarin/cmdi/vlo/service/impl/QueryFacetsSelectionParametersConverterTest.java (added)

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

@@ -22 +22 @@
 import eu.clarin.cmdi.vlo.FacetConstants;
 import eu.clarin.cmdi.vlo.VloWicketApplication;
+import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.FacetFieldsService;
 import eu.clarin.cmdi.vlo.service.FieldFilter;
+import eu.clarin.cmdi.vlo.service.PageParametersConverter;
 import eu.clarin.cmdi.vlo.service.ResourceStringConverter;
 import eu.clarin.cmdi.vlo.service.ResourceTypeCountingService;
@@ -29 +31 @@
 import eu.clarin.cmdi.vlo.service.SolrDocumentService;
 import eu.clarin.cmdi.vlo.service.SolrFacetQueryFactory;
+import eu.clarin.cmdi.vlo.service.impl.QueryFacetsSelectionParametersConverter;
 import eu.clarin.cmdi.vlo.service.impl.ResourceStringConverterImpl;
 import eu.clarin.cmdi.vlo.service.impl.ResourceTypeCountingServiceImpl;
@@ -40 +43 @@
 import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.impl.HttpSolrServer;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -116 +118 @@
 
     @Bean
+    public PageParametersConverter<QueryFacetsSelection> queryParametersConverter() {
+        return new QueryFacetsSelectionParametersConverter();
+    }
+
+    @Bean
     public SolrServer solrServer() {
         return new HttpSolrServer(vloConfig().getSolrUrl());
@@ -125 +132 @@
     }
 
-    @Bean(name="technicalPropertiesFilter")
+    @Bean(name = "technicalPropertiesFilter")
     public FieldFilter technicalPropertiesFieldFilter() {
         return new InclusiveFieldFilter(TECHNICAL_FIELDS);

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java

@@ -6 +6 @@
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.FacetFieldsService;
+import eu.clarin.cmdi.vlo.service.PageParametersConverter;
 import eu.clarin.cmdi.vlo.wicket.components.FacetPanel;
 import eu.clarin.cmdi.vlo.wicket.components.SearchForm;
@@ -12 +13 @@
 import eu.clarin.cmdi.vlo.wicket.model.FacetFieldsModel;
 import eu.clarin.cmdi.vlo.wicket.model.FacetSelectionModel;
-import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -37 +36 @@
     @SpringBean
     private VloConfig vloConfig;
+    @SpringBean
+    private PageParametersConverter<QueryFacetsSelection> paramsConverter;
 
     private final Panel searchResultsPanel;
@@ -45 +46 @@
         super(parameters);
 
-        final QueryFacetsSelection selection = paramsToQueryFacetSelection(parameters);
+        final QueryFacetsSelection selection = paramsConverter.fromParameters(parameters);
         final Model<QueryFacetsSelection> queryModel = new Model<QueryFacetsSelection>(selection);
 
@@ -94 +95 @@
         target.add(collectionsPanel);
     }
-
-    private static QueryFacetsSelection paramsToQueryFacetSelection(final PageParameters parameters) {
-        final String query = parameters.get("q").toOptionalString();
-
-        //TODO: Map parameters to facet selection
-        final Map<String, Collection<String>> selection = null;
-
-        return new QueryFacetsSelection(query, selection);
-    }
 }