diff --git a/metadata/pom.xml b/metadata/pom.xml index 9f19b9637..2c8a6ceb4 100644 --- a/metadata/pom.xml +++ b/metadata/pom.xml @@ -43,8 +43,8 @@ maven-compiler-plugin 3.8.1 - 8 - 8 + 11 + 11 diff --git a/metadata/src/main/java/com/google/i18n/phonenumbers/metadata/model/FormatSpec.java b/metadata/src/main/java/com/google/i18n/phonenumbers/metadata/model/FormatSpec.java index ef2ddff51..1ad11c64e 100644 --- a/metadata/src/main/java/com/google/i18n/phonenumbers/metadata/model/FormatSpec.java +++ b/metadata/src/main/java/com/google/i18n/phonenumbers/metadata/model/FormatSpec.java @@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkState; import com.google.auto.value.AutoValue; import com.google.common.base.CharMatcher; -import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.i18n.phonenumbers.metadata.RangeSpecification; import com.google.i18n.phonenumbers.metadata.RangeTree; @@ -621,7 +620,7 @@ public abstract class FormatSpec { @Override public final String toString() { String group = - Strings.repeat("X", minLength()) + Strings.repeat("*", maxLength() - minLength()); + "X".repeat(minLength()) + "*".repeat(maxLength() - minLength()); return replacement().map(r -> String.format("{%s>%s}", group, r)).orElse(group); } } diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/RangeTreeTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/RangeTreeTest.java index d8f32a93c..3aea53d60 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/RangeTreeTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/RangeTreeTest.java @@ -18,12 +18,11 @@ package com.google.i18n.phonenumbers.metadata; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.truth.Truth.assertThat; import static com.google.i18n.phonenumbers.metadata.DigitSequence.domain; +import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import static com.google.i18n.phonenumbers.metadata.testing.RangeTreeSubject.assertThat; import static java.util.Arrays.asList; -import static com.google.i18n.phonenumbers.metadata.testing.AssertUtil.assertThrows; import com.google.auto.value.AutoValue; -import com.google.common.base.Strings; import com.google.common.collect.ImmutableRangeSet; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; @@ -505,7 +504,7 @@ public class RangeTreeTest { RangeTree combined = new ForkJoinPool(numThreads) .submit(() -> ranges.parallelStream().reduce(RangeTree.empty(), RangeTree::union)) .get(); - assertThat(combined).isEqualTo(ranges(Strings.repeat("x", numDigits))); + assertThat(combined).isEqualTo(ranges("x".repeat(numDigits))); } @AutoValue