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

SOLR-12947: Misc JsonQueryRequest code cleanup

This commit is contained in:
Jason Gerlowski 2018-11-09 13:15:08 -05:00
parent 77a4bfaa90
commit 4410ef941a
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
solr/solrj/src/java/org/apache/solr/client/solrj/request/json/JsonQueryRequest.java
View File

@ -191,9 +191,7 @@ public class JsonQueryRequest extends QueryRequest {
if (filterQuery == null) {
throw new IllegalArgumentException("'filterQuery' must be non-null");
}
jsonRequestMap.putIfAbsent("filter", new ArrayList<Object>());
final List<Object> filters = (List<Object>) jsonRequestMap.get("filter");
filters.add(filterQuery);
((List)jsonRequestMap.computeIfAbsent("filter", s -> new ArrayList<>())).add(filterQuery) ;
return this;
}
@ -220,9 +218,7 @@ public class JsonQueryRequest extends QueryRequest {
if (filterQuery == null) {
throw new IllegalArgumentException("'filterQuery' parameter must be non-null");
}
jsonRequestMap.putIfAbsent("filter", new ArrayList<Object>());
final List<Object> filters = (List<Object>) jsonRequestMap.get("filter");
filters.add(filterQuery);
((List)jsonRequestMap.computeIfAbsent("filter", s -> new ArrayList<>())).add(filterQuery) ;
return this;
}
@ -254,6 +250,7 @@ public class JsonQueryRequest extends QueryRequest {
if (fieldNames == null) {
throw new IllegalArgumentException("'fieldNames' parameter must be non-null");
}
jsonRequestMap.putIfAbsent("fields", new ArrayList<String>());
final List<String> fields = (List<String>) jsonRequestMap.get("fields");
for (String fieldName : fieldNames) {
@ -286,9 +283,7 @@ public class JsonQueryRequest extends QueryRequest {
throw new IllegalArgumentException("'value' parameter must be non-null");
}
jsonRequestMap.putIfAbsent("params", new HashMap<String, Object>());
final Map<String, Object> miscParamsMap = (Map<String, Object>) jsonRequestMap.get("params");
miscParamsMap.put(name, value);
((Map<String, Object>)jsonRequestMap.computeIfAbsent("params", s -> new HashMap<String, Object>())).put(name, value);
return this;
}