phonelib 0.5.0 → 0.5.1

data/data/libphonenumber/java/build.xml

@@ -45,6 +45,21 @@
     </exec>
   </target>
 
+  <target name="build-single-file-phone-metadata">
+    <exec executable="java">
+      <arg value="-jar" />
+      <arg value="${build.tools.jar}"/>
+      <arg value="BuildMetadataProtoFromXml"/>
+      <arg value="--input-file=${resources.dir}/PhoneNumberMetadata.xml"/>
+      <arg value="--output-dir=${libphonenumber.src.dir}/com/google/i18n/phonenumbers"/>
+      <arg value="--data-prefix=data/SingleFilePhoneNumberMetadataProto"/>
+      <arg value="--single-file=true"/>
+      <arg value="--mapping-class=CountryCodeToRegionCodeMap"/>
+      <arg value="--copyright=2010"/>
+      <arg value="--lite-build=false"/>
+    </exec>
+  </target>
+
   <target name="build-short-metadata">
     <exec executable="java">
       <arg value="-jar" />
@@ -73,6 +88,21 @@
     </exec>
   </target>
 
+  <target name="build-single-file-test-metadata">
+    <exec executable="java">
+      <arg value="-jar" />
+      <arg value="${build.tools.jar}"/>
+      <arg value="BuildMetadataProtoFromXml"/>
+      <arg value="--input-file=${resources.dir}/PhoneNumberMetadataForTesting.xml"/>
+      <arg value="--output-dir=${libphonenumber.test.dir}/com/google/i18n/phonenumbers"/>
+      <arg value="--data-prefix=data/SingleFilePhoneNumberMetadataProtoForTesting"/>
+      <arg value="--single-file=true"/>
+      <arg value="--mapping-class=CountryCodeToRegionCodeMapForTesting"/>
+      <arg value="--copyright=2010"/>
+      <arg value="--lite-build=false"/>
+    </exec>
+  </target>
+
   <target name="build-alternate-metadata">
     <exec executable="java">
       <arg value="-jar" />

data/data/libphonenumber/java/carrier/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>carrier</artifactId>
-  <version>1.17-SNAPSHOT</version>
+  <version>1.18-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.0.11-SNAPSHOT</version>
+    <version>7.0.12-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -34,12 +34,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.0.11-SNAPSHOT</version>
+      <version>7.0.12-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.27-SNAPSHOT</version>
+      <version>2.28-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/demo/pom.xml

@@ -4,11 +4,11 @@
   <parent>
     <artifactId>libphonenumber-parent</artifactId>
     <groupId>com.googlecode.libphonenumber</groupId>
-    <version>7.0.11-SNAPSHOT</version>
+    <version>7.0.12-SNAPSHOT</version>
   </parent>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
-  <version>7.0.11-SNAPSHOT</version>
+  <version>7.0.12-SNAPSHOT</version>
 
   <properties>
     <gae.version>1.5.4</gae.version>
@@ -43,17 +43,17 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.0.11-SNAPSHOT</version>
+      <version>7.0.12-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>2.27-SNAPSHOT</version>
+      <version>2.28-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>carrier</artifactId>
-      <version>1.17-SNAPSHOT</version>
+      <version>1.18-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/geocoder/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>geocoder</artifactId>
-  <version>2.27-SNAPSHOT</version>
+  <version>2.28-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.0.11-SNAPSHOT</version>
+    <version>7.0.12-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -42,12 +42,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.0.11-SNAPSHOT</version>
+      <version>7.0.12-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.27-SNAPSHOT</version>
+      <version>2.28-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/internal/prefixmapper/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>prefixmapper</artifactId>
-  <version>2.27-SNAPSHOT</version>
+  <version>2.28-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.0.11-SNAPSHOT</version>
+    <version>7.0.12-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.0.11-SNAPSHOT</version>
+      <version>7.0.12-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/libphonenumber/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber</artifactId>
-  <version>7.0.11-SNAPSHOT</version>
+  <version>7.0.12-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.0.11-SNAPSHOT</version>
+    <version>7.0.12-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -28,6 +28,20 @@
         <targetPath>com/google/i18n/phonenumbers/data</targetPath>
       </testResource>
     </testResources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/SingleFileMetadataSourceImpl.class</exclude>
+            <exclude>**/SingleFileMetadataSourceImpl.java</exclude>
+            <exclude>**/SingleFilePhoneNumberMetadataProto</exclude>
+            <exclude>**/SingleFilePhoneNumberMetadataProtoForTesting</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 
 </project>

data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java

@@ -26,9 +26,9 @@ import java.util.Set;
 public class ShortNumbersRegionCodeSet {
   // A set of all region codes for which data is available.
   static Set<String> getRegionCodeSet() {
-    // The capacity is set to 309 as there are 232 different entries,
+    // The capacity is set to 317 as there are 238 different entries,
     // and this offers a load factor of roughly 0.75.
-    Set<String> regionCodeSet = new HashSet<String>(309);
+    Set<String> regionCodeSet = new HashSet<String>(317);
 
     regionCodeSet.add("AC");
     regionCodeSet.add("AD");
@@ -69,6 +69,8 @@ public class ShortNumbersRegionCodeSet {
     regionCodeSet.add("CA");
     regionCodeSet.add("CC");
     regionCodeSet.add("CD");
+    regionCodeSet.add("CF");
+    regionCodeSet.add("CG");
     regionCodeSet.add("CH");
     regionCodeSet.add("CI");
     regionCodeSet.add("CK");
@@ -93,6 +95,7 @@ public class ShortNumbersRegionCodeSet {
     regionCodeSet.add("EE");
     regionCodeSet.add("EG");
     regionCodeSet.add("EH");
+    regionCodeSet.add("ER");
     regionCodeSet.add("ES");
     regionCodeSet.add("ET");
     regionCodeSet.add("FI");
@@ -142,6 +145,7 @@ public class ShortNumbersRegionCodeSet {
     regionCodeSet.add("KI");
     regionCodeSet.add("KM");
     regionCodeSet.add("KN");
+    regionCodeSet.add("KP");
     regionCodeSet.add("KR");
     regionCodeSet.add("KW");
     regionCodeSet.add("KY");
@@ -182,6 +186,7 @@ public class ShortNumbersRegionCodeSet {
     regionCodeSet.add("MZ");
     regionCodeSet.add("NA");
     regionCodeSet.add("NC");
+    regionCodeSet.add("NE");
     regionCodeSet.add("NF");
     regionCodeSet.add("NG");
     regionCodeSet.add("NI");
@@ -223,6 +228,7 @@ public class ShortNumbersRegionCodeSet {
     regionCodeSet.add("SL");
     regionCodeSet.add("SM");
     regionCodeSet.add("SN");
+    regionCodeSet.add("SO");
     regionCodeSet.add("SR");
     regionCodeSet.add("ST");
     regionCodeSet.add("SV");

data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java

@@ -0,0 +1,98 @@
+package com.google.i18n.phonenumbers;
+
+import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
+import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Implementation of {@link MetadataSource} that reads from a resource file
+ * during initialization.
+ */
+public final class SingleFileMetadataSourceImpl implements MetadataSource {
+
+  private static final Logger logger =
+      Logger.getLogger(SingleFileMetadataSourceImpl.class.getName());
+
+  private static final String META_DATA_FILE =
+      "/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto";
+
+  // A mapping from a region code to the PhoneMetadata for that region.
+  // Note: Synchronization, though only needed for the Android version of the library, is used in
+  // all versions for consistency.
+  private final Map<String, PhoneMetadata> regionToMetadataMap =
+      Collections.synchronizedMap(new HashMap<String, PhoneMetadata>());
+
+  // A mapping from a country calling code for a non-geographical entity to the PhoneMetadata for
+  // that country calling code. Examples of the country calling codes include 800 (International
+  // Toll Free Service) and 808 (International Shared Cost Service).
+  // Note: Synchronization, though only needed for the Android version of the library, is used in
+  // all versions for consistency.
+  private final Map<Integer, PhoneMetadata> countryCodeToNonGeographicalMetadataMap =
+      Collections.synchronizedMap(new HashMap<Integer, PhoneMetadata>());
+
+  // It is assumed that metadataLoader is not null.
+  public SingleFileMetadataSourceImpl(MetadataLoader metadataLoader) {
+    InputStream input = metadataLoader.loadMetadata(META_DATA_FILE);
+    if (input == null) {
+      throw new IllegalStateException(
+          "no metadata available for PhoneNumberUtil: " + META_DATA_FILE);
+    }
+    PhoneMetadataCollection metadataCollection = loadMetadataAndCloseInput(input);
+    for (PhoneMetadata metadata : metadataCollection.getMetadataList()) {
+      String regionCode = metadata.getId();
+      int countryCallingCode = metadata.getCountryCode();
+      if (PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCode)) {
+        countryCodeToNonGeographicalMetadataMap.put(countryCallingCode, metadata);
+      } else {
+        regionToMetadataMap.put(regionCode, metadata);
+      }
+    }
+  }
+
+  @Override
+  public PhoneMetadata getMetadataForRegion(String regionCode) {
+    return regionToMetadataMap.get(regionCode);
+  }
+
+  @Override
+  public PhoneMetadata getMetadataForNonGeographicalRegion(int countryCallingCode) {
+    return countryCodeToNonGeographicalMetadataMap.get(countryCallingCode);
+  }
+
+  /**
+   * Loads the metadata protocol buffer from the given stream and closes the stream afterwards. Any
+   * exceptions that occur while reading the stream are propagated (though exceptions that occur
+   * when the stream is closed will be ignored).
+   *
+   * @param source  the non-null stream from which metadata is to be read.
+   * @return        the loaded metadata protocol buffer.
+   */
+  private static PhoneMetadataCollection loadMetadataAndCloseInput(InputStream source) {
+    PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection();
+    try {
+      // Read in metadata for each region.
+      ObjectInputStream in = new ObjectInputStream(source);
+      metadataCollection.readExternal(in);
+      return metadataCollection;
+    } catch (IOException e) {
+      logger.log(Level.WARNING, e.toString());
+    } finally {
+      try {
+        source.close();
+      } catch (IOException e) {
+        logger.log(Level.WARNING, e.toString());
+      }
+    }
+    return metadataCollection;
+  }
+}

data/data/libphonenumber/java/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber-parent</artifactId>
-  <version>7.0.11-SNAPSHOT</version>
+  <version>7.0.12-SNAPSHOT</version>
   <packaging>pom</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>