honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16110 from talevy/fix-split-append 

[Ingest] split string into ArrayList so it can be appended to
This commit is contained in:
Tal Levy 2016-01-21 09:04:19 -08:00
parent c55f9bbd9b 2c4e13bf7c
commit 6ee5ea398e
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/org/elasticsearch/ingest/processor/SplitProcessor.java
View File

@ -24,7 +24,10 @@ import org.elasticsearch.ingest.core.AbstractProcessorFactory;
import org.elasticsearch.ingest.core.IngestDocument; import org.elasticsearch.ingest.core.IngestDocument;
import org.elasticsearch.ingest.core.ConfigurationUtils; import org.elasticsearch.ingest.core.ConfigurationUtils;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -59,7 +62,9 @@ public class SplitProcessor extends AbstractProcessor {
if (oldVal == null) { if (oldVal == null) {
throw new IllegalArgumentException("field [" + field + "] is null, cannot split."); throw new IllegalArgumentException("field [" + field + "] is null, cannot split.");
} }
document.setFieldValue(field, Arrays.asList(oldVal.split(separator))); List<String> splitList = new ArrayList<>();
Collections.addAll(splitList, oldVal.split(separator));
document.setFieldValue(field, splitList);
} }
@Override @Override

6
core/src/test/java/org/elasticsearch/ingest/core/CompoundProcessorTests.java
View File

@ -20,11 +20,17 @@
package org.elasticsearch.ingest.core; package org.elasticsearch.ingest.core;
import org.elasticsearch.ingest.TestProcessor; import org.elasticsearch.ingest.TestProcessor;
import org.elasticsearch.ingest.TestTemplateService;
import org.elasticsearch.ingest.processor.AppendProcessor;
import org.elasticsearch.ingest.processor.SetProcessor;
import org.elasticsearch.ingest.processor.SplitProcessor;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.junit.Before; import org.junit.Before;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalTo;

24
core/src/test/java/org/elasticsearch/ingest/processor/SplitProcessorTests.java
View File

@ -19,15 +19,20 @@
package org.elasticsearch.ingest.processor; package org.elasticsearch.ingest.processor;
import org.elasticsearch.ingest.TestTemplateService;
import org.elasticsearch.ingest.core.CompoundProcessor;
import org.elasticsearch.ingest.core.IngestDocument; import org.elasticsearch.ingest.core.IngestDocument;
import org.elasticsearch.ingest.RandomDocumentPicks; import org.elasticsearch.ingest.RandomDocumentPicks;
import org.elasticsearch.ingest.core.Processor; import org.elasticsearch.ingest.core.Processor;
import org.elasticsearch.ingest.core.TemplateService;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.hamcrest.CoreMatchers;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
@ -77,4 +82,23 @@ public class SplitProcessorTests extends ESTestCase {
assertThat(e.getMessage(), equalTo("field [" + fieldName + "] of type [java.lang.Integer] cannot be cast to [java.lang.String]")); assertThat(e.getMessage(), equalTo("field [" + fieldName + "] of type [java.lang.Integer] cannot be cast to [java.lang.String]"));
} }
} }
public void testSplitAppendable() throws Exception {
TemplateService templateService = TestTemplateService.instance();
Map splitConfig = new HashMap<>();
splitConfig.put("field", "flags");
splitConfig.put("separator", "\\|");
Processor splitProcessor = (new SplitProcessor.Factory()).create(splitConfig);
Map appendConfig = new HashMap<>();
appendConfig.put("field", "flags");
appendConfig.put("value", Collections.singletonList("additional_flag"));
Processor appendProcessor = (new AppendProcessor.Factory(templateService)).create(appendConfig);
CompoundProcessor compoundProcessor = new CompoundProcessor(splitProcessor, appendProcessor);
Map<String, Object> source = new HashMap<>();
source.put("flags", "new|hot|super|fun|interesting");
IngestDocument ingestDocument = new IngestDocument(source, new HashMap<>());
compoundProcessor.execute(ingestDocument);
List<String> expectedFlags = Arrays.asList("new", "hot", "super", "fun", "interesting", "additional_flag");
assertThat(ingestDocument.getFieldValue("flags", List.class), CoreMatchers.equalTo(expectedFlags));
}
} }