Changeset 4626

Timestamp:

03/06/14 10:06:18 (11 years ago)

Author:

Twan Goosen

Message:

• Created loadable/detachable model for a SolrDocument?. Document service now registered on VloWicketApplication? so that model can use it without needing injection or a reference.
• Added method to document service interface to get a document by id, to be implemented

Location:

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

Files:

• VloWicketApplication.java (modified) (4 diffs)
• service/SolrDocumentService.java (modified) (1 diff)
• service/impl/SolrDocumentServiceImpl.java (modified) (1 diff)
• wicket/components/SearchResultsPanel.java (modified) (2 diffs)
• wicket/model/SolrDocumentModel.java (added)
• wicket/provider/SolrDocumentProvider.java (modified) (6 diffs)

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

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo;
 
+import eu.clarin.cmdi.vlo.service.SolrDocumentService;
 import eu.clarin.cmdi.vlo.wicket.pages.FacetedSearchPage;
+import org.apache.wicket.Application;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -17 +20 @@
 public class VloWicketApplication extends WebApplication implements ApplicationContextAware {
 
+    @Autowired
+    private SolrDocumentService documentService;
+    
+    
     private ApplicationContext applicationContext;
 
@@ -37 +44 @@
         getComponentInstantiationListeners().add(new SpringComponentInjector(this, applicationContext));
     }
+    
+    /**
+     * 
+     * @return the active VLO wicket application
+     */
+    public static VloWicketApplication get() {
+        return (VloWicketApplication) Application.get();
+    }
 
     /**
@@ -49 +64 @@
         this.applicationContext = applicationContext;
     }
+
+    public SolrDocumentService getDocumentService() {
+        return documentService;
+    }
+    
+    
 }

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

@@ -26 +26 @@
  */
 public interface SolrDocumentService {
+    
+    SolrDocument getDocument(String docId);
 
     List<SolrDocument> getDocuments(QueryFacetsSelection selection, int first, int count);

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

@@ -40 +40 @@
 
     @Override
+    public SolrDocument getDocument(String docId) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
     public List<SolrDocument> getDocuments(QueryFacetsSelection selection, int first, int count) {
         SolrQuery query = queryFatory.createDocumentQuery(selection,first, count);

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SearchResultsPanel.java

@@ -48 +48 @@
     public static final List<Long> ITEMS_PER_PAGE_OPTIONS = Arrays.asList(5L, 10L, 25L, 50L, 100L);
 
-    @SpringBean
-    private SolrDocumentService documentService;
     private final IDataProvider<SolrDocument> solrDocumentProvider;
     private final DataView<SolrDocument> resultsView;
@@ -55 +53 @@
     public SearchResultsPanel(String id, final IModel<QueryFacetsSelection> selectionModel) {
         super(id, selectionModel);
-        solrDocumentProvider = new SolrDocumentProvider(documentService, selectionModel);
+        solrDocumentProvider = new SolrDocumentProvider(selectionModel);
 
         // data view for search results

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/SolrDocumentProvider.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.provider;
 
+import eu.clarin.cmdi.vlo.VloWicketApplication;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.SolrDocumentService;
+import eu.clarin.cmdi.vlo.wicket.model.SolrDocumentModel;
 import java.math.BigDecimal;
 import java.util.Iterator;
@@ -25 +27 @@
 import org.apache.wicket.markup.repeater.data.IDataProvider;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
 
 /**
@@ -33 +34 @@
 public class SolrDocumentProvider implements IDataProvider<SolrDocument> {
 
-    private final SolrDocumentService documentService;
     private final IModel<QueryFacetsSelection> selectionModel;
 
-    public SolrDocumentProvider(SolrDocumentService documentService, IModel<QueryFacetsSelection> selection) {
-        this.documentService = documentService;
+    public SolrDocumentProvider(IModel<QueryFacetsSelection> selection) {
         this.selectionModel = selection;
     }
@@ -43 +42 @@
     @Override
     public Iterator<? extends SolrDocument> iterator(long first, long count) {
-        final List<SolrDocument> documents = documentService.getDocuments(selectionModel.getObject(),
+        final List<SolrDocument> documents = getDocumentService().getDocuments(selectionModel.getObject(),
                 BigDecimal.valueOf(first).intValueExact(), // safe long->int conversion
                 BigDecimal.valueOf(count).intValueExact()); // safe long->int conversion
@@ -51 +50 @@
     @Override
     public long size() {
-        return documentService.getDocumentCount(selectionModel.getObject());
+        return getDocumentService().getDocumentCount(selectionModel.getObject());
     }
 
     @Override
     public IModel<SolrDocument> model(SolrDocument object) {
-        return new Model(object);
+        return new SolrDocumentModel(object);
     }
 
@@ -64 +63 @@
     }
 
+    private SolrDocumentService getDocumentService() {
+        return VloWicketApplication.get().getDocumentService();
+    }
 }