More fixes to get it to build.
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/elasticsearch-2.0/trunk@1758553 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java b/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java
index 8ba7c88..60c38e2 100644
--- a/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java
+++ b/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java
@@ -58,7 +58,7 @@
@Override
public void handleRequest(RestRequest request, RestChannel channel, Client client) {
SearchRequest searchRequest = parseSearchRequestMCF(request);
- searchRequest.listenerThreaded(false);
+ //TODO: see if this is still needed??? searchRequest.listenerThreaded(false);
client.search(searchRequest, new RestStatusToXContentListener(channel));
}
@@ -100,10 +100,10 @@
searchRequest.extraSource(parseSearchSourceMCF(request));
searchRequest.searchType(request.param("search_type"));
- searchRequest.queryCache(request.paramAsBoolean("query_cache", (Boolean)null));
+ //TODO: figure out if we still need this??? searchRequest.queryCache(request.paramAsBoolean("query_cache", (Boolean)null));
String scroll = request.param("scroll");
if(scroll != null) {
- searchRequest.scroll(new Scroll(TimeValue.parseTimeValue(scroll, (TimeValue)null)));
+ //TODO: figure out if we still need this??? searchRequest.scroll(new Scroll(TimeValue.parseTimeValue(scroll, (TimeValue)null)));
}
searchRequest.types(Strings.splitStringByCommaToArray(request.param("type")));
@@ -112,6 +112,8 @@
searchRequest.indicesOptions(IndicesOptions.fromRequest(request, searchRequest.indicesOptions()));
}
else {
+ //TODO: we definitely still need this, but its form has dramatically changed, and it now parses into the current body and returns
+ // void. Gotta look at how to rethink plugin architecture given that ???
searchRequest = RestSearchAction.parseSearchRequest(request);
}
return searchRequest;
@@ -135,7 +137,7 @@
from.defaultOperator(QueryStringQueryBuilder.Operator.OR);
} else {
if(!"AND".equals(size)) {
- throw new ElasticsearchIllegalArgumentException("Unsupported defaultOperator [" + size + "], can either be [OR] or [AND]");
+ throw new IllegalArgumentException("Unsupported defaultOperator [" + size + "], can either be [OR] or [AND]");
}
from.defaultOperator(QueryStringQueryBuilder.Operator.AND);
@@ -207,7 +209,7 @@
int sField = request.paramAsInt("terminate_after", 0);
if(sField < 0) {
- throw new ElasticsearchIllegalArgumentException("terminateAfter must be > 0");
+ throw new IllegalArgumentException("terminateAfter must be > 0");
}
if(sField > 0) {
@@ -301,7 +303,7 @@
var32 = var29[var31];
int var33 = var32.indexOf(44);
if(var33 == -1) {
- throw new ElasticsearchIllegalArgumentException("Illegal index boost [" + var32 + "], no \',\'");
+ throw new IllegalArgumentException("Illegal index boost [" + var32 + "], no \',\'");
}
indexName = var32.substring(0, var33);
@@ -310,7 +312,7 @@
try {
searchSourceBuilder.indexBoost(indexName, Float.parseFloat(sBoost));
} catch (NumberFormatException var18) {
- throw new ElasticsearchIllegalArgumentException("Illegal index boost [" + var32 + "], boost not a float number");
+ throw new IllegalArgumentException("Illegal index boost [" + var32 + "], boost not a float number");
}
}
}
