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

Merge pull request #14201 from talevy/ingest/smallrestruct 

restructure processors / addField for Data
This commit is contained in:
Tal Levy 2015-10-20 12:04:57 +03:00
parent 5a3c75ebac 17cf06ccc2
commit 6e428af458
10 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/ingest/src/main/java/org/elasticsearch/ingest/Data.java
View File

@ -47,7 +47,7 @@ public final class Data {
return (T) XContentMapValues.extractValue(path, document);
}
public void addField(String field, String value) {
public void addField(String field, Object value) {
modified = true;
document.put(field, value);
}

2
plugins/ingest/src/main/java/org/elasticsearch/ingest/Pipeline.java
View File

@ -20,6 +20,8 @@
package org.elasticsearch.ingest;
import org.elasticsearch.ingest.processor.Processor;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

4
plugins/ingest/src/main/java/org/elasticsearch/ingest/Processor.java → plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/Processor.java
View File

@ -18,7 +18,9 @@
*/
package org.elasticsearch.ingest;
package org.elasticsearch.ingest.processor;
import org.elasticsearch.ingest.Data;
import java.util.Map;

5
plugins/ingest/src/main/java/org/elasticsearch/ingest/SimpleProcessor.java → plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/simple/SimpleProcessor.java
View File

@ -17,7 +17,10 @@
* under the License.
*/
package org.elasticsearch.ingest;
package org.elasticsearch.ingest.processor.simple;
import org.elasticsearch.ingest.Data;
import org.elasticsearch.ingest.processor.Processor;
import java.util.Map;

4
plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/IngestModule.java
View File

@ -21,8 +21,8 @@ package org.elasticsearch.plugin.ingest;
import org.elasticsearch.common.inject.AbstractModule;
import org.elasticsearch.common.inject.multibindings.MapBinder;
import org.elasticsearch.ingest.Processor;
import org.elasticsearch.ingest.SimpleProcessor;
import org.elasticsearch.ingest.processor.Processor;
import org.elasticsearch.ingest.processor.simple.SimpleProcessor;
import org.elasticsearch.plugin.ingest.rest.IngestRestFilter;
import java.util.HashMap;

2
plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/PipelineStore.java
View File

@ -31,7 +31,7 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.gateway.GatewayService;
import org.elasticsearch.ingest.Pipeline;
import org.elasticsearch.ingest.Processor;
import org.elasticsearch.ingest.processor.Processor;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.threadpool.ThreadPool;

3
plugins/ingest/src/test/java/org/elasticsearch/ingest/IngestClientIT.java
View File

@ -20,7 +20,6 @@
package org.elasticsearch.ingest;
import org.elasticsearch.plugin.ingest.IngestPlugin;
import org.elasticsearch.plugin.ingest.PipelineStore;
import org.elasticsearch.plugin.ingest.transport.delete.DeletePipelineAction;
import org.elasticsearch.plugin.ingest.transport.delete.DeletePipelineRequestBuilder;
import org.elasticsearch.plugin.ingest.transport.delete.DeletePipelineResponse;
@ -33,11 +32,9 @@ import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.test.ESIntegTestCase;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE;
import static org.hamcrest.Matchers.*;
public class IngestClientIT extends ESIntegTestCase {

2
plugins/ingest/src/test/java/org/elasticsearch/plugin/ingest/PipelineExecutionServiceTests.java
View File

@ -22,7 +22,7 @@ package org.elasticsearch.plugin.ingest;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.ingest.Data;
import org.elasticsearch.ingest.Pipeline;
import org.elasticsearch.ingest.Processor;
import org.elasticsearch.ingest.processor.Processor;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.threadpool.ThreadPool;
import org.junit.After;

2
plugins/ingest/src/test/java/org/elasticsearch/plugin/ingest/PipelineStoreTests.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.cluster.ClusterService;
import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.text.StringText;
import org.elasticsearch.ingest.SimpleProcessor;
import org.elasticsearch.ingest.processor.simple.SimpleProcessor;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.internal.InternalSearchHit;
import org.elasticsearch.test.ESTestCase;

2
plugins/ingest/src/test/java/org/elasticsearch/plugin/ingest/transport/IngestActionFilterTests.java
View File

@ -29,7 +29,7 @@ import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.ingest.Data;
import org.elasticsearch.ingest.Pipeline;
import org.elasticsearch.ingest.SimpleProcessor;
import org.elasticsearch.ingest.processor.simple.SimpleProcessor;
import org.elasticsearch.plugin.ingest.IngestPlugin;
import org.elasticsearch.plugin.ingest.PipelineExecutionService;
import org.elasticsearch.plugin.ingest.PipelineStore;