Combine the add and merge methods in FieldCapabilities.Builder.

server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilities.java

@@ -290,35 +290,20 @@ static class Builder {
             this.meta = new HashMap<>();
         }
 
-        private void add(String index, boolean search, boolean agg) {
+        /**
+         * Collect the field capabilities for an index.
+         */
+        void add(String index, boolean search, boolean agg, Map<String, String> meta) {
             IndexCaps indexCaps = new IndexCaps(index, search, agg);
             indiceList.add(indexCaps);
             this.isSearchable &= search;
             this.isAggregatable &= agg;
-        }
-
-        /**
-         * Collect capabilities of an index.
-         */
-        void add(String index, boolean search, boolean agg, Map<String, String> meta) {
-            add(index, search, agg);
             for (Map.Entry<String, String> entry : meta.entrySet()) {
                 this.meta.computeIfAbsent(entry.getKey(), key -> new HashSet<>())
                         .add(entry.getValue());
             }
         }
 
-        /**
-         * Merge another capabilities instance.
-         */
-        void merge(String index, boolean search, boolean agg, Map<String, Set<String>> meta) {
-            add(index, search, agg);
-            for (Map.Entry<String, Set<String>> entry : meta.entrySet()) {
-                this.meta.computeIfAbsent(entry.getKey(), key -> new HashSet<>())
-                        .addAll(entry.getValue());
-            }
-        }
-
         List<String> getIndices() {
             return indiceList.stream().map(c -> c.name).collect(Collectors.toList());
         }

server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesAction.java

@@ -189,7 +189,7 @@ private void innerMerge(Map<String, Map<String, FieldCapabilities.Builder>> resp
             Map<String, FieldCapabilities.Builder> typeMap = responseMapBuilder.computeIfAbsent(field, f -> new HashMap<>());
             FieldCapabilities.Builder builder = typeMap.computeIfAbsent(fieldCap.getType(),
                 key -> new FieldCapabilities.Builder(field, key));
-            builder.merge(indexName, fieldCap.isSearchable(), fieldCap.isAggregatable(), fieldCap.meta());
+            builder.add(indexName, fieldCap.isSearchable(), fieldCap.isAggregatable(), fieldCap.meta());
         }
     }
 }