Update default parameters to work correctly
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/elasticsearch-1.5/trunk@1696109 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 583f95a..6138708 100644
--- a/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java
+++ b/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java
@@ -30,15 +30,11 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.elasticsearch.ElasticsearchIllegalArgumentException;
-import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.logging.ESLogger;
-import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.query.*;
import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.rest.action.search.RestSearchAction;
import org.elasticsearch.rest.action.support.RestActions;
import org.elasticsearch.search.Scroll;
import org.elasticsearch.search.builder.SearchSourceBuilder;
@@ -48,11 +44,6 @@
import org.elasticsearch.search.suggest.term.TermSuggestionBuilder;
import java.io.*;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
public class MCFAuthorizerRestSearchAction extends RestSearchAction {
diff --git a/src/main/java/org/apache/manifoldcf/elasticsearch/MCFConfigurationParameters.java b/src/main/java/org/apache/manifoldcf/elasticsearch/MCFConfigurationParameters.java
index ca2263c..bd60c1a 100644
--- a/src/main/java/org/apache/manifoldcf/elasticsearch/MCFConfigurationParameters.java
+++ b/src/main/java/org/apache/manifoldcf/elasticsearch/MCFConfigurationParameters.java
@@ -44,11 +44,10 @@
setBaseURL(settings.get("mcf.authority_service_base_url", authorityServiceBaseURL));
setConnectionTimeout(settings.getAsInt("mcf.http.connection_timeout", connectionTimeout));
setSocketTimeout(settings.getAsInt("mcf.http.socket_timeout",socketTimeout));
- setAllowFieldPrefix(settings.get("mcf.allow_field_prefix"));
- setDenyFieldPrefix(settings.get("mcf.deny_field_prefix"));
+ setAllowFieldPrefix(settings.get("mcf.allow_field_prefix",allowFieldPrefix));
+ setDenyFieldPrefix(settings.get("mcf.deny_field_prefix",denyFieldPrefix));
setConnectionPoolSize(settings.getAsInt("mcf.http.connection_pool_size",connectionPoolSize));
}
-
public MCFConfigurationParameters setBaseURL(String baseURL)
{
this.authorityServiceBaseURL = baseURL; return this;
