Merge branch 'master' into rename-nongeographicalregion

README.md

@@ -55,7 +55,7 @@ Cream Sandwich).
 The [Java demo](https://libphonenumber.appspot.com/) is updated with a slight
 delay after the GitHub release.
 
-Last demo update: v8.13.46.
+Last demo update: v8.13.47.
 
 Note: Even though the library (main branch/[maven release](https://repo1.maven.org/maven2/com/googlecode/libphonenumber/libphonenumber/8.12.56/))
 is at v8.12.57, because of some deployment issues, we were unable to update the

java/build.xml

@@ -77,8 +77,9 @@
       <arg value="--output-dir=${libphonenumber.test.dir}/com/google/i18n/phonenumbers"/>
       <arg value="--data-prefix=data/PhoneNumberMetadataProtoForTesting"/>
       <arg value="--mapping-class=CountryCodeToRegionCodeMapForTesting"/>
-      <arg value="--copyright=2010"/>
+      <arg value="--copyright=2011"/>
       <arg value="--lite-build=false"/>
+      <arg value="--build-regioncode=true"/>
     </exec>
   </target>
 

java/carrier/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>carrier</artifactId>
-  <version>1.231-SNAPSHOT</version>
+  <version>1.232-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.47-SNAPSHOT</version>
+    <version>8.13.48-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -79,12 +79,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.47-SNAPSHOT</version>
+      <version>8.13.48-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.241-SNAPSHOT</version>
+      <version>2.242-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

java/demo/pom.xml

@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
-  <version>8.13.47-SNAPSHOT</version>
+  <version>8.13.48-SNAPSHOT</version>
   <packaging>war</packaging>
   <url>https://github.com/google/libphonenumber/</url>
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.47-SNAPSHOT</version>
+    <version>8.13.48-SNAPSHOT</version>
   </parent>
 
   <properties>
@@ -68,17 +68,17 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.47-SNAPSHOT</version>
+      <version>8.13.48-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>2.241-SNAPSHOT</version>
+      <version>2.242-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>carrier</artifactId>
-      <version>1.231-SNAPSHOT</version>
+      <version>1.232-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

java/geocoder/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>geocoder</artifactId>
-  <version>2.241-SNAPSHOT</version>
+  <version>2.242-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.47-SNAPSHOT</version>
+    <version>8.13.48-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -87,12 +87,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.47-SNAPSHOT</version>
+      <version>8.13.48-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.241-SNAPSHOT</version>
+      <version>2.242-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

java/internal/prefixmapper/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>prefixmapper</artifactId>
-  <version>2.241-SNAPSHOT</version>
+  <version>2.242-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.47-SNAPSHOT</version>
+    <version>8.13.48-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>8.13.47-SNAPSHOT</version>
+      <version>8.13.48-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

java/libphonenumber/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber</artifactId>
-  <version>8.13.47-SNAPSHOT</version>
+  <version>8.13.48-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>8.13.47-SNAPSHOT</version>
+    <version>8.13.48-SNAPSHOT</version>
   </parent>
 
   <build>

java/libphonenumber/src/com/google/i18n/phonenumbers/metadata/source/MultiFileModeFileNameProvider.java

@@ -16,7 +16,6 @@
 
 package com.google.i18n.phonenumbers.metadata.source;
 
-import java.util.regex.Pattern;
 
 /**
  * {@link PhoneMetadataFileNameProvider} implementation which appends key as a suffix to the
@@ -25,7 +24,6 @@
 public final class MultiFileModeFileNameProvider implements PhoneMetadataFileNameProvider {
 
   private final String phoneMetadataFileNamePrefix;
-  private static final Pattern ALPHANUMERIC = Pattern.compile("^[\\p{L}\\p{N}]+$");
 
   public MultiFileModeFileNameProvider(String phoneMetadataFileNameBase) {
     this.phoneMetadataFileNamePrefix = phoneMetadataFileNameBase + "_";
@@ -34,9 +32,27 @@ public MultiFileModeFileNameProvider(String phoneMetadataFileNameBase) {
   @Override
   public String getFor(Object key) {
     String keyAsString = key.toString();
-    if (!ALPHANUMERIC.matcher(keyAsString).matches()) {
+    if (!isAlphanumeric(keyAsString)) {
       throw new IllegalArgumentException("Invalid key: " + keyAsString);
     }
     return phoneMetadataFileNamePrefix + key;
   }
+
+  private boolean isAlphanumeric(String key) {
+    if (key == null || key.length() == 0) {
+      return false;
+    }
+    // String#length doesn't actually return the number of
+    // code points in the String, it returns the number
+    // of char values.
+    int size = key.length();
+    for (int charIdx = 0; charIdx < size; ) {
+      final int codePoint = key.codePointAt(charIdx);
+      if (!Character.isLetterOrDigit(codePoint)) {
+        return false;
+      }
+      charIdx += Character.charCount(codePoint);
+    }
+    return true;
+  }
 }

java/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 The Libphonenumber Authors
+ * Copyright (C) 2011 The Libphonenumber Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java

@@ -415,7 +415,7 @@ public void testGetExampleNumber() {
     // We have data for the US, but no data for VOICEMAIL, so return null.
     assertNull(phoneUtil.getExampleNumberForType(RegionCode.US, PhoneNumberType.VOICEMAIL));
     // CS is an invalid region, so we have no data for it.
-    assertNull(phoneUtil.getExampleNumberForType(RegionCode.CS, PhoneNumberType.MOBILE));
+    assertNull(phoneUtil.getExampleNumberForType("CS", PhoneNumberType.MOBILE));
     // RegionCode 001 is reserved for supporting non-geographical country calling code. We don't
     // support getting an example number for it with this method.
     assertNull(phoneUtil.getExampleNumber(RegionCode.UN001));
@@ -425,7 +425,7 @@ public void testGetInvalidExampleNumber() {
     // RegionCode 001 is reserved for supporting non-geographical country calling codes. We don't
     // support getting an invalid example number for it with getInvalidExampleNumber.
     assertNull(phoneUtil.getInvalidExampleNumber(RegionCode.UN001));
-    assertNull(phoneUtil.getInvalidExampleNumber(RegionCode.CS));
+    assertNull(phoneUtil.getInvalidExampleNumber("CS"));
     PhoneNumber usInvalidNumber = phoneUtil.getInvalidExampleNumber(RegionCode.US);
     assertEquals(1, usInvalidNumber.getCountryCode());
     assertFalse(usInvalidNumber.getNationalNumber() == 0);
@@ -658,7 +658,7 @@ public void testFormatOutOfCountryWithInvalidRegion() {
     // AQ/Antarctica isn't a valid region code for phone number formatting,
     // so this falls back to intl formatting.
     assertEquals("+1 650 253 0000",
-                 phoneUtil.formatOutOfCountryCallingNumber(US_NUMBER, RegionCode.AQ));
+                 phoneUtil.formatOutOfCountryCallingNumber(US_NUMBER, "AQ"));
     // For region code 001, the out-of-country format always turns into the international format.
     assertEquals("+1 650 253 0000",
                  phoneUtil.formatOutOfCountryCallingNumber(US_NUMBER, RegionCode.UN001));
@@ -735,7 +735,7 @@ public void testFormatOutOfCountryKeepingAlphaChars() {
                  phoneUtil.formatOutOfCountryKeepingAlphaChars(alphaNumericNumber, RegionCode.SG));
     // Testing the case of calling from a non-supported region.
     assertEquals("+61 1-800-SIX-FLAG",
-                 phoneUtil.formatOutOfCountryKeepingAlphaChars(alphaNumericNumber, RegionCode.AQ));
+                 phoneUtil.formatOutOfCountryKeepingAlphaChars(alphaNumericNumber, "AQ"));
 
     // Testing the case with an invalid country calling code.
     alphaNumericNumber.setCountryCode(0).setNationalNumber(18007493524L)
@@ -754,7 +754,7 @@ public void testFormatOutOfCountryKeepingAlphaChars() {
     alphaNumericNumber.setCountryCode(1).setNationalNumber(80749L).setRawInput("180-SIX");
     // No country-code stripping can be done since the number is invalid.
     assertEquals("+1 180-SIX",
-                 phoneUtil.formatOutOfCountryKeepingAlphaChars(alphaNumericNumber, RegionCode.AQ));
+                 phoneUtil.formatOutOfCountryKeepingAlphaChars(alphaNumericNumber, "AQ"));
   }
 
   public void testFormatWithCarrierCode() {
@@ -820,12 +820,12 @@ public void testFormatNumberForMobileDialing() {
     assertEquals("030123456",
         phoneUtil.formatNumberForMobileDialing(DE_NUMBER, RegionCode.DE, false));
     assertEquals("+4930123456",
-        phoneUtil.formatNumberForMobileDialing(DE_NUMBER, RegionCode.CH, false));
+        phoneUtil.formatNumberForMobileDialing(DE_NUMBER, "CH", false));
     PhoneNumber deNumberWithExtn = new PhoneNumber().mergeFrom(DE_NUMBER).setExtension("1234");
     assertEquals("030123456",
         phoneUtil.formatNumberForMobileDialing(deNumberWithExtn, RegionCode.DE, false));
     assertEquals("+4930123456",
-        phoneUtil.formatNumberForMobileDialing(deNumberWithExtn, RegionCode.CH, false));
+        phoneUtil.formatNumberForMobileDialing(deNumberWithExtn, "CH", false));
 
     // US toll free numbers are marked as noInternationalDialling in the test metadata for testing
     // purposes. For such numbers, we expect nothing to be returned when the region code is not the
@@ -1336,7 +1336,7 @@ public void testGetCountryCodeForRegion() {
     assertEquals(0, phoneUtil.getCountryCodeForRegion(RegionCode.ZZ));
     assertEquals(0, phoneUtil.getCountryCodeForRegion(RegionCode.UN001));
     // CS is already deprecated so the library doesn't support it.
-    assertEquals(0, phoneUtil.getCountryCodeForRegion(RegionCode.CS));
+    assertEquals(0, phoneUtil.getCountryCodeForRegion("CS"));
   }
 
   public void testGetNationalDiallingPrefixForRegion() {
@@ -1353,7 +1353,7 @@ public void testGetNationalDiallingPrefixForRegion() {
     assertEquals(null, phoneUtil.getNddPrefixForRegion(RegionCode.ZZ, false));
     assertEquals(null, phoneUtil.getNddPrefixForRegion(RegionCode.UN001, false));
     // CS is already deprecated so the library doesn't support it.
-    assertEquals(null, phoneUtil.getNddPrefixForRegion(RegionCode.CS, false));
+    assertEquals(null, phoneUtil.getNddPrefixForRegion("CS", false));
   }
 
   public void testIsNANPACountry() {
@@ -2430,7 +2430,7 @@ public void testFailedParseOnInvalidNumbers() {
     }
     try {
       String someNumber = "123 456 7890";
-      phoneUtil.parse(someNumber, RegionCode.CS);
+      phoneUtil.parse(someNumber, "CS");
       fail("Deprecated region code not allowed: should fail.");
     } catch (NumberParseException e) {
       // Expected this exception.
@@ -2854,7 +2854,7 @@ public void testParseAndKeepRaw() throws Exception {
 
     // Invalid region code supplied.
     try {
-      phoneUtil.parseAndKeepRawInput("123 456 7890", RegionCode.CS);
+      phoneUtil.parseAndKeepRawInput("123 456 7890", "CS");
       fail("Deprecated region code not allowed: should fail.");
     } catch (NumberParseException e) {
       // Expected this exception.

java/libphonenumber/test/com/google/i18n/phonenumbers/RegionCode.java

@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+/* This file is automatically generated by {@link BuildMetadataProtoFromXml}.
+ * Please don't modify it directly.
+ */
+
 package com.google.i18n.phonenumbers;
 
 /**
@@ -26,39 +30,35 @@ final class RegionCode {
   static final String AE = "AE";
   static final String AM = "AM";
   static final String AO = "AO";
-  static final String AQ = "AQ";
   static final String AR = "AR";
   static final String AU = "AU";
   static final String BB = "BB";
   static final String BR = "BR";
   static final String BS = "BS";
   static final String BY = "BY";
   static final String CA = "CA";
-  static final String CH = "CH";
-  static final String CL = "CL";
+  static final String CC = "CC";
   static final String CN = "CN";
   static final String CO = "CO";
-  static final String CS = "CS";
   static final String CX = "CX";
   static final String DE = "DE";
   static final String FR = "FR";
   static final String GB = "GB";
-  static final String HU = "HU";
+  static final String GG = "GG";
   static final String IT = "IT";
   static final String JP = "JP";
   static final String KR = "KR";
   static final String MX = "MX";
   static final String NZ = "NZ";
-  static final String PG = "PG";
   static final String PL = "PL";
   static final String RE = "RE";
   static final String RU = "RU";
   static final String SE = "SE";
   static final String SG = "SG";
+  static final String TA = "TA";
   static final String US = "US";
   static final String UZ = "UZ";
   static final String YT = "YT";
-  static final String ZW = "ZW";
   // Official code for the unknown region.
   static final String ZZ = "ZZ";
 }