diff --git a/metadata/src/main/java/com/google/i18n/phonenumbers/metadata/model/CsvData.java b/metadata/src/main/java/com/google/i18n/phonenumbers/metadata/model/CsvData.java index b2d1d3833..a53135539 100644 --- a/metadata/src/main/java/com/google/i18n/phonenumbers/metadata/model/CsvData.java +++ b/metadata/src/main/java/com/google/i18n/phonenumbers/metadata/model/CsvData.java @@ -212,7 +212,7 @@ public abstract class CsvData { } @Memoized - public ImmutableTable getExamplesAsTable() { + public ImmutableTable getExamplesAsTable() { return ExamplesTableSchema.toExampleTable(getExamples()); } diff --git a/metadata/src/main/java/com/google/i18n/phonenumbers/metadata/model/ExamplesTableSchema.java b/metadata/src/main/java/com/google/i18n/phonenumbers/metadata/model/ExamplesTableSchema.java index 5c3e312c4..35fbfaa31 100644 --- a/metadata/src/main/java/com/google/i18n/phonenumbers/metadata/model/ExamplesTableSchema.java +++ b/metadata/src/main/java/com/google/i18n/phonenumbers/metadata/model/ExamplesTableSchema.java @@ -21,7 +21,6 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableTable; import com.google.common.collect.Table; import com.google.common.collect.Table.Cell; -import com.google.i18n.phonenumbers.metadata.DigitSequence; import com.google.i18n.phonenumbers.metadata.i18n.PhoneRegion; import com.google.i18n.phonenumbers.metadata.proto.Types.ValidNumberType; import com.google.i18n.phonenumbers.metadata.table.Column; @@ -64,8 +63,7 @@ public final class ExamplesTableSchema { } /** A number column containing the digit sequence of a national number. */ - public static final Column NUMBER = Column.create( - DigitSequence.class, "Number", DigitSequence.empty(), DigitSequence::of); + public static final Column NUMBER = Column.ofString("Number"); /** A general comment field, usually describing how an example number was determined. */ public static final Column COMMENT = Column.ofString("Comment"); @@ -90,10 +88,10 @@ public final class ExamplesTableSchema { * {@link ExampleNumberKey}s as row keys. */ public static CsvTable toCsv( - Table table) { + Table table) { ImmutableTable.Builder, Object> out = ImmutableTable.builder(); out.orderRowsBy(ORDERING).orderColumnsBy(COLUMNS.ordering()); - for (Cell c : table.cellSet()) { + for (Cell c : table.cellSet()) { out.put(ExampleNumberKey.of(c.getRowKey(), c.getColumnKey()), NUMBER, c.getValue()); } return CsvTable.from(SCHEMA, out.build()); @@ -103,9 +101,9 @@ public final class ExamplesTableSchema { * Converts a {@link Table} of example numbers into a {@link CsvTable}, using * {@link ExampleNumberKey}s as row keys. */ - public static ImmutableTable + public static ImmutableTable toExampleTable(CsvTable csv) { - ImmutableTable.Builder out = + ImmutableTable.Builder out = ImmutableTable.builder(); for (ExampleNumberKey k : csv.getKeys()) { out.put(k.getRegion(), k.getType(), csv.getOrDefault(k, NUMBER)); diff --git a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/CsvTableTest.java b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/CsvTableTest.java index 3cf471feb..1bab7e0a5 100644 --- a/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/CsvTableTest.java +++ b/metadata/src/test/java/com/google/i18n/phonenumbers/metadata/table/CsvTableTest.java @@ -89,10 +89,10 @@ public class CsvTableTest { @Test public void testExampleNumberExport() throws IOException { - Table table = HashBasedTable.create(); - table.put(PhoneRegion.of("US"), ValidNumberType.TOLL_FREE, DigitSequence.of("800123456")); - table.put(PhoneRegion.of("US"), ValidNumberType.PREMIUM_RATE, DigitSequence.of("945123456")); - table.put(PhoneRegion.of("CA"), ValidNumberType.MOBILE, DigitSequence.of("555123456")); + Table table = HashBasedTable.create(); + table.put(PhoneRegion.of("US"), ValidNumberType.TOLL_FREE, String.valueOf(800123456)); + table.put(PhoneRegion.of("US"), ValidNumberType.PREMIUM_RATE, String.valueOf(945123456)); + table.put(PhoneRegion.of("CA"), ValidNumberType.MOBILE, String.valueOf(555123456)); // Ordering is well defined in the CSV output. CsvTable csv = ExamplesTableSchema.toCsv(table); assertCsv(csv,