Upgrade to Elasticsearch 6.5.0

Author: spinscale

README.md

@@ -6,6 +6,7 @@ Uses the [langdetect](https://github.com/YouCruit/language-detection/) plugin to
 
 | ES    | Command |
 | ----- | ------- |
+| 6.5.0 | `bin/elasticsearch-plugin install https://github.com/spinscale/elasticsearch-ingest-langdetect/releases/download/6.5.0.1/ingest-langdetect-6.5.0.1.zip` |
 | 6.4.3 | `bin/elasticsearch-plugin install https://github.com/spinscale/elasticsearch-ingest-langdetect/releases/download/6.4.3.1/ingest-langdetect-6.4.3.1.zip` |
 | 6.4.2 | `bin/elasticsearch-plugin install https://github.com/spinscale/elasticsearch-ingest-langdetect/releases/download/6.4.2.1/ingest-langdetect-6.4.2.1.zip` |
 | 6.4.1 | `bin/elasticsearch-plugin install https://github.com/spinscale/elasticsearch-ingest-langdetect/releases/download/6.4.1.1/ingest-langdetect-6.4.1.1.zip` |

build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "org.elasticsearch.gradle:build-tools:6.4.3"
+    classpath "org.elasticsearch.gradle:build-tools:6.5.0"
   }
 }
 
@@ -18,7 +18,7 @@ plugins {
 }
 
 group = 'de.spinscale.elasticsearch.plugin'
-version = '6.4.3.1-SNAPSHOT'
+version = '6.5.0.1-SNAPSHOT'
 
 apply plugin: 'java'
 apply plugin: 'idea'

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -28,9 +28,9 @@
 import java.io.IOException;
 import java.util.Map;
 
+import static org.elasticsearch.ingest.ConfigurationUtils.readBooleanProperty;
 import static org.elasticsearch.ingest.ConfigurationUtils.readOptionalStringProperty;
 import static org.elasticsearch.ingest.ConfigurationUtils.readStringProperty;
-import static org.elasticsearch.ingest.ConfigurationUtils.readBooleanProperty;
 
 public class LangDetectProcessor extends AbstractProcessor {
 
@@ -51,7 +51,7 @@ public LangDetectProcessor(String tag, String field, String targetField, ByteSiz
     }
 
     @Override
-    public void execute(IngestDocument ingestDocument) throws Exception {
+    public IngestDocument execute(IngestDocument ingestDocument) throws Exception {
         Detector detector = DetectorFactory.create();
         detector.setMaxTextLength(maxLength.bytesAsInt());
 
@@ -60,14 +60,16 @@ public void execute(IngestDocument ingestDocument) throws Exception {
             content = ingestDocument.getFieldValue(field, String.class);
         } catch (IllegalArgumentException e) {
             if (ignoreMissing) {
-                return;
+                return ingestDocument;
             }
             throw e;
         }
         detector.append(content);
         String language = detector.detect();
 
         ingestDocument.setFieldValue(targetField, language);
+
+        return ingestDocument;
     }
 
     @Override

src/main/java/org/elasticsearch/plugin/ingest/langdetect/LangDetectProcessor.java

@@ -20,8 +20,8 @@
 import com.cybozu.labs.langdetect.SecureDetectorFactory;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
-import org.elasticsearch.ingest.RandomDocumentPicks;
 import org.elasticsearch.ingest.IngestDocument;
+import org.elasticsearch.ingest.RandomDocumentPicks;
 import org.elasticsearch.test.ESTestCase;
 import org.junit.BeforeClass;
 
@@ -92,7 +92,6 @@ private Map<String, Object> ingestDocument(Map<String, Object> config, String fi
         IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random(), document);
 
         LangDetectProcessor processor = new LangDetectProcessor.Factory().create(Collections.emptyMap(), randomAlphaOfLength(10), config);
-        processor.execute(ingestDocument);
-        return ingestDocument.getSourceAndMetadata();
+        return processor.execute(ingestDocument).getSourceAndMetadata();
     }
 }