Replace remaining references to 'json' with 'flattened'

We missed these when renaming the flattened field type.

Author: jtibshirani

server/src/main/java/org/elasticsearch/index/mapper/flattened/KeyedFlattenedLeafFieldData.java

@@ -70,7 +70,7 @@ public SortedSetDocValues getOrdinalsValues() {
             throw new UncheckedIOException(e);
         }
 
-        return new KeyedJsonDocValues(keyBytes, values, minOrd, maxOrd);
+        return new KeyedFlattenedDocValues(keyBytes, values, minOrd, maxOrd);
     }
 
     @Override
@@ -144,7 +144,7 @@ private static int compare(BytesRef key, BytesRef term) {
         return key.compareTo(extractedKey);
     }
 
-    private static class KeyedJsonDocValues extends AbstractSortedSetDocValues {
+    private static class KeyedFlattenedDocValues extends AbstractSortedSetDocValues {
 
         private final BytesRef key;
         private final SortedSetDocValues delegate;
@@ -163,10 +163,10 @@ private static class KeyedJsonDocValues extends AbstractSortedSetDocValues {
          */
         private long cachedNextOrd;
 
-        private KeyedJsonDocValues(BytesRef key,
-                                   SortedSetDocValues delegate,
-                                   long minOrd,
-                                   long maxOrd) {
+        private KeyedFlattenedDocValues(BytesRef key,
+                                        SortedSetDocValues delegate,
+                                        long minOrd,
+                                        long maxOrd) {
             assert minOrd >= 0 && maxOrd >= 0;
             this.key = key;
             this.delegate = delegate;

server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldParserTests.java

@@ -18,7 +18,6 @@
 import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.index.mapper.MappedFieldType;
 import org.elasticsearch.index.mapper.MockFieldMapper.FakeFieldType;
-import org.elasticsearch.index.mapper.flattened.FlattenedFieldParser;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.test.XContentTestUtils;
 import org.junit.Before;

server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedIndexFieldDataTests.java

@@ -45,7 +45,7 @@ public void testGlobalFieldDataCaching() throws IOException {
             indicesService.getCircuitBreakerService(),
             indexService.mapperService());
 
-        FlattenedFieldMapper fieldMapper = new FlattenedFieldMapper.Builder("json").build(new ContentPath(1));
+        FlattenedFieldMapper fieldMapper = new FlattenedFieldMapper.Builder("flattened").build(new ContentPath(1));
         MappedFieldType fieldType1 = fieldMapper.fieldType().getChildFieldType("key");
 
         AtomicInteger onCacheCalled = new AtomicInteger();
@@ -63,7 +63,7 @@ public void onCache(ShardId shardId, String fieldName, Accountable ramUsage) {
         IndexWriter writer = new IndexWriter(directory, config);
 
         Document doc = new Document();
-        doc.add(new SortedSetDocValuesField("json._keyed", new BytesRef("some_key\0some_value")));
+        doc.add(new SortedSetDocValuesField("flattened._keyed", new BytesRef("some_key\0some_value")));
         writer.addDocument(doc);
         writer.commit();
         writer.addDocument(doc);

server/src/test/java/org/elasticsearch/search/lookup/LeafDocLookupTests.java

@@ -73,17 +73,17 @@ public void testFlattenedField() {
         };
 
         LeafDocLookup docLookup = new LeafDocLookup(field -> {
-            if (field.equals("json.key1")) {
+            if (field.equals("flattened.key1")) {
                 return fieldType1;
             }
-            if (field.equals("json.key2")) {
+            if (field.equals("flattened.key2")) {
                 return fieldType2;
             }
             return null;
         }, fieldDataSupplier, null);
 
-        assertEquals(docValues1, docLookup.get("json.key1"));
-        assertEquals(docValues2, docLookup.get("json.key2"));
+        assertEquals(docValues1, docLookup.get("flattened.key1"));
+        assertEquals(docValues2, docLookup.get("flattened.key2"));
     }
 
     private IndexFieldData<?> createFieldData(ScriptDocValues<?> scriptDocValues) {