Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-5378: Fix compile issues on Java6 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1544815 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2013-11-23 15:19:43 +00:00
parent 7763793c55
commit fd6268a9a8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java
View File

@ -222,7 +222,7 @@ public class SuggestComponent extends SearchComponent implements SolrCoreAware,
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 SearchComponent implements SolrCoreAware,
* */
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 SearchComponent implements SolrCoreAware,
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 SearchComponent implements SolrCoreAware,
// 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 SearchComponent implements SolrCoreAware,
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);

2
solr/core/src/java/org/apache/solr/spelling/suggest/DocumentExpressionDictionaryFactory.java
View File

@ -63,7 +63,7 @@ public class DocumentExpressionDictionaryFactory extends DictionaryFactory {
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");