phonelib 0.5.2 → 0.5.4

data/data/libphonenumber/debian/control

@@ -28,15 +28,17 @@ Build-Depends: cdbs,
                libprotobuf-java,
                libservlet2.5-java,
                libservlet2.5-java-doc
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Section: libs
 Homepage: https://github.com/googlei18n/libphonenumber/
-Vcs-Browser: https://github.com/googlei18n/libphonenumber/
-Vcs-Git: https://github.com/googlei18n/libphonenumber.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libphonenumber.git/
+Vcs-Git: git://anonscm.debian.org/collab-maint/libphonenumber.git
 
-Package: libphonenumber6-java
+Package: libphonenumber7-java
 Section: java
 Architecture: all
+Conflicts: libphonenumber6-java
+Replaces: libphonenumber6-java
 Depends: ${misc:Depends}, ${maven:Depends}
 Recommends: ${maven:OptionalDepends}
 Description: parsing/formatting/validating phone numbers - java
@@ -45,13 +47,13 @@ Description: parsing/formatting/validating phone numbers - java
  .
  This package contains the runtime library JARs for Java users.
 
-Package: libphonenumber6-dev
+Package: libphonenumber7-dev
 Section: libdevel
 Architecture: any
 Provides: libphonenumber-dev
 Conflicts: libphonenumber-dev
 Replaces: libphonenumber-dev
-Depends: libphonenumber6 (=${binary:Version}), ${misc:Depends},
+Depends: libphonenumber7 (=${binary:Version}), ${misc:Depends},
          libboost-dev (>= 1.40),
          libboost-system-dev (>= 1.40),
          libboost-thread-dev (>= 1.40),
@@ -62,7 +64,7 @@ Description: parsing/formatting/validating phone numbers - development files
  .
  This package contains the static libraries and include files.
 
-Package: libphonenumber6
+Package: libphonenumber7
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}

data/data/libphonenumber/debian/rules

@@ -53,7 +53,7 @@ endif
 #	dh $@ --with javahelper
 
 #override_dh_auto_configure:
-configure/libphonenumber6::
+configure/libphonenumber7::
 	mkdir -p $(CPP_BUILD) && cd $(CPP_BUILD) && $(CMAKE) $(CMAKE_FLAGS) ..
 
 #override_dh_auto_build:
@@ -61,7 +61,7 @@ configure/libphonenumber6::
 #	mkdir java/lib
 #	ln -s /usr/share/java/junit4.jar java/lib/junit-4.8.1.jar
 #	$(ANT) -f $(JAVA_BUILD).xml jar
-build/libphonenumber6::
+build/libphonenumber7::
 	ln -sf cpp-build-1.0-SNAPSHOT.jar tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar
 	ln -sf /usr/share/java/protobuf.jar tools/java/cpp-build/target/protobuf-java-debian.jar
 	$(MAKE) -C $(CPP_BUILD) phonenumber phonenumber-shared

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.18-SNAPSHOT</version>
+  <version>1.20-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.12-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -34,12 +34,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.0.12-SNAPSHOT</version>
+      <version>7.1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.28-SNAPSHOT</version>
+      <version>2.30-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.12-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
   </parent>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
-  <version>7.0.12-SNAPSHOT</version>
+  <version>7.1.2-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.12-SNAPSHOT</version>
+      <version>7.1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>2.28-SNAPSHOT</version>
+      <version>2.30-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>carrier</artifactId>
-      <version>1.18-SNAPSHOT</version>
+      <version>1.20-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.28-SNAPSHOT</version>
+  <version>2.30-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.12-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -42,12 +42,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.0.12-SNAPSHOT</version>
+      <version>7.1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.28-SNAPSHOT</version>
+      <version>2.30-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.28-SNAPSHOT</version>
+  <version>2.30-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.12-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.0.12-SNAPSHOT</version>
+      <version>7.1.2-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.12-SNAPSHOT</version>
+  <version>7.1.2-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.12-SNAPSHOT</version>
+    <version>7.1.2-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -36,6 +36,8 @@
           <excludes>
             <exclude>**/SingleFileMetadataSourceImpl.class</exclude>
             <exclude>**/SingleFileMetadataSourceImpl.java</exclude>
+            <exclude>**/SingleFileMetadataSourceImplTest.class</exclude>
+            <exclude>**/SingleFileMetadataSourceImplTest.java</exclude>
             <exclude>**/SingleFilePhoneNumberMetadataProto</exclude>
             <exclude>**/SingleFilePhoneNumberMetadataProtoForTesting</exclude>
           </excludes>

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

@@ -19,7 +19,7 @@ package com.google.i18n.phonenumbers;
 import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
 
 /**
- * A source for phone metadata from resources.
+ * A source for phone metadata for all regions.
  */
 interface MetadataSource {
   /**

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

@@ -55,14 +55,14 @@ final class MultiFileMetadataSourceImpl implements MetadataSource {
       Collections.synchronizedMap(new HashMap<Integer, PhoneMetadata>());
 
   // The prefix of the metadata files from which region data is loaded.
-  private final String currentFilePrefix;
+  private final String filePrefix;
 
   // The metadata loader used to inject alternative metadata sources.
   private final MetadataLoader metadataLoader;
 
   // It is assumed that metadataLoader is not null.
-  public MultiFileMetadataSourceImpl(String currentFilePrefix, MetadataLoader metadataLoader) {
-    this.currentFilePrefix = currentFilePrefix;
+  public MultiFileMetadataSourceImpl(String filePrefix, MetadataLoader metadataLoader) {
+    this.filePrefix = filePrefix;
     this.metadataLoader = metadataLoader;
   }
 
@@ -77,7 +77,7 @@ final class MultiFileMetadataSourceImpl implements MetadataSource {
       if (!regionToMetadataMap.containsKey(regionCode)) {
         // The regionCode here will be valid and won't be '001', so we don't need to worry about
         // what to pass in for the country calling code.
-        loadMetadataFromFile(currentFilePrefix, regionCode, 0, metadataLoader);
+        loadMetadataFromFile(regionCode, 0);
       }
     }
     return regionToMetadataMap.get(regionCode);
@@ -87,16 +87,14 @@ final class MultiFileMetadataSourceImpl implements MetadataSource {
   public PhoneMetadata getMetadataForNonGeographicalRegion(int countryCallingCode) {
     synchronized (countryCodeToNonGeographicalMetadataMap) {
       if (!countryCodeToNonGeographicalMetadataMap.containsKey(countryCallingCode)) {
-        loadMetadataFromFile(currentFilePrefix, PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY,
-            countryCallingCode, metadataLoader);
+        loadMetadataFromFile(PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, countryCallingCode);
       }
     }
     return countryCodeToNonGeographicalMetadataMap.get(countryCallingCode);
   }
 
   // @VisibleForTesting
-  void loadMetadataFromFile(String filePrefix, String regionCode, int countryCallingCode,
-      MetadataLoader metadataLoader) {
+  void loadMetadataFromFile(String regionCode, int countryCallingCode) {
     boolean isNonGeoRegion = PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCode);
     String fileName = filePrefix + "_" +
         (isNonGeoRegion ? String.valueOf(countryCallingCode) : regionCode);
@@ -131,8 +129,7 @@ final class MultiFileMetadataSourceImpl implements MetadataSource {
 
   /**
    * 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).
+   * exceptions that occur while reading or closing the stream are ignored.
    *
    * @param source  the non-null stream from which metadata is to be read.
    * @return        the loaded metadata protocol buffer.

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

@@ -1639,10 +1639,12 @@ public class PhoneNumberUtil {
     } else {
       // Invalid region entered as country-calling-from (so no metadata was found for it) or the
       // region chosen has multiple international dialling prefixes.
-      logger.log(Level.WARNING,
-                 "Trying to format number from invalid region "
-                 + regionCallingFrom
-                 + ". International formatting applied.");
+      if (!isValidRegionCode(regionCallingFrom)) {
+        logger.log(Level.WARNING,
+                   "Trying to format number from invalid region "
+                   + regionCallingFrom
+                   + ". International formatting applied.");
+      }
       prefixNumberWithCountryCallingCode(countryCode,
                                          PhoneNumberFormat.INTERNATIONAL,
                                          formattedNumber);

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

@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.google.i18n.phonenumbers;
 
 import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
@@ -7,23 +23,21 @@ 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.List;
 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.
+ * Implementation of {@link MetadataSource} that reads from a single resource file.
  */
-public final class SingleFileMetadataSourceImpl implements MetadataSource {
+final class SingleFileMetadataSourceImpl implements MetadataSource {
 
   private static final Logger logger =
       Logger.getLogger(SingleFileMetadataSourceImpl.class.getName());
 
-  private static final String META_DATA_FILE =
+  private static final String META_DATA_FILE_NAME =
       "/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto";
 
   // A mapping from a region code to the PhoneMetadata for that region.
@@ -40,57 +54,95 @@ public final class SingleFileMetadataSourceImpl implements MetadataSource {
   private final Map<Integer, PhoneMetadata> countryCodeToNonGeographicalMetadataMap =
       Collections.synchronizedMap(new HashMap<Integer, PhoneMetadata>());
 
+  // The metadata file from which region data is loaded.
+  private final String fileName;
+
+  // The metadata loader used to inject alternative metadata sources.
+  private final MetadataLoader metadataLoader;
+
+  // It is assumed that metadataLoader is not null.
+  public SingleFileMetadataSourceImpl(String fileName, MetadataLoader metadataLoader) {
+    this.fileName = fileName;
+    this.metadataLoader = metadataLoader;
+  }
+
   // 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);
-      }
-    }
+    this(META_DATA_FILE_NAME, metadataLoader);
   }
 
   @Override
   public PhoneMetadata getMetadataForRegion(String regionCode) {
+    synchronized (regionToMetadataMap) {
+      if (!regionToMetadataMap.containsKey(regionCode)) {
+        // The regionCode here will be valid and won't be '001', so we don't need to worry about
+        // what to pass in for the country calling code.
+        loadMetadataFromFile();
+      }
+    }
     return regionToMetadataMap.get(regionCode);
   }
 
   @Override
   public PhoneMetadata getMetadataForNonGeographicalRegion(int countryCallingCode) {
+    synchronized (countryCodeToNonGeographicalMetadataMap) {
+      if (!countryCodeToNonGeographicalMetadataMap.containsKey(countryCallingCode)) {
+        loadMetadataFromFile();
+      }
+    }
     return countryCodeToNonGeographicalMetadataMap.get(countryCallingCode);
   }
 
+  // @VisibleForTesting
+  void loadMetadataFromFile() {
+    InputStream source = metadataLoader.loadMetadata(fileName);
+    if (source == null) {
+      logger.log(Level.SEVERE, "missing metadata: " + fileName);
+      throw new IllegalStateException("missing metadata: " + fileName);
+    }
+    ObjectInputStream in = null;
+    try {
+      in = new ObjectInputStream(source);
+      PhoneMetadataCollection metadataCollection = loadMetadataAndCloseInput(in);
+      List<PhoneMetadata> metadataList = metadataCollection.getMetadataList();
+      if (metadataList.isEmpty()) {
+        logger.log(Level.SEVERE, "empty metadata: " + fileName);
+        throw new IllegalStateException("empty metadata: " + fileName);
+      }
+      for (PhoneMetadata metadata : metadataList) {
+        String regionCode = metadata.getId();
+        int countryCallingCode = metadata.getCountryCode();
+        boolean isNonGeoRegion = PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCode);
+        if (isNonGeoRegion) {
+          countryCodeToNonGeographicalMetadataMap.put(countryCallingCode, metadata);
+        } else {
+          regionToMetadataMap.put(regionCode, metadata);
+        }
+      }
+    } catch (IOException e) {
+      logger.log(Level.SEVERE, "cannot load/parse metadata: " + fileName, e);
+      throw new RuntimeException("cannot load/parse metadata: " + fileName, e);
+    }
+  }
+
   /**
    * 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).
+   * exceptions that occur while reading or closing the stream are 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) {
+  private static PhoneMetadataCollection loadMetadataAndCloseInput(ObjectInputStream source) {
     PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection();
     try {
-      // Read in metadata for each region.
-      ObjectInputStream in = new ObjectInputStream(source);
-      metadataCollection.readExternal(in);
-      return metadataCollection;
+      metadataCollection.readExternal(source);
     } catch (IOException e) {
-      logger.log(Level.WARNING, e.toString());
+      logger.log(Level.WARNING, "error reading input (ignored)", e);
     } finally {
       try {
         source.close();
       } catch (IOException e) {
-        logger.log(Level.WARNING, e.toString());
+        logger.log(Level.WARNING, "error closing input stream (ignored)", e);
       }
     }
     return metadataCollection;