Apache Lucene open-source search software
remove javaism completely
Robert Muir8bdc6a7aae2e
diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.javaindex bdd2224555c..7137bc1f6a5 100644--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java@@ -17,26 +17,22 @@package org.apache.lucene.benchmark.byTask.tasks;import java.util.Locale;-import java.util.StringTokenizer;import org.apache.lucene.benchmark.byTask.PerfRunData;/*** Set a {@link java.util.Locale} for use in benchmarking.*- * <p>Locales can be specified in the following ways:+ * <p>Locales can be specified as BCP-47 language tag or as ROOT or empty string.** <ul>* <li><code>de</code>: Language "de"- * <li><code>en,US</code>: Language "en", country "US"- * <li><code>no,NO,NY</code>: Language "no", country "NO", variant "NY"+ * <li><code>en-US</code>: Language "en", country "US"* <li><code>ROOT</code>: The root (language-agnostic) Locale* <li><empty string>: Erase the Locale (null)* </ul>*/public class NewLocaleTask extends PerfTask {- private String language;- private String country;- private String variant;+ private String tag;/*** Create a new {@link java.util.Locale} and set it in the getRunData() for use by all future@@ -46,31 +42,19 @@ public class NewLocaleTask extends PerfTask {super(runData);}- static Locale createLocale(String language, String country, String variant) {- if (language == null || language.length() == 0) return null;+ static Locale createLocale(String tag) {+ if (tag == null || tag.length() == 0) return null;- if (language.equalsIgnoreCase("ROOT")) {+ if (tag.equalsIgnoreCase("ROOT")) {return Locale.ROOT;}- StringBuilder sb = new StringBuilder();- sb.append(language);- if (country.length() > 0) {- sb.append('-');- sb.append(country);-- if (variant.length() > 0) {- sb.append('-');- sb.append(variant);- }- }-- return new Locale.Builder().setLanguageTag(sb.toString()).build();+ return new Locale.Builder().setLanguageTag(tag).build();}@Overridepublic int doLogic() throws Exception {- Locale locale = createLocale(language, country, variant);+ Locale locale = createLocale(tag);getRunData().setLocale(locale);System.out.println("Changed Locale to: "@@ -83,11 +67,7 @@ public class NewLocaleTask extends PerfTask {@Overridepublic void setParams(String params) {super.setParams(params);- language = country = variant = "";- StringTokenizer st = new StringTokenizer(params, ",");- if (st.hasMoreTokens()) language = st.nextToken();- if (st.hasMoreTokens()) country = st.nextToken();- if (st.hasMoreTokens()) variant = st.nextToken();+ tag = params;}@Overridediff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.javaindex 44885ec54b9..312e1c1fdf7 100644--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java@@ -801,15 +801,9 @@ public class TestPerfTasksLogic extends BenchmarkTestCase {new Locale.Builder().setLanguageTag("de").build(), benchmark.getRunData().getLocale());// specify language + country- benchmark = execBenchmark(getLocaleConfig("en,US"));+ benchmark = execBenchmark(getLocaleConfig("en-US"));assertEquals(new Locale.Builder().setLanguageTag("en-US").build(), benchmark.getRunData().getLocale());-- // specify language + country + variant- benchmark = execBenchmark(getLocaleConfig("no,NO,NY"));- assertEquals(- new Locale.Builder().setLanguageTag("no-NO-NY").build(),- benchmark.getRunData().getLocale());}private String[] getLocaleConfig(String localeParam) {@@ -847,17 +841,17 @@ public class TestPerfTasksLogic extends BenchmarkTestCase {assertEqualCollation(expected, benchmark.getRunData().getAnalyzer(), "foobar");// specify language + country- benchmark = execBenchmark(getCollatorConfig("en,US", "impl:jdk"));+ benchmark = execBenchmark(getCollatorConfig("en-US", "impl:jdk"));expected =new CollationKeyAnalyzer(Collator.getInstance(new Locale.Builder().setLanguageTag("en-US").build()));assertEqualCollation(expected, benchmark.getRunData().getAnalyzer(), "foobar");// specify language + country + variant- benchmark = execBenchmark(getCollatorConfig("no,NO,NY", "impl:jdk"));+ benchmark = execBenchmark(getCollatorConfig("nn-NO", "impl:jdk"));expected =new CollationKeyAnalyzer(- Collator.getInstance(new Locale.Builder().setLanguageTag("no-NO-NY").build()));+ Collator.getInstance(new Locale.Builder().setLanguageTag("nn-NO").build()));assertEqualCollation(expected, benchmark.getRunData().getAnalyzer(), "foobar");}