svn commit: r1696109 - in /manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch: MCFAuthorizerRestSearchAction.java MCFConfigurationParameters.java

[kwright]

Author: kwright
Date: Sun Aug 16 00:56:51 2015
New Revision: 1696109

URL: http://svn.apache.org/r1696109
Log:
Update default parameters to work correctly

Modified:
    
manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java
    
manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFConfigurationParameters.java

Modified: 
manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java?rev=1696109&r1=1696108&r2=1696109&view=diff
==============================================================================
--- 
manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java
 (original)
+++ 
manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFAuthorizerRestSearchAction.java
 Sun Aug 16 00:56:51 2015
@@ -30,15 +30,11 @@ import com.fasterxml.jackson.databind.Js
 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.
 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 {
 

Modified: 
manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFConfigurationParameters.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFConfigurationParameters.java?rev=1696109&r1=1696108&r2=1696109&view=diff
==============================================================================
--- 
manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFConfigurationParameters.java
 (original)
+++ 
manifoldcf/integration/elasticsearch-1.5/trunk/src/main/java/org/apache/manifoldcf/elasticsearch/MCFConfigurationParameters.java
 Sun Aug 16 00:56:51 2015
@@ -44,11 +44,10 @@ public class MCFConfigurationParameters
       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;