svn commit: r1801910 - in /manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch: ElasticSearchAction.java ElasticSearchConnector.java

[kw...@apache.org]

Author: kwright
Date: Fri Jul 14 07:52:55 2017
New Revision: 1801910

URL: http://svn.apache.org/viewvc?rev=1801910&view=rev
Log:
More work for CONNECTORS-1431: use POST instead of GET for new forcemerge operation

Modified:
    manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java
    manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java

Modified: manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java?rev=1801910&r1=1801909&r2=1801910&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java (original)
+++ manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchAction.java Fri Jul 14 07:52:55 2017
@@ -20,6 +20,7 @@
 package org.apache.manifoldcf.agents.output.elasticsearch;
 
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.HttpClient;
 
 import java.io.IOException;
@@ -44,7 +45,7 @@ public class ElasticSearchAction extends
     super(config, client);
   }
   
-  public void execute(CommandEnum cmd, boolean checkConnection)
+  public void executeGET(CommandEnum cmd, boolean checkConnection)
       throws ManifoldCFException, ServiceInterruption
   {
     StringBuffer url = getApiUrl(cmd.toString(), checkConnection);
@@ -52,6 +53,19 @@ public class ElasticSearchAction extends
     call(method);
     String error = checkJson(jsonException);
     if (getResult() == Result.OK && error == null)
+      return;
+    setResult("JSONERROR",Result.ERROR, error);
+    Logging.connectors.warn("ES: Commit failed: "+getResponse());
+  }
+
+  public void executePOST(CommandEnum cmd, boolean checkConnection)
+      throws ManifoldCFException, ServiceInterruption
+  {
+    StringBuffer url = getApiUrl(cmd.toString(), checkConnection);
+    HttpPost method = new HttpPost(url.toString());
+    call(method);
+    String error = checkJson(jsonException);
+    if (getResult() == Result.OK && error == null)
       return;
     setResult("JSONERROR",Result.ERROR, error);
     Logging.connectors.warn("ES: Commit failed: "+getResponse());

Modified: manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java?rev=1801910&r1=1801909&r2=1801910&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java (original)
+++ manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java Fri Jul 14 07:52:55 2017
@@ -411,7 +411,7 @@ public class ElasticSearchConnector exte
     ElasticSearchAction oss = new ElasticSearchAction(client, getConfigParameters(null));
     try
     {
-      oss.execute(CommandEnum._stats, true);
+      oss.executeGET(CommandEnum._stats, true);
       String resultName = oss.getResult().name();
       if (resultName.equals("OK"))
         return super.check();
@@ -433,7 +433,11 @@ public class ElasticSearchConnector exte
     ElasticSearchAction oo = new ElasticSearchAction(client, config);
     try
     {
-      oo.execute(config.isServerAfter5()?CommandEnum._forcemerge:CommandEnum._optimize, false);
+      if (config.isServerAfter5()) {
+        oo.executePOST(CommandEnum._forcemerge, false);
+      } else {
+        oo.executeGET(CommandEnum._optimize, false);
+      }
     }
     finally
     {