Changeset 4316

Timestamp:

01/21/14 13:36:47 (10 years ago)

Author:

twagoo

Message:

Merged NPE fixes from trunk to 2.18

Location:

vlo/branches/vlo-2.18

Files:

• . (modified) (1 prop)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/dao/SolrDao.java (modified) (3 diffs)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java (modified) (2 diffs)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/SolrFacetFieldDataProvider.java (modified) (3 diffs)

vlo/branches/vlo-2.18/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/dao/SolrDao.java

@@ -34 +34 @@
         return solrServer;
     }
-    
+
     /**
-     * Basic sanitising of Solr queries. 
-     * 
-     * Query is based on the URL to the VLO web application. Also, explain
-     * about the URL and ?fq=language:dutch
-     * Assume filters have the form a:b 
-     * like for example language:dutch
-     * 
+     * Basic sanitising of Solr queries.
+     *
+     * Query is based on the URL to the VLO web application. Also, explain about
+     * the URL and ?fq=language:dutch Assume filters have the form a:b like for
+     * example language:dutch
+     *
      * @param query
-     * @return 
+     * @return
      */
-    private SolrQuery sanitise (SolrQuery query){
-        
+    private SolrQuery sanitise(SolrQuery query) {
+
         // String [] facetsFromConfig; 
-        
         // try and get the filters facets from the query
-        String [] filtersInQuery;
+        String[] filtersInQuery;
         filtersInQuery = query.getFilterQueries();
- 
+
         if (filtersInQuery == null) {
             // the query does not contain filters
@@ -67 +65 @@
             for (String filter : filtersInQuery) {
                 // split up a filter, look at the string preceeding the semicolon 
-                String facetInFilter = filter.split(":") [0];
-                
+                String facetInFilter = filter.split(":")[0];
+
                 if (facetsDefined.contains(facetInFilter)) {
                     // facet in the filter is in the set that is defined by the config file
@@ -98 +96 @@
 
     public SolrDocument getSolrDocument(String docId) {
+        if (docId == null) {
+            throw new NullPointerException("Cannot get SOLR document for null docId");
+        }
         SolrDocument result = null;
         SolrQuery query = new SolrQuery();

vlo/branches/vlo-2.18/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java

@@ -21 +21 @@
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -74 +75 @@
 
         final StringValue docIdParam = getPageParameters().get(PARAM_DOC_ID);
-        if (docIdParam == null) {
-            throw new RuntimeException("No document id was specified. Cannot construct result page.");
-        }
-        //Document ID is assumed to have been encoded (typcially in DocumentLinkPanel) decode here
-        final String docId = UrlDecoder.QUERY_INSTANCE.decode(
-                docIdParam.toString(),
-                Application.get().getRequestCycleSettings().getResponseRequestEncoding()); // get current character set from request cycle
-        SolrDocument solrDocument = DaoLocator.getSearchResultsDao().getSolrDocument(docId);
-
-        if (solrDocument != null) {
-            final SearchPageQuery query = new SearchPageQuery(currentParam);
-
-            // create parameters from the query, and add them with session related parameters
-            PageParameters newParam = new PageParameters(query.getPageParameters());
-            // add the session persistent parameters
-            newParam.mergeWith(VloSession.get().getVloSessionPageParameters());
-
-            BookmarkablePageLink<String> backLink = new BookmarkablePageLink<String>("backLink", FacetedSearchPage.class, newParam);
-            add(backLink);
-            String href = getHref(docId);
-            if (href != null) {
-                add(new ExternalLink("openBrowserLink", href, new ResourceModel(Resources.OPEN_IN_ORIGINAL_CONTEXT).getObject()));
+        if (docIdParam == null || docIdParam.isNull()) {
+            LOG.warn("No document id was specified. Cannot construct result page.");
+            throw new RestartResponseException(new ResultNotFoundPage(currentParam));
+        } else {
+            //Document ID is assumed to have been encoded (typcially in DocumentLinkPanel) decode here
+            final String docId = UrlDecoder.QUERY_INSTANCE.decode(
+                    docIdParam.toString(),
+                    Application.get().getRequestCycleSettings().getResponseRequestEncoding()); // get current character set from request cycle
+
+            final SolrDocument solrDocument = DaoLocator.getSearchResultsDao().getSolrDocument(docId);
+            if (solrDocument != null) {
+                final SearchPageQuery query = new SearchPageQuery(currentParam);
+
+                // create parameters from the query, and add them with session related parameters
+                PageParameters newParam = new PageParameters(query.getPageParameters());
+                // add the session persistent parameters
+                newParam.mergeWith(VloSession.get().getVloSessionPageParameters());
+
+                BookmarkablePageLink<String> backLink = new BookmarkablePageLink<String>("backLink", FacetedSearchPage.class, newParam);
+                add(backLink);
+                String href = getHref(docId);
+                if (href != null) {
+                    add(new ExternalLink("openBrowserLink", href, new ResourceModel(Resources.OPEN_IN_ORIGINAL_CONTEXT).getObject()));
+                } else {
+                    add(new Label("openBrowserLink", new ResourceModel(Resources.ORIGINAL_CONTEXT_NOT_AVAILABLE).getObject()));
+                }
+                addAttributesTable(solrDocument);
+
+                /* If there are any, add the link or links to landing pages 
+                 * contained in the solr document.
+                 */
+                addLandingPageLinks(solrDocument);
+
+                // also, if there are any, add the link or links to search pages 
+                addSearchPageLinks(solrDocument);
+
+                // add the rest of the resource links to the result page
+                addResourceLinks(solrDocument);
+
+                addSearchServiceForm(solrDocument);
+
+                addCompleteCmdiView(solrDocument);
+
+                add(new AjaxLazyLoadPanel("prevNextHeader") {
+
+                    @Override
+                    public Component getLazyLoadComponent(String markupId) {
+                        return new PrevNextHeaderPanel(markupId, docId, query);
+                    }
+
+                    @Override
+                    public Component getLoadingComponent(String markupId) {
+                        return new PrevNextHeaderPanel(markupId);
+                    }
+                });
             } else {
-                add(new Label("openBrowserLink", new ResourceModel(Resources.ORIGINAL_CONTEXT_NOT_AVAILABLE).getObject()));
-            }
-            addAttributesTable(solrDocument);
-
-            /* If there are any, add the link or links to landing pages 
-             * contained in the solr document.
-             */
-            addLandingPageLinks(solrDocument);
-
-            // also, if there are any, add the link or links to search pages 
-            addSearchPageLinks(solrDocument);
-
-            // add the rest of the resource links to the result page
-            addResourceLinks(solrDocument);
-
-            addSearchServiceForm(solrDocument);
-
-            addCompleteCmdiView(solrDocument);
-
-            add(new AjaxLazyLoadPanel("prevNextHeader") {
-
-                @Override
-                public Component getLazyLoadComponent(String markupId) {
-                    return new PrevNextHeaderPanel(markupId, docId, query);
-                }
-
-                @Override
-                public Component getLoadingComponent(String markupId) {
-                    return new PrevNextHeaderPanel(markupId);
-                }
-            });
-        } else {
-            setResponsePage(new ResultNotFoundPage(currentParam));
+                setResponsePage(new ResultNotFoundPage(currentParam));
+            }
         }
 

vlo/branches/vlo-2.18/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/SolrFacetFieldDataProvider.java

@@ -17 +17 @@
 import eu.clarin.cmdi.vlo.dao.DaoLocator;
 import eu.clarin.cmdi.vlo.dao.SearchResultsDao;
+import java.io.Serializable;
 
 public class SolrFacetFieldDataProvider implements IDataProvider<Count> {
+
     private final static Logger LOG = LoggerFactory.getLogger(SolrFacetFieldDataProvider.class);
 
     private static final long serialVersionUID = 1L;
+    private final SolrQuery query;
     private FacetField facet;
-    private SolrQuery query;
 
     private final String selectedFacet;
@@ -58 +60 @@
     @Override
     public Iterator<? extends Count> iterator(long first, long count) {
-        return getFacet().getValues().subList((int)first, (int)first + (int)count).iterator();
+        return getFacet().getValues().subList((int) first, (int) first + (int) count).iterator();
     }
 
@@ -75 +77 @@
     }
 
-    @SuppressWarnings("serial")
-    private static class EmptyFacetField extends FacetField {
+    private static class EmptyFacetField extends FacetField implements Serializable {
+
         public EmptyFacetField(String name) {
             super(name);
         }
 
+        @Override
         public List<Count> getValues() {
-            return (List<Count>) Collections.EMPTY_LIST.iterator();
+            return Collections.emptyList();
         }
 
+        @Override
         public int getValueCount() {
             return 0;
         }
-
     }
 }