phonelib 0.5.4 → 0.5.5

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.30-SNAPSHOT</version>
+  <version>2.34-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.1.2-SNAPSHOT</version>
+    <version>7.2.4-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -42,12 +42,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.1.2-SNAPSHOT</version>
+      <version>7.2.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.30-SNAPSHOT</version>
+      <version>2.34-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.30-SNAPSHOT</version>
+  <version>2.34-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.1.2-SNAPSHOT</version>
+    <version>7.2.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.1.2-SNAPSHOT</version>
+      <version>7.2.4-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.protobuf</groupId>
+  <artifactId>protobuf-java</artifactId>
+  <version>2.6.1</version>
+  <description>POM was created from install:install-file</description>
+</project>

data/data/libphonenumber/java/lib/com/google/protobuf/protobuf-java/maven-metadata-local.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>com.google.protobuf</groupId>
+  <artifactId>protobuf-java</artifactId>
+  <versioning>
+    <release>2.6.1</release>
+    <versions>
+      <version>2.6.1</version>
+    </versions>
+    <lastUpdated>20151102180249</lastUpdated>
+  </versioning>
+</metadata>

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.1.2-SNAPSHOT</version>
+  <version>7.2.4-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.1.2-SNAPSHOT</version>
+    <version>7.2.4-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -30,20 +30,41 @@
     </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>**/SingleFileMetadataSourceImplTest.class</exclude>
-            <exclude>**/SingleFileMetadataSourceImplTest.java</exclude>
-            <exclude>**/SingleFilePhoneNumberMetadataProto</exclude>
-            <exclude>**/SingleFilePhoneNumberMetadataProtoForTesting</exclude>
+            <exclude>com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.class</exclude>
+            <exclude>com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto</exclude>
           </excludes>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.4.2</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
+  <repositories>
+    <repository>
+      <id>protobuf-java-lib</id>
+      <url>file://${project.basedir}/../lib</url>
+    </repository>
+  </repositories>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>2.6.1</version>
+    </dependency>
+  </dependencies>
+
 </project>

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

@@ -16,8 +16,8 @@
 
 package com.google.i18n.phonenumbers;
 
-import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat;
-import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
+import com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat;
+import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -61,8 +61,11 @@ public class AsYouTypeFormatter {
   // Character used when appropriate to separate a prefix, such as a long NDD or a country calling
   // code, from the national number.
   private static final char SEPARATOR_BEFORE_NATIONAL_NUMBER = ' ';
-  private static final PhoneMetadata EMPTY_METADATA =
-      new PhoneMetadata().setInternationalPrefix("NA");
+  private static final PhoneMetadata EMPTY_METADATA;
+  static {
+    EMPTY_METADATA = new PhoneMetadata();
+    EMPTY_METADATA.internationalPrefix = "NA";
+  }
   private PhoneMetadata defaultMetadata;
   private PhoneMetadata currentMetadata;
 
@@ -115,7 +118,7 @@ public class AsYouTypeFormatter {
   private StringBuilder nationalNumber = new StringBuilder();
   private List<NumberFormat> possibleFormats = new ArrayList<NumberFormat>();
 
-    // A cache for frequently used country-specific regular expressions.
+  // A cache for frequently used country-specific regular expressions.
   private RegexCache regexCache = new RegexCache(64);
 
   /**
@@ -151,7 +154,7 @@ public class AsYouTypeFormatter {
     Iterator<NumberFormat> it = possibleFormats.iterator();
     while (it.hasNext()) {
       NumberFormat numberFormat = it.next();
-      String pattern = numberFormat.getPattern();
+      String pattern = numberFormat.pattern;
       if (currentFormattingPattern.equals(pattern)) {
         return false;
       }
@@ -159,7 +162,7 @@ public class AsYouTypeFormatter {
         currentFormattingPattern = pattern;
         shouldAddSpaceAfterNationalPrefix =
             NATIONAL_PREFIX_SEPARATORS_PATTERN.matcher(
-                numberFormat.getNationalPrefixFormattingRule()).find();
+                numberFormat.nationalPrefixFormattingRule).find();
         // With a new formatting template, the matched position using the old template needs to be
         // reset.
         lastMatchPosition = 0;
@@ -173,17 +176,17 @@ public class AsYouTypeFormatter {
   }
 
   private void getAvailableFormats(String leadingDigits) {
-    List<NumberFormat> formatList =
-        (isCompleteNumber && currentMetadata.intlNumberFormatSize() > 0)
-        ? currentMetadata.intlNumberFormats()
-        : currentMetadata.numberFormats();
-    boolean nationalPrefixIsUsedByCountry = currentMetadata.hasNationalPrefix();
-    for (NumberFormat format : formatList) {
+    NumberFormat[] numberFormats =
+        (isCompleteNumber && currentMetadata.intlNumberFormat.length > 0)
+        ? currentMetadata.intlNumberFormat
+        : currentMetadata.numberFormat;
+    boolean nationalPrefixIsUsedByCountry = (!currentMetadata.nationalPrefix.equals(""));
+    for (NumberFormat format : numberFormats) {
       if (!nationalPrefixIsUsedByCountry || isCompleteNumber ||
-          format.isNationalPrefixOptionalWhenFormatting() ||
+          format.nationalPrefixOptionalWhenFormatting ||
           PhoneNumberUtil.formattingRuleHasFirstGroupOnly(
-              format.getNationalPrefixFormattingRule())) {
-        if (isFormatEligible(format.getFormat())) {
+              format.nationalPrefixFormattingRule)) {
+        if (isFormatEligible(format.format)) {
           possibleFormats.add(format);
         }
       }
@@ -200,14 +203,14 @@ public class AsYouTypeFormatter {
     Iterator<NumberFormat> it = possibleFormats.iterator();
     while (it.hasNext()) {
       NumberFormat format = it.next();
-      if (format.leadingDigitsPatternSize() == 0) {
+      if (format.leadingDigitsPattern.length == 0) {
         // Keep everything that isn't restricted by leading digits.
         continue;
       }
       int lastLeadingDigitsPattern =
-          Math.min(indexOfLeadingDigitsPattern, format.leadingDigitsPatternSize() - 1);
+          Math.min(indexOfLeadingDigitsPattern, format.leadingDigitsPattern.length - 1);
       Pattern leadingDigitsPattern = regexCache.getPatternForRegex(
-          format.getLeadingDigitsPattern(lastLeadingDigitsPattern));
+          format.leadingDigitsPattern[lastLeadingDigitsPattern]);
       Matcher m = leadingDigitsPattern.matcher(leadingDigits);
       if (!m.lookingAt()) {
         it.remove();
@@ -216,7 +219,7 @@ public class AsYouTypeFormatter {
   }
 
   private boolean createFormattingTemplate(NumberFormat format) {
-    String numberPattern = format.getPattern();
+    String numberPattern = format.pattern;
 
     // The formatter doesn't format numbers when numberPattern contains "|", e.g.
     // (20|3)\d{4}. In those cases we quickly return.
@@ -230,7 +233,7 @@ public class AsYouTypeFormatter {
     // Replace any standalone digit (not the one in d{}) with \d
     numberPattern = STANDALONE_DIGIT_PATTERN.matcher(numberPattern).replaceAll("\\\\d");
     formattingTemplate.setLength(0);
-    String tempTemplate = getFormattingTemplate(numberPattern, format.getFormat());
+    String tempTemplate = getFormattingTemplate(numberPattern, format.format);
     if (tempTemplate.length() > 0) {
       formattingTemplate.append(tempTemplate);
       return true;
@@ -428,12 +431,12 @@ public class AsYouTypeFormatter {
    */
   String attemptToFormatAccruedDigits() {
     for (NumberFormat numberFormat : possibleFormats) {
-      Matcher m = regexCache.getPatternForRegex(numberFormat.getPattern()).matcher(nationalNumber);
+      Matcher m = regexCache.getPatternForRegex(numberFormat.pattern).matcher(nationalNumber);
       if (m.matches()) {
         shouldAddSpaceAfterNationalPrefix =
             NATIONAL_PREFIX_SEPARATORS_PATTERN.matcher(
-                numberFormat.getNationalPrefixFormattingRule()).find();
-        String formattedNumber = m.replaceAll(numberFormat.getFormat());
+                numberFormat.nationalPrefixFormattingRule).find();
+        String formattedNumber = m.replaceAll(numberFormat.format);
         return appendNationalNumber(formattedNumber);
       }
     }
@@ -526,7 +529,7 @@ public class AsYouTypeFormatter {
     // that national significant numbers in NANPA always start with [2-9] after the national prefix.
     // Numbers beginning with 1[01] can only be short/emergency numbers, which don't need the
     // national prefix.
-    return (currentMetadata.getCountryCode() == 1) && (nationalNumber.charAt(0) == '1') &&
+    return (currentMetadata.countryCode == 1) && (nationalNumber.charAt(0) == '1') &&
            (nationalNumber.charAt(1) != '0') && (nationalNumber.charAt(1) != '1');
   }
 
@@ -537,9 +540,9 @@ public class AsYouTypeFormatter {
       startOfNationalNumber = 1;
       prefixBeforeNationalNumber.append('1').append(SEPARATOR_BEFORE_NATIONAL_NUMBER);
       isCompleteNumber = true;
-    } else if (currentMetadata.hasNationalPrefixForParsing()) {
+    } else if (!currentMetadata.nationalPrefixForParsing.equals("")) {
       Pattern nationalPrefixForParsing =
-          regexCache.getPatternForRegex(currentMetadata.getNationalPrefixForParsing());
+          regexCache.getPatternForRegex(currentMetadata.nationalPrefixForParsing);
       Matcher m = nationalPrefixForParsing.matcher(nationalNumber);
       // Since some national prefix patterns are entirely optional, check that a national prefix
       // could actually be extracted.
@@ -567,7 +570,7 @@ public class AsYouTypeFormatter {
   private boolean attemptToExtractIdd() {
     Pattern internationalPrefix =
         regexCache.getPatternForRegex("\\" + PhoneNumberUtil.PLUS_SIGN + "|" +
-            currentMetadata.getInternationalPrefix());
+            currentMetadata.internationalPrefix);
     Matcher iddMatcher = internationalPrefix.matcher(accruedInputWithoutFormatting);
     if (iddMatcher.lookingAt()) {
       isCompleteNumber = true;

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

@@ -16,16 +16,16 @@
 
 package com.google.i18n.phonenumbers;
 
-import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
-import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection;
+import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata;
+import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadataCollection;
+import com.google.protobuf.nano.CodedInputByteBufferNano;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
@@ -71,16 +71,35 @@ class MetadataManager {
     }
   }
 
+  // The size of the byte buffer used for deserializing the alternate formats and short number
+  // metadata files for each region.
+  private static final int BUFFER_SIZE = 16 * 1024;
+
+  static CodedInputByteBufferNano convertStreamToByteBuffer(ObjectInputStream in, int bufferSize)
+      throws IOException {
+    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+    int nRead;
+    byte[] data = new byte[bufferSize];
+
+    while ((nRead = in.read(data, 0, bufferSize)) != -1) {
+      outputStream.write(data, 0, nRead);
+    }
+
+    outputStream.flush();
+    return CodedInputByteBufferNano.newInstance(outputStream.toByteArray());
+  }
+
   private static void loadAlternateFormatsMetadataFromFile(int countryCallingCode) {
     InputStream source = PhoneNumberMatcher.class.getResourceAsStream(
         ALTERNATE_FORMATS_FILE_PREFIX + "_" + countryCallingCode);
     ObjectInputStream in = null;
     try {
       in = new ObjectInputStream(source);
+      CodedInputByteBufferNano byteBuffer = convertStreamToByteBuffer(in, BUFFER_SIZE);
       PhoneMetadataCollection alternateFormats = new PhoneMetadataCollection();
-      alternateFormats.readExternal(in);
-      for (PhoneMetadata metadata : alternateFormats.getMetadataList()) {
-        callingCodeToAlternateFormatsMap.put(metadata.getCountryCode(), metadata);
+      alternateFormats.mergeFrom(byteBuffer);
+      for (PhoneMetadata metadata : alternateFormats.metadata) {
+        callingCodeToAlternateFormatsMap.put(metadata.countryCode, metadata);
       }
     } catch (IOException e) {
       LOGGER.log(Level.WARNING, e.toString());
@@ -107,9 +126,10 @@ class MetadataManager {
     ObjectInputStream in = null;
     try {
       in = new ObjectInputStream(source);
+      CodedInputByteBufferNano byteBuffer = convertStreamToByteBuffer(in, BUFFER_SIZE);
       PhoneMetadataCollection shortNumberMetadata = new PhoneMetadataCollection();
-      shortNumberMetadata.readExternal(in);
-      for (PhoneMetadata metadata : shortNumberMetadata.getMetadataList()) {
+      shortNumberMetadata.mergeFrom(byteBuffer);
+      for (PhoneMetadata metadata : shortNumberMetadata.metadata) {
         regionCodeToShortNumberMetadataMap.put(regionCode, metadata);
       }
     } catch (IOException e) {

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

@@ -16,7 +16,7 @@
 
 package com.google.i18n.phonenumbers;
 
-import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
+import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata;
 
 /**
  * A source for phone metadata for all regions.

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

@@ -16,15 +16,14 @@
 
 package com.google.i18n.phonenumbers;
 
-import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata;
-import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection;
+import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata;
+import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadataCollection;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -103,19 +102,18 @@ final class MultiFileMetadataSourceImpl implements MetadataSource {
       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()) {
+      PhoneMetadataCollection metadataCollection =
+          loadMetadataAndCloseInput(new ObjectInputStream(source));
+      PhoneMetadata[] metadataList = metadataCollection.metadata;
+      if (metadataList.length == 0) {
         logger.log(Level.SEVERE, "empty metadata: " + fileName);
         throw new IllegalStateException("empty metadata: " + fileName);
       }
-      if (metadataList.size() > 1) {
+      if (metadataList.length > 1) {
         logger.log(Level.WARNING, "invalid metadata (too many entries): " + fileName);
       }
-      PhoneMetadata metadata = metadataList.get(0);
+      PhoneMetadata metadata = metadataList[0];
       if (isNonGeoRegion) {
         countryCodeToNonGeographicalMetadataMap.put(countryCallingCode, metadata);
       } else {
@@ -135,9 +133,14 @@ final class MultiFileMetadataSourceImpl implements MetadataSource {
    * @return        the loaded metadata protocol buffer.
    */
   private static PhoneMetadataCollection loadMetadataAndCloseInput(ObjectInputStream source) {
+    // The size of the byte buffer used for deserializing the phone number metadata files for each
+    // region.
+    final int MULTI_FILE_BUFFER_SIZE = 16 * 1024;
+
     PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection();
     try {
-      metadataCollection.readExternal(source);
+      metadataCollection.mergeFrom(
+          MetadataManager.convertStreamToByteBuffer(source, MULTI_FILE_BUFFER_SIZE));
     } catch (IOException e) {
       logger.log(Level.WARNING, "error reading input (ignored)", e);
     } finally {