svn commit: r1544815 - in /lucene/dev/trunk/solr/core/src/java/org/apache/solr: handler/component/SuggestComponent.java spelling/suggest/DocumentExpressionDictionaryFactory.java

[sh...@apache.org]

Author: shalin
Date: Sat Nov 23 15:19:43 2013
New Revision: 1544815

URL: http://svn.apache.org/r1544815
Log:
SOLR-5378: Fix compile issues on Java6

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/suggest/DocumentExpressionDictionaryFactory.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java?rev=1544815&r1=1544814&r2=1544815&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java Sat Nov 23 15:19:43 2013
@@ -222,7 +222,7 @@ public class SuggestComponent extends Se
       return;
     int count = params.getInt(SUGGEST_COUNT, 1);
     
-    List<SuggesterResult> suggesterResults = new ArrayList<>();
+    List<SuggesterResult> suggesterResults = new ArrayList<SuggesterResult>();
     NamedList response = new SimpleOrderedMap();
     NamedList<NamedList> namedListResult = null;
     
@@ -252,7 +252,7 @@ public class SuggestComponent extends Se
    * */
   private static SuggesterResult merge(List<SuggesterResult> suggesterResults, int count) {
     SuggesterResult result = new SuggesterResult();
-    Set<String> allTokens = new HashSet<>();
+    Set<String> allTokens = new HashSet<String>();
     
     // collect all tokens
     for (SuggesterResult shardResult : suggesterResults) {
@@ -272,7 +272,7 @@ public class SuggestComponent extends Se
           resultQueue.insertWithOverflow(res);
         }
       }
-      List<LookupResult> sortedSuggests = new LinkedList<>();
+      List<LookupResult> sortedSuggests = new LinkedList<LookupResult>();
       Collections.addAll(sortedSuggests, resultQueue.getResults());
       result.add(token, sortedSuggests);
     }
@@ -358,7 +358,7 @@ public class SuggestComponent extends Se
       // for each token
       for(int i = 0; i < suggestions.size() ; i++) {
         String tokenString = suggestions.getName(i);
-        List<LookupResult> lookupResults = new ArrayList<>();
+        List<LookupResult> lookupResults = new ArrayList<LookupResult>();
         NamedList suggestion = (NamedList) suggestions.getVal(i);
         // for each suggestion
         for (int j = 0; j < suggestion.size(); j++) {
@@ -366,7 +366,7 @@ public class SuggestComponent extends Se
           if (property.equals(SuggesterResultLabels.SUGGESTION)) {
             NamedList suggestionEntry = (NamedList) suggestion.getVal(j);
             String term = (String) suggestionEntry.get(SuggesterResultLabels.SUGGESTION_TERM);
-            long weight = (long) suggestionEntry.get(SuggesterResultLabels.SUGGESTION_WEIGHT);
+            Long weight = (Long) suggestionEntry.get(SuggesterResultLabels.SUGGESTION_WEIGHT);
             String payload = (String) suggestionEntry.get(SuggesterResultLabels.SUGGESTION_PAYLOAD);
             LookupResult res = new LookupResult(new CharsRef(term), weight, new BytesRef(payload));
             lookupResults.add(res);

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/suggest/DocumentExpressionDictionaryFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/suggest/DocumentExpressionDictionaryFactory.java?rev=1544815&r1=1544814&r2=1544815&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/suggest/DocumentExpressionDictionaryFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/spelling/suggest/DocumentExpressionDictionaryFactory.java Sat Nov 23 15:19:43 2013
@@ -63,7 +63,7 @@ public class DocumentExpressionDictionar
     String field = (String) params.get(FIELD);
     String payloadField = (String) params.get(PAYLOAD_FIELD);
     String weightExpression = (String) params.get(WEIGHT_EXPRESSION);
-    Set<SortField> sortFields = new HashSet<>();
+    Set<SortField> sortFields = new HashSet<SortField>();
     
     if (field == null) {
       throw new IllegalArgumentException(FIELD + " is a mandatory parameter");