diff --git a/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/IngestPlugin.java b/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/IngestPlugin.java index e547af68bb2..514fb44d1da 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/IngestPlugin.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/IngestPlugin.java @@ -130,7 +130,7 @@ public class IngestPlugin extends Plugin { processorsModule.addProcessor(SplitProcessor.TYPE, (environment, templateService) -> new SplitProcessor.Factory()); processorsModule.addProcessor(JoinProcessor.TYPE, (environment, templateService) -> new JoinProcessor.Factory()); processorsModule.addProcessor(UppercaseProcessor.TYPE, (environment, templateService) -> new UppercaseProcessor.Factory()); - processorsModule.addProcessor(LowercaseProcessor.TYPE, (environment, mustacheFactory) -> new LowercaseProcessor.Factory()); + processorsModule.addProcessor(LowercaseProcessor.TYPE, (environment, templateService) -> new LowercaseProcessor.Factory()); processorsModule.addProcessor(TrimProcessor.TYPE, (environment, templateService) -> new TrimProcessor.Factory()); processorsModule.addProcessor(ConvertProcessor.TYPE, (environment, templateService) -> new ConvertProcessor.Factory()); processorsModule.addProcessor(GsubProcessor.TYPE, (environment, templateService) -> new GsubProcessor.Factory()); @@ -170,6 +170,6 @@ public class IngestPlugin extends Plugin { } public void onModule(ScriptModule module) { - module.registerScriptContext(MustacheTemplateService.INGEST_SCRIPT_CONTEXT); + module.registerScriptContext(InternalTemplateService.INGEST_SCRIPT_CONTEXT); } } diff --git a/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/MustacheTemplateService.java b/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/InternalTemplateService.java similarity index 96% rename from plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/MustacheTemplateService.java rename to plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/InternalTemplateService.java index a74b999bb32..58bcfc0a269 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/MustacheTemplateService.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/InternalTemplateService.java @@ -30,13 +30,13 @@ import org.elasticsearch.script.ScriptService; import java.util.Collections; import java.util.Map; -class MustacheTemplateService implements TemplateService { +class InternalTemplateService implements TemplateService { public static final ScriptContext.Plugin INGEST_SCRIPT_CONTEXT = new ScriptContext.Plugin("elasticsearch-ingest", "ingest"); private final ScriptService scriptService; - MustacheTemplateService(ScriptService scriptService) { + InternalTemplateService(ScriptService scriptService) { this.scriptService = scriptService; } diff --git a/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/PipelineStore.java b/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/PipelineStore.java index 32a1973c113..a0daf06deff 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/PipelineStore.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/PipelineStore.java @@ -87,7 +87,7 @@ public class PipelineStore extends AbstractComponent implements Closeable { public void buildProcessorFactoryRegistry(Map processorFactoryProviders, Environment environment, ScriptService scriptService) { Map processorFactories = new HashMap<>(); - TemplateService templateService = new MustacheTemplateService(scriptService); + TemplateService templateService = new InternalTemplateService(scriptService); for (Map.Entry entry : processorFactoryProviders.entrySet()) { Processor.Factory processorFactory = entry.getValue().apply(environment, templateService); processorFactories.put(entry.getKey(), processorFactory); diff --git a/qa/ingest-with-mustache/src/test/java/org/elasticsearch/plugin/ingest/AbstractMustacheTests.java b/qa/ingest-with-mustache/src/test/java/org/elasticsearch/plugin/ingest/AbstractMustacheTests.java index bec71f2ffce..bdd37c86d58 100644 --- a/qa/ingest-with-mustache/src/test/java/org/elasticsearch/plugin/ingest/AbstractMustacheTests.java +++ b/qa/ingest-with-mustache/src/test/java/org/elasticsearch/plugin/ingest/AbstractMustacheTests.java @@ -42,12 +42,12 @@ public abstract class AbstractMustacheTests extends ESTestCase { .build(); MustacheScriptEngineService mustache = new MustacheScriptEngineService(settings); ScriptContextRegistry registry = new ScriptContextRegistry( - Collections.singletonList(MustacheTemplateService.INGEST_SCRIPT_CONTEXT) + Collections.singletonList(InternalTemplateService.INGEST_SCRIPT_CONTEXT) ); ScriptService scriptService = new ScriptService( settings, new Environment(settings), Collections.singleton(mustache), null, registry ); - templateService = new MustacheTemplateService(scriptService); + templateService = new InternalTemplateService(scriptService); } }