/*
 * Licensed to Elasticsearch under one or more contributor
 * license agreements. See the NOTICE file distributed with
 * this work for additional information regarding copyright
 * ownership. Elasticsearch licenses this file to you under
 * the Apache License, Version 2.0 (the "License"); you may
 * not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *    http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied.  See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

package org.elasticsearch.index.mapper.xcontent;

import org.elasticsearch.common.inject.Injector;
import org.elasticsearch.common.inject.ModulesBuilder;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.SettingsModule;
import org.elasticsearch.env.Environment;
import org.elasticsearch.env.EnvironmentModule;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.IndexNameModule;
import org.elasticsearch.index.analysis.AnalysisModule;
import org.elasticsearch.index.analysis.AnalysisService;
import org.elasticsearch.index.codec.docvaluesformat.DocValuesFormatService;
import org.elasticsearch.index.codec.postingsformat.PostingsFormatService;
import org.elasticsearch.index.fielddata.IndexFieldDataService;
import org.elasticsearch.index.mapper.DocumentMapperParser;
import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.settings.IndexSettingsModule;
import org.elasticsearch.index.similarity.SimilarityLookupService;
import org.elasticsearch.indices.analysis.IndicesAnalysisModule;
import org.elasticsearch.indices.analysis.IndicesAnalysisService;
import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;

public class MapperTestUtils {

    public static DocumentMapperParser newParser() {
        return new DocumentMapperParser(new Index("test"), ImmutableSettings.Builder.EMPTY_SETTINGS, newAnalysisService(), new PostingsFormatService(new Index("test")),
                new DocValuesFormatService(new Index("test")), newSimilarityLookupService(), null);
    }

    public static DocumentMapperParser newParser(Settings indexSettings) {
        return new DocumentMapperParser(new Index("test"), indexSettings, newAnalysisService(indexSettings), new PostingsFormatService(new Index("test")),
                new DocValuesFormatService(new Index("test")), newSimilarityLookupService(), null);
    }

    public static MapperService newMapperService() {
        return newMapperService(new Index("test"), ImmutableSettings.Builder.EMPTY_SETTINGS);
    }

    public static MapperService newMapperService(Index index, Settings indexSettings) {
        return new MapperService(index, indexSettings, new Environment(), newAnalysisService(), new IndexFieldDataService(index, new NoneCircuitBreakerService()),
                new PostingsFormatService(index), new DocValuesFormatService(index), newSimilarityLookupService(), null);
    }

    public static AnalysisService newAnalysisService() {
        return newAnalysisService(ImmutableSettings.Builder.EMPTY_SETTINGS);
    }

    public static AnalysisService newAnalysisService(Settings indexSettings) {
        Injector parentInjector = new ModulesBuilder().add(new SettingsModule(indexSettings), new EnvironmentModule(new Environment(ImmutableSettings.Builder.EMPTY_SETTINGS)), new IndicesAnalysisModule()).createInjector();
        Injector injector = new ModulesBuilder().add(
                new IndexSettingsModule(new Index("test"), indexSettings),
                new IndexNameModule(new Index("test")),
                new AnalysisModule(indexSettings, parentInjector.getInstance(IndicesAnalysisService.class))).createChildInjector(parentInjector);

        return injector.getInstance(AnalysisService.class);
    }

    public static SimilarityLookupService newSimilarityLookupService() {
        return new SimilarityLookupService(new Index("test"), ImmutableSettings.Builder.EMPTY_SETTINGS);
    }
}

@@ -1614,68 +1614,8 @@
 ce;%0A
-import org.elasticsearch.index.mapper.DocumentMapperParser;%0A
 impo
@@ -1994,705 +1994,239 @@
 ce;%0A
-%0Apublic class MapperTestUtils %7B%0A%0A    public static DocumentMapperParser newParser() %7B%0A        return new DocumentMapperParser(new Index(%22test%22), ImmutableSettings.Builder.EMPTY_SETTINGS, newAnalysisService(), new PostingsFormatService(new Index(%22test%22)),%0A                new DocValuesFormatService(new Index(%22test%22)), newSimilarityLookupService(), null);%0A    %7D%0A%0A    public static DocumentMapperParser newParser(Settings indexSettings) %7B%0A        return new DocumentMapperParser(new Index(%22test%22), indexSettings, newAnalysisService(indexSettings), new PostingsFormatService(new Index(%22test%22)),%0A                new DocValuesFormatService(new Index(%22test%22)), newSimilarityLookupService(), null);%0A    %7D
+import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache;%0Aimport org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCacheListener;%0Aimport org.elasticsearch.threadpool.ThreadPool;%0A%0Apublic class MapperTestUtils %7B
 %0A%0A  
@@ -2457,32 +2457,123 @@
 ndexSettings) %7B%0A
+        NoneCircuitBreakerService circuitBreakerService = new NoneCircuitBreakerService();%0A
         return n
@@ -2689,39 +2689,262 @@
 ex, 
-new NoneCircuitBreakerService()
+ImmutableSettings.Builder.EMPTY_SETTINGS,%0A                new IndicesFieldDataCache(ImmutableSettings.Builder.EMPTY_SETTINGS, new IndicesFieldDataCacheListener(circuitBreakerService), new ThreadPool(%22testing-only%22)),%0A                circuitBreakerService
 ),%0A 

Update to elasticsearch 1.4