BuildMetadata updates (#1726)

1) Changing the BuildMetadataFromXml to only set
same_mobile_and_fixed_line_pattern and
national_prefix_optional_when_formatting if they differ from default
values, and the domestic_carrier_code_formatting_rule,
international_prefix and national_prefix_formatting_rule if there is
one.

2) Adding a test with some golden data for the BuildMetadataJsonFromXml.

3) Adding to the proto a missing explicit default false.

4) Updating a couple of methods in the Phonemetadata.java class to have
names that match those of the auto-generated Phonemetadata used by the
CPP build, now that we use those methods when building the metadata.

5) Fix to ant build file to enable the junit command to still work (instructions on open-source on how to regenerate metadata files refer to this)

Resulting data is smaller for Java and C++ and the resulting BuildMetadataJsonFromXml code is cleaner.

java/build.xml

@@ -180,7 +180,7 @@
           depends="build-phone-metadata,build-short-metadata,build-alternate-metadata,build-carrier-data,build-geo-data,build-timezones-data">
     <mkdir dir="${classes.dir}"/>
     <javac srcdir="${libphonenumber.src.dir};${carrier.src.dir};${geocoder.src.dir};${prefixmapper.src.dir}"
-           destdir="${classes.dir}" classpathref="classpath" includeAntRuntime="false"/>
+           destdir="${classes.dir}" classpathref="classpath" includeAntRuntime="false" encoding="UTF-8"/>
     <javac srcdir="${libphonenumber.test.dir};${carrier.test.dir};${geocoder.test.dir};${prefixmapper.test.dir}"
            destdir="${classes.dir}" classpathref="classpath" debug="on"
            includeAntRuntime="false"/>

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

@@ -182,7 +182,7 @@ public class AsYouTypeFormatter {
     for (NumberFormat format : formatList) {
       if (!nationalPrefixIsUsedByCountry
           || isCompleteNumber
-          || format.isNationalPrefixOptionalWhenFormatting()
+          || format.getNationalPrefixOptionalWhenFormatting()
           || PhoneNumberUtil.formattingRuleHasFirstGroupOnly(
               format.getNationalPrefixFormattingRule())) {
         if (isFormatEligible(format.getFormat())) {

java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java

@@ -669,7 +669,7 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> {
     // To do this, we check that a national prefix formatting rule was present and that it wasn't
     // just the first-group symbol ($1) with punctuation.
     if ((formatRule != null) && formatRule.getNationalPrefixFormattingRule().length() > 0) {
-      if (formatRule.isNationalPrefixOptionalWhenFormatting()) {
+      if (formatRule.getNationalPrefixOptionalWhenFormatting()) {
         // The national-prefix is optional in these cases, so we don't need to check if it was
         // present.
         return true;

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

@@ -2190,7 +2190,7 @@ public class PhoneNumberUtil {
 
     boolean isFixedLine = isNumberMatchingDesc(nationalNumber, metadata.getFixedLine());
     if (isFixedLine) {
-      if (metadata.isSameMobileAndFixedLinePattern()) {
+      if (metadata.getSameMobileAndFixedLinePattern()) {
         return PhoneNumberType.FIXED_LINE_OR_MOBILE;
       } else if (isNumberMatchingDesc(nationalNumber, metadata.getMobile())) {
         return PhoneNumberType.FIXED_LINE_OR_MOBILE;
@@ -2199,7 +2199,7 @@ public class PhoneNumberUtil {
     }
     // Otherwise, test to see if the number is mobile. Only do this if certain that the patterns for
     // mobile and fixed line aren't the same.
-    if (!metadata.isSameMobileAndFixedLinePattern()
+    if (!metadata.getSameMobileAndFixedLinePattern()
         && isNumberMatchingDesc(nationalNumber, metadata.getMobile())) {
       return PhoneNumberType.MOBILE;
     }

java/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java

@@ -65,7 +65,7 @@ public final class Phonemetadata {
           setDomesticCarrierCodeFormattingRule(other.getDomesticCarrierCodeFormattingRule());
         }
         if (other.hasNationalPrefixOptionalWhenFormatting()) {
-          setNationalPrefixOptionalWhenFormatting(other.isNationalPrefixOptionalWhenFormatting());
+          setNationalPrefixOptionalWhenFormatting(other.getNationalPrefixOptionalWhenFormatting());
         }
         return this;
       }
@@ -130,12 +130,12 @@ public final class Phonemetadata {
       return this;
     }
 
-    // optional bool national_prefix_optional_when_formatting = 6;
+    // optional bool national_prefix_optional_when_formatting = 6 [default = false];
     private boolean hasNationalPrefixOptionalWhenFormatting;
     private boolean nationalPrefixOptionalWhenFormatting_ = false;
     public boolean hasNationalPrefixOptionalWhenFormatting() {
       return hasNationalPrefixOptionalWhenFormatting; }
-    public boolean isNationalPrefixOptionalWhenFormatting() {
+    public boolean getNationalPrefixOptionalWhenFormatting() {
       return nationalPrefixOptionalWhenFormatting_; }
     public NumberFormat setNationalPrefixOptionalWhenFormatting(boolean value) {
       hasNationalPrefixOptionalWhenFormatting = true;
@@ -731,7 +731,7 @@ public final class Phonemetadata {
     private boolean hasSameMobileAndFixedLinePattern;
     private boolean sameMobileAndFixedLinePattern_ = false;
     public boolean hasSameMobileAndFixedLinePattern() { return hasSameMobileAndFixedLinePattern; }
-    public boolean isSameMobileAndFixedLinePattern() { return sameMobileAndFixedLinePattern_; }
+    public boolean getSameMobileAndFixedLinePattern() { return sameMobileAndFixedLinePattern_; }
     public PhoneMetadata setSameMobileAndFixedLinePattern(boolean value) {
       hasSameMobileAndFixedLinePattern = true;
       sameMobileAndFixedLinePattern_ = value;