Changeset 6347

Timestamp:

07/06/15 07:03:24 (9 years ago)

Author:

Twan Goosen

Message:

DataView? (with provider) instead of ListView? for parents in hierarchy to prevent loading everything

File:

• vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/HierarchyPanel.java (modified) (13 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/HierarchyPanel.java

@@ -18 +18 @@
 
 import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
 import eu.clarin.cmdi.vlo.FacetConstants;
@@ -27 +26 @@
 import java.util.Collections;
 import java.util.Iterator;
-import java.util.List;
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.Component;
@@ -39 +37 @@
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.PageableListView;
 import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.DataView;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
@@ -58 +56 @@
      */
     public static final int INITIAL_PARENTS_SHOWN = 5;
-    
+
     @SpringBean
     private SolrDocumentService documentService;
 
-    private final IModel<List<SolrDocument>> parentsModel;
+//    private final IModel<List<SolrDocument>> parentsModel;
+    private final IDataProvider<SolrDocument> parentsProvider;
 
     public HierarchyPanel(String id, IModel<SolrDocument> documentModel) {
@@ -68 +67 @@
 
         // create a list model for the parents
-        parentsModel = createParentsModel();
+//        parentsModel = createParentsModel();
+        parentsProvider = createParentsProvider();
 
         add(createParentLinks("parents"));
@@ -76 +76 @@
     /**
      *
-     * @return a model that provides a list of the parent documents, model
-     * object never null but can be empty
+     * @return a provider for the parent documents
      */
-    private IModel<List<SolrDocument>> createParentsModel() {
-        // model that 'loads' (i.e. extracts ids and retrieves the matching
-        // Solr documents) the parents only once
-        return new LoadableDetachableModel<List<SolrDocument>>() {
-
-            @Override
-            protected List<SolrDocument> load() {
-                // get parent IDs
-                final Collection<Object> parentIds = getModel().getObject().getFieldValues(FacetConstants.FIELD_IS_PART_OF);
+    private IDataProvider<SolrDocument> createParentsProvider() {
+        return new IDataProvider<SolrDocument>() {
+
+            private Long size = null;
+
+            @Override
+            public Iterator<? extends SolrDocument> iterator(long first, long count) {
+                final Collection<Object> parentIds = HierarchyPanel.this.getModelObject().getFieldValues(FacetConstants.FIELD_IS_PART_OF);
                 if (parentIds == null) {
                     // no parents, so provide empty list of documents
-                    return Collections.emptyList();
+                    return Collections.emptyIterator();
                 } else {
                     // parents found, convert ID collection into documents list
-                    final Iterator<SolrDocument> documentsIterator = Iterators.transform(parentIds.iterator(), new Function<Object, SolrDocument>() {
+                    return Iterators.transform(parentIds.iterator(), new Function<Object, SolrDocument>() {
 
                         @Override
@@ -100 +98 @@
                         }
                     });
-                    // creation of list will trigger conversion on the fly
-                    return ImmutableList.copyOf(documentsIterator);
-                }
-            }
+                }
+            }
+
+            @Override
+            public long size() {
+                if (size == null) {
+                    final Collection<Object> fieldValues = HierarchyPanel.this.getModelObject().getFieldValues(FacetConstants.FIELD_IS_PART_OF);
+                    if (fieldValues == null) {
+                        size = 0L;
+                    } else {
+                        size = Long.valueOf(fieldValues.size());
+                    }
+                }
+                return size;
+            }
+
+            @Override
+            public IModel<SolrDocument> model(SolrDocument object) {
+                return new SolrDocumentModel(object);
+            }
+
+            @Override
+            public void detach() {
+                size = null;
+            }
+
         };
     }
@@ -112 +132 @@
         final WebMarkupContainer container = new WebMarkupContainer(id);
 
-        // actual list of parents (paged)
-        final PageableListView<SolrDocument> parentsView = new PageableListView<SolrDocument>("parentsList", parentsModel, INITIAL_PARENTS_SHOWN) {
-
-            @Override
-            protected void populateItem(ListItem<SolrDocument> item) {
+        final DataView<SolrDocument> parentsView = new DataView<SolrDocument>("parentsList", parentsProvider, INITIAL_PARENTS_SHOWN) {
+
+            @Override
+            protected void populateItem(Item<SolrDocument> item) {
                 item.add(new NamedRecordPageLink("link", item.getModel()));
             }
@@ -122 +141 @@
             @Override
             protected void onConfigure() {
-                setVisible(!parentsModel.getObject().isEmpty());
+                setVisible(parentsProvider.size() > 0);
             }
         };
@@ -131 +150 @@
             @Override
             public void onClick(AjaxRequestTarget target) {
-                parentsView.setItemsPerPage(parentsModel.getObject().size());
+                parentsView.setItemsPerPage(parentsProvider.size());
                 if (target != null) {
                     target.add(container);
@@ -142 +161 @@
             }
         };
-        showAllLink.add(new Label("itemCount", new PropertyModel<Integer>(parentsModel, "size")));
+        showAllLink.add(new Label("itemCount", new PropertyModel<Integer>(parentsProvider, "size")));
 
         return container
@@ -169 +188 @@
             @Override
             public String getObject() {
-                if (!parentsModel.getObject().isEmpty()) {
+                if (parentsProvider.size() > 0) {
                     return "has-parent";
                 } else {
@@ -216 +235 @@
     public void detachModels() {
         super.detachModels();
-        parentsModel.detach();
     }