Changeset 4850 for vlo/branches/vlo-3.0/vlo-web-app/src

Timestamp:

03/31/14 09:27:00 (11 years ago)

Author:

Twan Goosen

Message:

autocomplete service returns an iterator. Simplified and cleaned up implementation

Location:

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

Files:

• service/solr/AutoCompleteService.java (modified) (2 diffs)
• service/solr/impl/AutoCompleteServiceImpl.java (modified) (3 diffs)
• wicket/components/SearchForm.java (modified) (1 diff)

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

@@ -18 +18 @@
 package eu.clarin.cmdi.vlo.service.solr;
 
-import java.util.List;
+import java.util.Iterator;
 
 /**
@@ -31 +31 @@
      *
      * @param input user input
-     * @return list of suggestions
+     * @return iterator over suggestions
      */
-    List<String> getChoices(String input);
+    Iterator<String> getChoices(String input);
     
 }

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

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.service.solr.impl;
 
+import com.google.common.collect.Iterators;
 import eu.clarin.cmdi.vlo.service.solr.AutoCompleteService;
 import eu.clarin.cmdi.vlo.config.VloConfig;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -16 +16 @@
  *
  * @author Thomas Eckart
+ * @author Twan Goosen
  *
  */
@@ -29 +30 @@
      *
      * @param input user input
-     * @return list of suggestions
+     * @return iterator over suggestions
      */
     @Override
-    public List<String> getChoices(String input) {
-        List<String> choices = new ArrayList<String>();
-
+    public Iterator<String> getChoices(String input) {
         if (input != null) {
-            SolrQuery query = new SolrQuery();
+            
+            final SolrQuery query = new SolrQuery();
             query.setQuery(input.toLowerCase());
-            query.setQueryType("/suggest");
-            QueryResponse response = fireQuery(sanitise(query));
+            query.setRequestHandler("/suggest");
+            
+            final QueryResponse response = fireQuery(sanitise(query));
+            
             if (response.getSpellCheckResponse() != null) {
-                List<Suggestion> suggestions = response.getSpellCheckResponse().getSuggestions();
+                final List<Suggestion> suggestions = response.getSpellCheckResponse().getSuggestions();
                 if (suggestions.size() > 0) {
-                    Iterator<String> iter = suggestions.get(0).getAlternatives().iterator();
-                    while (iter.hasNext()) {
-                        choices.add(iter.next());
-                    }
+                    return suggestions.get(0).getAlternatives().iterator();
                 }
             }
         }
 
-        return choices;
+        return Iterators.emptyIterator();
     }
 }

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

@@ -46 +46 @@
             @Override
             protected Iterator<String> getChoices(String input) {
-                return autoCompleteDao.getChoices(input).iterator();
+                return autoCompleteDao.getChoices(input);
             }
         });