diff options
104 files changed, 234 insertions, 275 deletions
diff --git a/README.android b/README.android index 9d37f381..e63f2788 100644 --- a/README.android +++ b/README.android @@ -1,4 +1,4 @@ URL: https://github.com/googlei18n/libphonenumber -Version: 7.2.1 +Version: 7.2.4 License: Apache 2 Description: Google Phone Number Library. @@ -118,6 +118,7 @@ </target> <target name="build-carrier-data"> + <delete dir="carrier/src/com/google/i18n/phonenumbers/carrier/data"/> <exec executable="java"> <arg value="-jar" /> <arg value="${build.tools.jar}"/> @@ -128,6 +129,7 @@ </target> <target name="build-carrier-test-data"> + <delete dir="carrier/test/com/google/i18n/phonenumbers/carrier/testing_data"/> <exec executable="java"> <arg value="-jar" /> <arg value="${build.tools.jar}"/> @@ -138,6 +140,7 @@ </target> <target name="build-geo-data"> + <delete dir="geocoder/src/com/google/i18n/phonenumbers/geocoding/data"/> <exec executable="java"> <arg value="-jar" /> <arg value="${build.tools.jar}"/> @@ -148,6 +151,7 @@ </target> <target name="build-geo-test-data"> + <delete dir="geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data"/> <exec executable="java"> <arg value="-jar" /> <arg value="${build.tools.jar}"/> diff --git a/carrier/pom.xml b/carrier/pom.xml index 865ec157..471db0ac 100644 --- a/carrier/pom.xml +++ b/carrier/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.21</version> + <version>1.25-SNAPSHOT</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.2.1</version> + <version>7.2.5-SNAPSHOT</version> </parent> <build> @@ -34,12 +34,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.2.1</version> + <version>7.2.5-SNAPSHOT</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.31</version> + <version>2.35-SNAPSHOT</version> </dependency> </dependencies> diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/216_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/216_en Binary files differindex 8a9ff74f..1246c7d1 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/216_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/216_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en Binary files differindex 64936f94..ac0d4acc 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en Binary files differindex 921dabdf..e315332b 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en Binary files differindex bb420ef8..cccdd8fa 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/251_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/251_en Binary files differindex eae71b89..c3f436b1 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/251_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/251_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en Binary files differindex 6a86a044..4d67c6c3 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/357_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/357_en Binary files differindex 83d3be73..1a7e1756 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/357_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/357_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en Binary files differindex 19e1ae65..fd4246e0 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/506_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/599_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/599_en Binary files differindex 6b7f0266..384e479d 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/599_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/599_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en Binary files differindex e3174c8b..c0255289 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en Binary files differindex 37b4156d..ae587dbf 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en Binary files differindex 05452615..4f79a8fa 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en Binary files differindex ad736ae3..3250d045 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en Binary files differindex 86520d96..078b3ffd 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en diff --git a/demo/pom.xml b/demo/pom.xml index 385690ff..4fbbf7b4 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -4,11 +4,11 @@ <parent> <artifactId>libphonenumber-parent</artifactId> <groupId>com.googlecode.libphonenumber</groupId> - <version>7.2.1</version> + <version>7.2.5-SNAPSHOT</version> </parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>demo</artifactId> - <version>7.2.1</version> + <version>7.2.5-SNAPSHOT</version> <properties> <gae.version>1.5.4</gae.version> @@ -41,19 +41,24 @@ <version>1.2</version> </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> + <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.2.1</version> + <version>7.2.5-SNAPSHOT</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.31</version> + <version>2.35-SNAPSHOT</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.21</version> + <version>1.25-SNAPSHOT</version> </dependency> </dependencies> diff --git a/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java b/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java index 4a329ba1..3b389d09 100644 --- a/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java +++ b/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java @@ -18,6 +18,9 @@ package com.google.phonenumbers; +import static java.nio.charset.StandardCharsets.UTF_8; +import static java.util.Locale.ENGLISH; + import com.google.i18n.phonenumbers.AsYouTypeFormatter; import com.google.i18n.phonenumbers.NumberParseException; import com.google.i18n.phonenumbers.PhoneNumberToCarrierMapper; @@ -26,6 +29,7 @@ import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberType; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; +import com.google.i18n.phonenumbers.ShortNumberInfo; import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder; import org.apache.commons.fileupload.FileItemIterator; @@ -34,9 +38,12 @@ import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.fileupload.util.Streams; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringEscapeUtils; import java.io.IOException; import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.Locale; import java.util.StringTokenizer; @@ -53,6 +60,7 @@ import javax.servlet.http.HttpServletResponse; @SuppressWarnings("serial") public class PhoneNumberParserServlet extends HttpServlet { private PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(); + private ShortNumberInfo shortInfo = ShortNumberInfo.getInstance(); public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { String phoneNumber = null; String defaultCountry = null; @@ -69,7 +77,7 @@ public class PhoneNumberParserServlet extends HttpServlet { if (item.isFormField()) { String fieldName = item.getFieldName(); if (fieldName.equals("phoneNumber")) { - phoneNumber = Streams.asString(in, "UTF-8"); + phoneNumber = Streams.asString(in, UTF_8.name()); } else if (fieldName.equals("defaultCountry")) { defaultCountry = Streams.asString(in).toUpperCase(); } else if (fieldName.equals("languageCode")) { @@ -93,31 +101,44 @@ public class PhoneNumberParserServlet extends HttpServlet { } StringBuilder output; + resp.setContentType("text/html"); + resp.setCharacterEncoding(UTF_8.name()); if (fileContents.length() == 0) { - output = getOutputForSingleNumber(phoneNumber, defaultCountry, languageCode, regionCode); - resp.setContentType("text/html"); - resp.setCharacterEncoding("UTF-8"); - resp.getWriter().println("<html><head>"); - resp.getWriter().println( - "<link type=\"text/css\" rel=\"stylesheet\" href=\"/stylesheets/main.css\" />"); - resp.getWriter().println("</head>"); - resp.getWriter().println("<body>"); - resp.getWriter().println("Phone Number entered: " + phoneNumber + "<br>"); - resp.getWriter().println("defaultCountry entered: " + defaultCountry + "<br>"); - resp.getWriter().println( - "Language entered: " + languageCode + - (regionCode.length() == 0 ? "" : " (" + regionCode + ")" + "<br>")); + // Redirect to a URL with the given input encoded in the query parameters. + Locale geocodingLocale = new Locale(languageCode, regionCode); + resp.sendRedirect(getPermaLinkURL(phoneNumber, defaultCountry, geocodingLocale, + false /* absoluteURL */)); + } else { + resp.getWriter().println(getOutputForFile(defaultCountry, fileContents)); + } + } + + /** + * Handle the get request to get information about a number based on query parameters. + */ + public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { + String phoneNumber = req.getParameter("number"); + if (phoneNumber == null) { + phoneNumber = ""; + } + String defaultCountry = req.getParameter("country"); + if (defaultCountry == null) { + defaultCountry = ""; + } + String geocodingParam = req.getParameter("geocodingLocale"); + Locale geocodingLocale; + if (geocodingParam == null) { + geocodingLocale = ENGLISH; // Default languageCode to English if nothing is entered. } else { - output = getOutputForFile(defaultCountry, fileContents); - resp.setContentType("text/html"); + geocodingLocale = Locale.forLanguageTag(geocodingParam); } - resp.getWriter().println(output); - resp.getWriter().println("</body></html>"); + resp.getWriter().println( + getOutputForSingleNumber(phoneNumber, defaultCountry, geocodingLocale)); } private StringBuilder getOutputForFile(String defaultCountry, String fileContents) { - StringBuilder output = new StringBuilder(); - output.append("<HTML><HEAD><TITLE>Results generated from phone numbers in the file provided:" + StringBuilder output = new StringBuilder( + "<HTML><HEAD><TITLE>Results generated from phone numbers in the file provided:" + "</TITLE></HEAD><BODY>"); output.append("<TABLE align=center border=1>"); output.append("<TH align=center>ID</TH>"); @@ -132,7 +153,8 @@ public class PhoneNumberParserServlet extends HttpServlet { phoneNumberId++; output.append("<TR>"); output.append("<TD align=center>").append(phoneNumberId).append(" </TD> \n"); - output.append("<TD align=center>").append(numberStr).append(" </TD> \n"); + output.append("<TD align=center>").append( + StringEscapeUtils.escapeHtml(numberStr)).append(" </TD> \n"); try { PhoneNumber number = phoneUtil.parseAndKeepRawInput(numberStr, defaultCountry); boolean isNumberValid = phoneUtil.isValidNumber(number); @@ -143,10 +165,13 @@ public class PhoneNumberParserServlet extends HttpServlet { ? phoneUtil.format(number, PhoneNumberFormat.INTERNATIONAL) : "invalid"; - output.append("<TD align=center>").append(prettyFormat).append(" </TD> \n"); - output.append("<TD align=center>").append(internationalFormat).append(" </TD> \n"); + output.append("<TD align=center>").append( + StringEscapeUtils.escapeHtml(prettyFormat)).append(" </TD> \n"); + output.append("<TD align=center>").append( + StringEscapeUtils.escapeHtml(internationalFormat)).append(" </TD> \n"); } catch (NumberParseException e) { - output.append("<TD align=center colspan=2>").append(e.toString()).append(" </TD> \n"); + output.append("<TD align=center colspan=2>").append( + StringEscapeUtils.escapeHtml(e.toString())).append(" </TD> \n"); } output.append("</TR>"); } @@ -162,13 +187,88 @@ public class PhoneNumberParserServlet extends HttpServlet { } /** - * The defaultCountry here is used for parsing phoneNumber. The languageCode and regionCode are - * used to specify the language used for displaying the area descriptions generated from phone - * number geocoding. + * Returns a stable URL pointing to the result page for the given input. + */ + private String getPermaLinkURL( + String phoneNumber, String defaultCountry, Locale geocodingLocale, boolean absoluteURL) { + // If absoluteURL is false, generate a relative path. Otherwise, produce an absolute URL. + StringBuilder permaLink = new StringBuilder( + absoluteURL ? "http://libphonenumber.appspot.com/phonenumberparser" : "/phonenumberparser"); + try { + permaLink.append("?number=" + URLEncoder.encode(phoneNumber, UTF_8.name())); + if (!defaultCountry.isEmpty()) { + permaLink.append("&country=" + URLEncoder.encode(defaultCountry, UTF_8.name())); + } + if (!geocodingLocale.getLanguage().equals(ENGLISH.getLanguage()) || + !geocodingLocale.getCountry().isEmpty()) { + permaLink.append("&geocodingLocale=" + + URLEncoder.encode(geocodingLocale.toLanguageTag(), UTF_8.name())); + } + } catch(UnsupportedEncodingException e) { + // UTF-8 is guaranteed in Java, so this should be impossible. + throw new AssertionError(e); + } + return permaLink.toString(); + } + + /** + * Returns a link to create a new github issue with the relevant information. + */ + private String getNewIssueLink( + String phoneNumber, String defaultCountry, Locale geocodingLocale) { + boolean hasDefaultCountry = !defaultCountry.isEmpty() && defaultCountry != "ZZ"; + String issueTitle = "Validation issue with " + phoneNumber + + (hasDefaultCountry ? " (" + defaultCountry + ")" : ""); + + // Issue template. This must be kept in sync with the template in + // https://github.com/googlei18n/libphonenumber/blob/master/CONTRIBUTING.md. + StringBuilder issueTemplate = new StringBuilder( + "Please read the \"guidelines for contributing\" (linked above) and fill " + + "in the template below.\n\n"); + issueTemplate.append("Country/region affected (e.g., \"US\"): ") + .append(defaultCountry).append("\n\n"); + issueTemplate.append("Example number(s) affected (\"+1 555 555-1234\"): ") + .append(phoneNumber).append("\n\n"); + issueTemplate.append( + "The phone number range(s) to which the issue applies (\"+1 555 555-XXXX\"): \n\n"); + issueTemplate.append( + "The type of the number(s) (\"fixed-line\", \"mobile\", \"short code\", etc.): \n\n"); + issueTemplate.append( + "The cost, if applicable (\"toll-free\", \"premium rate\", \"shared cost\"): \n\n"); + issueTemplate.append( + "Supporting evidence (for example, national numbering plan, announcement from mobile " + + "carrier, news article): **IMPORTANT - anything posted here is made public. " + + "Read the guidelines first!** \n\n"); + issueTemplate.append("[link to demo](" + + getPermaLinkURL(phoneNumber, defaultCountry, geocodingLocale, true /* absoluteURL */) + + ")\n\n"); + String newIssueLink = "https://github.com/googlei18n/libphonenumber/issues/new?title="; + try { + newIssueLink += URLEncoder.encode(issueTitle, UTF_8.name()) + "&body=" + + URLEncoder.encode(issueTemplate.toString(), UTF_8.name()); + } catch(UnsupportedEncodingException e) { + // UTF-8 is guaranteed in Java, so this should be impossible. + throw new AssertionError(e); + } + return newIssueLink; + } + + /** + * The defaultCountry here is used for parsing phoneNumber. The geocodingLocale is used to specify + * the language used for displaying the area descriptions generated from phone number geocoding. */ private StringBuilder getOutputForSingleNumber( - String phoneNumber, String defaultCountry, String languageCode, String regionCode) { - StringBuilder output = new StringBuilder(); + String phoneNumber, String defaultCountry, Locale geocodingLocale) { + StringBuilder output = new StringBuilder("<HTML><HEAD>"); + output.append( + "<LINK type=\"text/css\" rel=\"stylesheet\" href=\"/stylesheets/main.css\" />"); + output.append("</HEAD>"); + output.append("<BODY>"); + output.append("Phone Number entered: " + StringEscapeUtils.escapeHtml(phoneNumber) + "<BR>"); + output.append("defaultCountry entered: " + StringEscapeUtils.escapeHtml(defaultCountry) + + "<BR>"); + output.append("Language entered: " + + StringEscapeUtils.escapeHtml(geocodingLocale.toLanguageTag()) + "<BR>"); try { PhoneNumber number = phoneUtil.parseAndKeepRawInput(phoneNumber, defaultCountry); output.append("<DIV>"); @@ -187,6 +287,7 @@ public class PhoneNumberParserServlet extends HttpServlet { boolean isPossible = phoneUtil.isPossibleNumber(number); boolean isNumberValid = phoneUtil.isValidNumber(number); PhoneNumberType numberType = phoneUtil.getNumberType(number); + boolean hasDefaultCountry = !defaultCountry.isEmpty() && defaultCountry != "ZZ"; output.append("<DIV>"); output.append("<TABLE border=1>"); @@ -200,7 +301,7 @@ public class PhoneNumberParserServlet extends HttpServlet { } else { appendLine("Result from isValidNumber()", Boolean.toString(isNumberValid), output); if (isNumberValid) { - if (!defaultCountry.isEmpty() && defaultCountry != "ZZ") { + if (hasDefaultCountry) { appendLine( "Result from isValidNumberForRegion()", Boolean.toString(phoneUtil.isValidNumberForRegion(number, defaultCountry)), @@ -214,6 +315,32 @@ public class PhoneNumberParserServlet extends HttpServlet { output.append("</TABLE>"); output.append("</DIV>"); + if (!isNumberValid) { + output.append("<DIV>"); + output.append("<TABLE border=1>"); + output.append("<TR><TD colspan=2>Short Number Results</TD></TR>"); + boolean isPossibleShort = shortInfo.isPossibleShortNumber(number); + appendLine("Result from isPossibleShortNumber()", + Boolean.toString(isPossibleShort), output); + if (isPossibleShort) { + appendLine("Result from isValidShortNumber()", + Boolean.toString(shortInfo.isValidShortNumber(number)), output); + if (hasDefaultCountry) { + boolean isPossibleShortForRegion = + shortInfo.isPossibleShortNumberForRegion(number, defaultCountry); + appendLine("Result from isPossibleShortNumberForRegion()", + Boolean.toString(isPossibleShortForRegion), output); + if (isPossibleShortForRegion) { + appendLine("Result from isValidShortNumberForRegion()", + Boolean.toString(shortInfo.isValidShortNumberForRegion(number, + defaultCountry)), output); + } + } + } + output.append("</TABLE>"); + output.append("</DIV>"); + } + output.append("<DIV>"); output.append("<TABLE border=1>"); output.append("<TR><TD colspan=2>Formatting Results</TD></TR>"); @@ -260,7 +387,7 @@ public class PhoneNumberParserServlet extends HttpServlet { appendLine( "Location", PhoneNumberOfflineGeocoder.getInstance().getDescriptionForNumber( - number, new Locale(languageCode, regionCode)), + number, geocodingLocale), output); output.append("</TABLE>"); output.append("</DIV>"); @@ -283,16 +410,24 @@ public class PhoneNumberParserServlet extends HttpServlet { output.append("<TR><TD colspan=2>PhoneNumberToCarrierMapper Results</TD></TR>"); appendLine( "Carrier", - PhoneNumberToCarrierMapper.getInstance().getNameForNumber( - number, new Locale(languageCode, regionCode)), + PhoneNumberToCarrierMapper.getInstance().getNameForNumber(number, geocodingLocale), output); output.append("</TABLE>"); output.append("</DIV>"); } } + + String newIssueLink = getNewIssueLink(phoneNumber, defaultCountry, geocodingLocale); + String guidelinesLink = + "https://github.com/googlei18n/libphonenumber/blob/master/CONTRIBUTING.md"; + output.append("<b style=\"color:red\">File an issue</b>: by clicking on " + + "<a target=\"_blank\" href=\"" + newIssueLink + "\">this link</a>, I confirm that I " + + "have read the <a target=\"_blank\" href=\"" + guidelinesLink + + "\">contributor's guidelines</a>."); } catch (NumberParseException e) { - output.append(e.toString()); + output.append(StringEscapeUtils.escapeHtml(e.toString())); } + output.append("</BODY></HTML>"); return output; } } diff --git a/demo/war/WEB-INF/lib/commons-lang-2.6.jar b/demo/war/WEB-INF/lib/commons-lang-2.6.jar Binary files differnew file mode 100644 index 00000000..98467d3a --- /dev/null +++ b/demo/war/WEB-INF/lib/commons-lang-2.6.jar diff --git a/geocoder/pom.xml b/geocoder/pom.xml index 4c2bb81b..806a2de5 100644 --- a/geocoder/pom.xml +++ b/geocoder/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.31</version> + <version>2.35-SNAPSHOT</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.2.1</version> + <version>7.2.5-SNAPSHOT</version> </parent> <build> @@ -42,12 +42,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.2.1</version> + <version>7.2.5-SNAPSHOT</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.31</version> + <version>2.35-SNAPSHOT</version> </dependency> </dependencies> diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1726_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1726_en Binary files differdeleted file mode 100644 index cb81e2d6..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1726_en +++ /dev/null diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1730_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1730_en Binary files differdeleted file mode 100644 index a2db58d4..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1730_en +++ /dev/null diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1825_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1825_en Binary files differnew file mode 100644 index 00000000..a6c004d2 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1825_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1838_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1838_en Binary files differdeleted file mode 100644 index ff902cef..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1838_en +++ /dev/null diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1851_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1851_en Binary files differdeleted file mode 100644 index 8523ef39..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1851_en +++ /dev/null diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1888_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1888_en Binary files differdeleted file mode 100644 index 47068cb6..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1888_en +++ /dev/null diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_fr Binary files differdeleted file mode 100644 index e290e50a..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/225_fr +++ /dev/null diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_pt b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_pt Binary files differdeleted file mode 100644 index 092d85a4..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/238_pt +++ /dev/null diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/242_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/242_fr Binary files differdeleted file mode 100644 index 2ad2a1a1..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/242_fr +++ /dev/null diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/269_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/269_fr Binary files differdeleted file mode 100644 index bbc053b0..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/269_fr +++ /dev/null diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_pt b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_pt Binary files differdeleted file mode 100644 index 753576a8..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_pt +++ /dev/null diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/688_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/688_en Binary files differnew file mode 100644 index 00000000..29999917 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/688_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/95_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/95_en Binary files differnew file mode 100644 index 00000000..9e923d03 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/95_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config Binary files differindex 38e70e09..ea124799 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config diff --git a/internal/prefixmapper/pom.xml b/internal/prefixmapper/pom.xml index 1b38c31b..ea5037fd 100644 --- a/internal/prefixmapper/pom.xml +++ b/internal/prefixmapper/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.31</version> + <version>2.35-SNAPSHOT</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.2.1</version> + <version>7.2.5-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.2.1</version> + <version>7.2.5-SNAPSHOT</version> </dependency> </dependencies> diff --git a/libphonenumber/pom.xml b/libphonenumber/pom.xml index d25500e4..e7ac27cc 100644 --- a/libphonenumber/pom.xml +++ b/libphonenumber/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.2.1</version> + <version>7.2.5-SNAPSHOT</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.2.1</version> + <version>7.2.5-SNAPSHOT</version> </parent> <build> diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java deleted file mode 100644 index 5ea1a91f..00000000 --- a/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberUtil.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * 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. - * 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 java.util.Set; - -/* - * Utility for international short phone numbers, such as short codes and emergency numbers. Note - * most commercial short numbers are not handled here, but by the PhoneNumberUtil. - * - * @deprecated("As of release 5.8, replaced by ShortNumberInfo.") - * - * @author Shaopeng Jia - * @author David Yonge-Mallo - */ -@Deprecated public class ShortNumberUtil { - - /** - * Cost categories of short numbers. - */ - public enum ShortNumberCost { - TOLL_FREE, - STANDARD_RATE, - PREMIUM_RATE, - UNKNOWN_COST - } - - public ShortNumberUtil() { - } - - /** - * Convenience method to get a list of what regions the library has metadata for. - */ - public Set<String> getSupportedRegions() { - return ShortNumberInfo.getInstance().getSupportedRegions(); - } - - /** - * Returns true if the number might be used to connect to an emergency service in the given - * region. - * - * This method takes into account cases where the number might contain formatting, or might have - * additional digits appended (when it is okay to do that in the region specified). - * - * @param number the phone number to test - * @param regionCode the region where the phone number is being dialed - * @return if the number might be used to connect to an emergency service in the given region. - */ - public boolean connectsToEmergencyNumber(String number, String regionCode) { - return ShortNumberInfo.getInstance().connectsToEmergencyNumber(number, regionCode); - } - - /** - * Returns true if the number exactly matches an emergency service number in the given region. - * - * This method takes into account cases where the number might contain formatting, but doesn't - * allow additional digits to be appended. - * - * @param number the phone number to test - * @param regionCode the region where the phone number is being dialed - * @return if the number exactly matches an emergency services number in the given region. - */ - public boolean isEmergencyNumber(String number, String regionCode) { - return ShortNumberInfo.getInstance().isEmergencyNumber(number, regionCode); - } -} diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT Binary files differindex 3529c9dd..7b6813f8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU Binary files differindex e638ddf4..e87facdf 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD Binary files differindex b33a101e..81e9a79b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR Binary files differindex 0d5f37ac..9d1f45ce 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW Binary files differindex 308c30f8..d59df846 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA Binary files differindex c221c9a9..7f5fc1cd 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC Binary files differindex 07f53902..b4fc272f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI Binary files differindex e7861558..6c8e4efa 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK Binary files differindex eb37bb19..0a2c5e82 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR Binary files differindex f2739f32..06034b74 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW Binary files differindex 434e501d..96c787ac 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX Binary files differindex 32b40bb5..81e9a311 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY Binary files differindex 3a1bde24..8b1f9daa 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET Binary files differindex eb82d5a8..7809a79e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI Binary files differindex 54448916..0da76921 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM Binary files differindex 2e8d03a4..402e5e22 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN Binary files differindex db2d4832..b0f61db0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID Binary files differindex 55a869ba..a6f6d7cd 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN Binary files differindex 68b78c8f..16ce8055 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS Binary files differindex 30f58857..69c7840c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI Binary files differindex bc414465..afdd07c9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR Binary files differindex aea135bb..fbf6919a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM Binary files differindex 9e363b33..ce3c3a2a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA Binary files differindex dec787d8..f7c910f5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG Binary files differindex 86ca045a..0520cbab 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG Binary files differindex b9e65545..ca9dcbad 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI Binary files differindex bef5d0ed..1d2b9e73 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD Binary files differindex 7e03d087..546dd980 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM Binary files differindex 3daf5fa1..daa26251 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN Binary files differindex 70d4b1b6..4eece03c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV Binary files differindex c9771d03..36947304 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC Binary files differindex a72e5b00..ab00b231 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF Binary files differindex 79fea91c..15de7fed 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT Binary files differindex a1ba715d..304c1a29 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG Binary files differindex f5a4ab78..8b926fb8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY Binary files differindex 6af1615b..87f0f0a5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ Binary files differindex 40389847..6788fb64 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE Binary files differindex 3d1eab67..15b5a22b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK Binary files differindex 25596378..0c51ecec 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE Binary files differindex d864b0bf..cf858b78 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI Binary files differindex 60a01c38..ed0013ec 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR Binary files differindex 93e54254..781a5a22 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB Binary files differindex 317d0472..0567b725 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR Binary files differindex 8cc103d7..7e055f6a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR Binary files differindex e8f556a9..5fe20b66 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU Binary files differindex 945f08ea..26fb3321 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID Binary files differindex 44c6273a..b001a74b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE Binary files differindex 998b514e..b707978c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS Binary files differindex 9236e392..ff8b2147 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT Binary files differindex 3ac84c83..a6d5e6a8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR Binary files differindex 3fbdd5f6..ba9bce23 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT Binary files differindex ccbb9ec5..f24cd392 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU Binary files differindex f645a0b6..73dfe0c1 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV Binary files differindex 44dc3efb..55065ba8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT Binary files differindex da74fb9a..4c923cbb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL Binary files differindex 8f223384..b7c82f65 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL Binary files differindex 5428db80..3561642b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT Binary files differindex 9e15be79..cda1278c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO Binary files differindex eebf1650..24e8a54f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI Binary files differindex 10ec0c12..fa6214f8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK Binary files differindex 867bd367..a4cdcb57 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV Binary files differindex c02c4021..40e53103 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto b/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto Binary files differindex 63d701c3..330cc69e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java deleted file mode 100644 index f4787141..00000000 --- a/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberUtilTest.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * 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. - * 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 junit.framework.TestCase; - -/** - * Unit tests for ShortNumberUtil.java - * - * @author Shaopeng Jia - */ -public class ShortNumberUtilTest extends TestCase { - private ShortNumberUtil shortUtil; - - public ShortNumberUtilTest() { - shortUtil = new ShortNumberUtil(); - } - - public void testConnectsToEmergencyNumber_US() { - assertTrue(shortUtil.connectsToEmergencyNumber("911", RegionCode.US)); - assertTrue(shortUtil.connectsToEmergencyNumber("112", RegionCode.US)); - assertFalse(shortUtil.connectsToEmergencyNumber("999", RegionCode.US)); - } - - public void testConnectsToEmergencyNumberLongNumber_US() { - assertTrue(shortUtil.connectsToEmergencyNumber("9116666666", RegionCode.US)); - assertTrue(shortUtil.connectsToEmergencyNumber("1126666666", RegionCode.US)); - assertFalse(shortUtil.connectsToEmergencyNumber("9996666666", RegionCode.US)); - } - - public void testConnectsToEmergencyNumberWithFormatting_US() { - assertTrue(shortUtil.connectsToEmergencyNumber("9-1-1", RegionCode.US)); - assertTrue(shortUtil.connectsToEmergencyNumber("1-1-2", RegionCode.US)); - assertFalse(shortUtil.connectsToEmergencyNumber("9-9-9", RegionCode.US)); - } - - public void testConnectsToEmergencyNumberWithPlusSign_US() { - assertFalse(shortUtil.connectsToEmergencyNumber("+911", RegionCode.US)); - assertFalse(shortUtil.connectsToEmergencyNumber("\uFF0B911", RegionCode.US)); - assertFalse(shortUtil.connectsToEmergencyNumber(" +911", RegionCode.US)); - assertFalse(shortUtil.connectsToEmergencyNumber("+112", RegionCode.US)); - assertFalse(shortUtil.connectsToEmergencyNumber("+999", RegionCode.US)); - } - - public void testConnectsToEmergencyNumber_BR() { - assertTrue(shortUtil.connectsToEmergencyNumber("911", RegionCode.BR)); - assertTrue(shortUtil.connectsToEmergencyNumber("190", RegionCode.BR)); - assertFalse(shortUtil.connectsToEmergencyNumber("999", RegionCode.BR)); - } - - public void testConnectsToEmergencyNumberLongNumber_BR() { - // Brazilian emergency numbers don't work when additional digits are appended. - assertFalse(shortUtil.connectsToEmergencyNumber("9111", RegionCode.BR)); - assertFalse(shortUtil.connectsToEmergencyNumber("1900", RegionCode.BR)); - assertFalse(shortUtil.connectsToEmergencyNumber("9996", RegionCode.BR)); - } - - public void testConnectsToEmergencyNumber_AO() { - // Angola doesn't have any metadata for emergency numbers in the test metadata. - assertFalse(shortUtil.connectsToEmergencyNumber("911", RegionCode.AO)); - assertFalse(shortUtil.connectsToEmergencyNumber("222123456", RegionCode.AO)); - assertFalse(shortUtil.connectsToEmergencyNumber("923123456", RegionCode.AO)); - } - - public void testConnectsToEmergencyNumber_ZW() { - // Zimbabwe doesn't have any metadata in the test metadata. - assertFalse(shortUtil.connectsToEmergencyNumber("911", RegionCode.ZW)); - assertFalse(shortUtil.connectsToEmergencyNumber("01312345", RegionCode.ZW)); - assertFalse(shortUtil.connectsToEmergencyNumber("0711234567", RegionCode.ZW)); - } - - public void testIsEmergencyNumber_US() { - assertTrue(shortUtil.isEmergencyNumber("911", RegionCode.US)); - assertTrue(shortUtil.isEmergencyNumber("112", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("999", RegionCode.US)); - } - - public void testIsEmergencyNumberLongNumber_US() { - assertFalse(shortUtil.isEmergencyNumber("9116666666", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("1126666666", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("9996666666", RegionCode.US)); - } - - public void testIsEmergencyNumberWithFormatting_US() { - assertTrue(shortUtil.isEmergencyNumber("9-1-1", RegionCode.US)); - assertTrue(shortUtil.isEmergencyNumber("*911", RegionCode.US)); - assertTrue(shortUtil.isEmergencyNumber("1-1-2", RegionCode.US)); - assertTrue(shortUtil.isEmergencyNumber("*112", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("9-9-9", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("*999", RegionCode.US)); - } - - public void testIsEmergencyNumberWithPlusSign_US() { - assertFalse(shortUtil.isEmergencyNumber("+911", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("\uFF0B911", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber(" +911", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("+112", RegionCode.US)); - assertFalse(shortUtil.isEmergencyNumber("+999", RegionCode.US)); - } - - public void testIsEmergencyNumber_BR() { - assertTrue(shortUtil.isEmergencyNumber("911", RegionCode.BR)); - assertTrue(shortUtil.isEmergencyNumber("190", RegionCode.BR)); - assertFalse(shortUtil.isEmergencyNumber("999", RegionCode.BR)); - } - - public void testIsEmergencyNumberLongNumber_BR() { - assertFalse(shortUtil.isEmergencyNumber("9111", RegionCode.BR)); - assertFalse(shortUtil.isEmergencyNumber("1900", RegionCode.BR)); - assertFalse(shortUtil.isEmergencyNumber("9996", RegionCode.BR)); - } - - public void testIsEmergencyNumber_AO() { - // Angola doesn't have any metadata for emergency numbers in the test metadata. - assertFalse(shortUtil.isEmergencyNumber("911", RegionCode.AO)); - assertFalse(shortUtil.isEmergencyNumber("222123456", RegionCode.AO)); - assertFalse(shortUtil.isEmergencyNumber("923123456", RegionCode.AO)); - } - - public void testIsEmergencyNumber_ZW() { - // Zimbabwe doesn't have any metadata in the test metadata. - assertFalse(shortUtil.isEmergencyNumber("911", RegionCode.ZW)); - assertFalse(shortUtil.isEmergencyNumber("01312345", RegionCode.ZW)); - assertFalse(shortUtil.isEmergencyNumber("0711234567", RegionCode.ZW)); - } -} @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.2.1</version> + <version>7.2.5-SNAPSHOT</version> <packaging>pom</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> diff --git a/release_notes.txt b/release_notes.txt index 6310d2c4..158f41af 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,3 +1,37 @@ +Jan 28, 2016: libphonenumber-7.2.4 +Metadata changes: + - Updated phone metadata for region code(s): + BW, CA, CI, CK, GM, IN, NA, NG, PG, TD, TM + - Updated short number metadata for region code(s): PT + - New geocoding data for country calling code(s): 1825 (en) + - Updated carrier data for country calling code(s): + 91 (en), 225 (en), 234 (en), 235 (en), 675 (en), 993 (en) + +Jan 08, 2016: libphonenumber-7.2.3 +Metadata changes: + - Updated phone metadata for region code(s): + AU, BR, CC, CR, CW, CX, ET, HN, KR, SI, TV, WF + - Updated short number metadata for region code(s): FR, HR, HU, IT, KR, LV, TV + - New geocoding data for country calling code(s): 688 (en) + - Updated carrier data for country calling code(s): + 61 (en), 251 (en), 506 (en), 599 (en) + - Updated the demo: + added short number support; + added permalink; + added direct link to file an issue + - Removed deprecated ShortNumberUtil.java + +Dec 15, 2015: libphonenumber-7.2.2 +Metadata changes: + - Updated phone metadata for region code(s): + AT, BD, BR, CC, CX, CY, FI, ID, IS, KI, MM, TN, VC + - Updated short number metadata for region code(s): + AT, BG, CY, CZ, DE, DK, EE, FI, GB, GR, ID, IE, IS, LT, LU, MT, NL, PL, RO, + SI, SK + - New geocoding data for country calling code(s): 95 (en) + - Updated carrier data for country calling code(s): + 216 (en), 354 (en), 357 (en), 686 (en) + Nov 11, 2015: libphonenumber-7.2.1 Metadata changes: None Fix to 7.2.0 @@ -11,7 +45,8 @@ Metadata changes: - New carrier data for country calling code(s): 853 (en) - Updated carrier data for country calling code(s): 45 (en), 257 (en), 421 (en), 964 (en), 972 (en), 975 (en), 976 (en) -- Updated / refreshed time zone meta data. + - Updated / refreshed time zone meta data. + - Phonemetadata now generated as nanoproto Oct 29, 2015: libphonenumber-7.1.1 Metadata changes: |