Commit changes.

metadata/src/main/java/com/google/i18n/phonenumbers/metadata/model/CsvData.java

@@ -212,7 +212,7 @@ public abstract class CsvData {
   }
 
   @Memoized
-  public ImmutableTable<PhoneRegion, ValidNumberType, DigitSequence> getExamplesAsTable() {
+  public ImmutableTable<PhoneRegion, ValidNumberType, String> getExamplesAsTable() {
     return ExamplesTableSchema.toExampleTable(getExamples());
   }
 

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<DigitSequence> NUMBER = Column.create(
-      DigitSequence.class, "Number", DigitSequence.empty(), DigitSequence::of);
+  public static final Column<String> NUMBER = Column.ofString("Number");
 
   /** A general comment field, usually describing how an example number was determined. */
   public static final Column<String> COMMENT = Column.ofString("Comment");
@@ -90,10 +88,10 @@ public final class ExamplesTableSchema {
    * {@link ExampleNumberKey}s as row keys.
    */
   public static CsvTable<ExampleNumberKey> toCsv(
-      Table<PhoneRegion, ValidNumberType, DigitSequence> table) {
+      Table<PhoneRegion, ValidNumberType, String> table) {
     ImmutableTable.Builder<ExampleNumberKey, Column<?>, Object> out = ImmutableTable.builder();
     out.orderRowsBy(ORDERING).orderColumnsBy(COLUMNS.ordering());
-    for (Cell<PhoneRegion, ValidNumberType, DigitSequence> c : table.cellSet()) {
+    for (Cell<PhoneRegion, ValidNumberType, String> 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<PhoneRegion, ValidNumberType, DigitSequence>
+  public static ImmutableTable<PhoneRegion, ValidNumberType, String>
       toExampleTable(CsvTable<ExampleNumberKey> csv) {
-    ImmutableTable.Builder<PhoneRegion, ValidNumberType, DigitSequence> out =
+    ImmutableTable.Builder<PhoneRegion, ValidNumberType, String> out =
         ImmutableTable.builder();
     for (ExampleNumberKey k : csv.getKeys()) {
       out.put(k.getRegion(), k.getType(), csv.getOrDefault(k, NUMBER));

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<PhoneRegion, ValidNumberType, DigitSequence> 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<PhoneRegion, ValidNumberType, String> 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<ExampleNumberKey> csv = ExamplesTableSchema.toCsv(table);
     assertCsv(csv,