diff --git a/pom.xml b/pom.xml index f61ec34b1d13a..78970ac3b1f97 100644 --- a/pom.xml +++ b/pom.xml @@ -1002,7 +1002,7 @@ de.thetaphi forbiddenapis - 1.4 + 1.4.1 diff --git a/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchBenchmark.java b/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchBenchmark.java index c12f24f06d192..53887fb8a7941 100644 --- a/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchBenchmark.java +++ b/src/test/java/org/elasticsearch/benchmark/search/aggregations/TermsAggregationSearchBenchmark.java @@ -38,6 +38,7 @@ import org.elasticsearch.search.aggregations.AggregationBuilders; import java.util.List; +import java.util.Locale; import java.util.Random; import static org.elasticsearch.client.Requests.createIndexRequest; @@ -266,9 +267,9 @@ public static void main(String[] args) throws Exception { stats.add(termsStats("terms_stats_agg_sm_l_dv", Method.AGGREGATION, "sm_value_dv", "l_value_dv", null)); System.out.println("------------------ SUMMARY -------------------------------"); - System.out.format("%25s%10s%10s\n", "name", "took", "millis"); + System.out.format(Locale.ENGLISH, "%25s%10s%10s\n", "name", "took", "millis"); for (StatsResult stat : stats) { - System.out.format("%25s%10s%10d\n", stat.name, TimeValue.timeValueMillis(stat.took), (stat.took / QUERY_COUNT)); + System.out.format(Locale.ENGLISH, "%25s%10s%10d\n", stat.name, TimeValue.timeValueMillis(stat.took), (stat.took / QUERY_COUNT)); } System.out.println("------------------ SUMMARY -------------------------------"); diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/GroupTree.java b/src/test/java/org/elasticsearch/search/aggregations/metrics/GroupTree.java index 44e00a064bf83..7864415142788 100644 --- a/src/test/java/org/elasticsearch/search/aggregations/metrics/GroupTree.java +++ b/src/test/java/org/elasticsearch/search/aggregations/metrics/GroupTree.java @@ -22,10 +22,7 @@ import com.google.common.collect.AbstractIterator; import com.google.common.collect.Lists; -import java.util.ArrayDeque; -import java.util.Deque; -import java.util.Iterator; -import java.util.List; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; /** @@ -366,10 +363,10 @@ public void checkBalance() { public void print(int depth) { for (int i = 0; i < depth; i++) { - System.out.printf("| "); + System.out.print("| "); } int imbalance = Math.abs((left != null ? left.depth : 1) - (right != null ? right.depth : 1)); - System.out.printf("%s%s, %d, %d, %d\n", (imbalance > 1 ? "* " : "") + (right != null && leaf.compareTo(right.first()) != 0 ? "+ " : ""), leaf, size, count, this.depth); + System.out.printf(Locale.ENGLISH, "%s%s, %d, %d, %d\n", (imbalance > 1 ? "* " : "") + (right != null && leaf.compareTo(right.first()) != 0 ? "+ " : ""), leaf, size, count, this.depth); if (left != null) { left.print(depth + 1); right.print(depth + 1);