From 4e5966205bccb6efc2f7571f50ae888d1a7f2389 Mon Sep 17 00:00:00 2001 From: David Yonge-Mallo Date: Tue, 13 Oct 2015 11:48:13 +0200 Subject: [PATCH] eliminate unnecessary variables, slight refactoring --- .../phonenumbers/MultiFileMetadataSourceImpl.java | 10 ++++------ .../phonenumbers/SingleFileMetadataSourceImpl.java | 11 ++++------- .../i18n/phonenumbers/PhoneNumberUtilTest.java | 13 +++++++------ .../i18n/phonenumbers/BuildMetadataFromXml.java | 5 +++-- tools/java/cpp-build/pom.xml | 2 +- .../phonenumbers/BuildMetadataProtoFromXml.java | 8 ++++---- 6 files changed, 23 insertions(+), 26 deletions(-) diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java index e2d721404..77907493b 100644 --- a/java/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java +++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java @@ -18,7 +18,6 @@ package com.google.i18n.phonenumbers; 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.IOException; import java.io.InputStream; @@ -104,8 +103,8 @@ final class MultiFileMetadataSourceImpl implements MetadataSource { throw new IllegalStateException("missing metadata: " + fileName); } try { - ObjectInputStream in = new ObjectInputStream(source); - PhoneMetadataCollection metadataCollection = loadMetadataAndCloseInput(in); + PhoneMetadataCollection metadataCollection = + loadMetadataAndCloseInput(new ObjectInputStream(source)); PhoneMetadata[] metadataList = metadataCollection.metadata; if (metadataList.length == 0) { logger.log(Level.SEVERE, "empty metadata: " + fileName); @@ -140,9 +139,8 @@ final class MultiFileMetadataSourceImpl implements MetadataSource { PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection(); try { - CodedInputByteBufferNano byteBuffer = MetadataManager.convertStreamToByteBuffer(source, - MULTI_FILE_BUFFER_SIZE); - metadataCollection.mergeFrom(byteBuffer); + metadataCollection.mergeFrom( + MetadataManager.convertStreamToByteBuffer(source, MULTI_FILE_BUFFER_SIZE)); } catch (IOException e) { logger.log(Level.WARNING, "error reading input (ignored)", e); } finally { diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java index e20268f0e..b89c234de 100644 --- a/java/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java +++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java @@ -18,7 +18,6 @@ package com.google.i18n.phonenumbers; 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.IOException; import java.io.InputStream; @@ -101,10 +100,9 @@ final class SingleFileMetadataSourceImpl 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); + PhoneMetadataCollection metadataCollection = + loadMetadataAndCloseInput(new ObjectInputStream(source)); PhoneMetadata[] metadataList = metadataCollection.metadata; if (metadataList.length == 0) { logger.log(Level.SEVERE, "empty metadata: " + fileName); @@ -140,9 +138,8 @@ final class SingleFileMetadataSourceImpl implements MetadataSource { PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection(); try { - CodedInputByteBufferNano byteBuffer = MetadataManager.convertStreamToByteBuffer( - source, SINGLE_FILE_BUFFER_SIZE); - metadataCollection.mergeFrom(byteBuffer); + metadataCollection.mergeFrom( + MetadataManager.convertStreamToByteBuffer(source, SINGLE_FILE_BUFFER_SIZE)); } catch (IOException e) { logger.log(Level.WARNING, "error reading input (ignored)", e); } finally { diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java index 99945baf1..4f6bcaf56 100644 --- a/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java +++ b/java/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java @@ -132,6 +132,12 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertNull(phoneUtil.getMetadataForNonGeographicalRegion(-1)); } + private boolean exactlySame(PhoneNumberDesc first, PhoneNumberDesc second) { + return first.nationalNumberPattern.equals(second.nationalNumberPattern) && + first.possibleNumberPattern.equals(second.possibleNumberPattern) && + first.exampleNumber.equals(second.exampleNumber); + } + public void testGetInstanceLoadUSMetadata() { PhoneMetadata metadata = phoneUtil.getMetadataForRegion(RegionCode.US); assertEquals("US", metadata.id); @@ -145,12 +151,7 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertEquals("[13-689]\\d{9}|2[0-35-9]\\d{8}", metadata.generalDesc.nationalNumberPattern); assertEquals("\\d{7}(?:\\d{3})?", metadata.generalDesc.possibleNumberPattern); - assertTrue(metadata.generalDesc.nationalNumberPattern.equals( - metadata.fixedLine.nationalNumberPattern)); - assertTrue(metadata.generalDesc.possibleNumberPattern.equals( - metadata.fixedLine.possibleNumberPattern)); - assertTrue(metadata.generalDesc.exampleNumber.equals( - metadata.fixedLine.exampleNumber)); + assertTrue(exactlySame(metadata.generalDesc, metadata.fixedLine)); assertEquals("\\d{10}", metadata.tollFree.possibleNumberPattern); assertEquals("900\\d{7}", metadata.premiumRate.nationalNumberPattern); // No shared-cost data is available, so it should be initialised to "NA". diff --git a/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java b/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java index fdcaf7785..b0436b9f5 100644 --- a/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java +++ b/tools/java/common/src/com/google/i18n/phonenumbers/BuildMetadataFromXml.java @@ -141,7 +141,7 @@ public class BuildMetadataFromXml { } else { // For most countries, there will be only one region code for the country calling code. List listWithRegionCode = new ArrayList(1); - if (!regionCode.isEmpty()) { // For alternate formats, there are no region codes at all. + if (!regionCode.equals("")) { // For alternate formats, there are no region codes at all. listWithRegionCode.add(regionCode); } countryCodeToRegionCodeMap.put(countryCode, listWithRegionCode); @@ -261,7 +261,7 @@ public class BuildMetadataFromXml { hasExplicitIntlFormatDefined = true; } - if (!intlFormat.format.isEmpty()) { + if (!intlFormat.format.equals("")) { List formatList = new ArrayList(Arrays.asList(metadata.intlNumberFormat)); formatList.add(intlFormat); @@ -428,6 +428,7 @@ public class BuildMetadataFromXml { numberDesc.possibleNumberPattern = "NA"; return numberDesc; } + // TODO: Refactor into a utility class. if (!generalDesc.nationalNumberPattern.equals("")) { numberDesc.nationalNumberPattern = generalDesc.nationalNumberPattern; } diff --git a/tools/java/cpp-build/pom.xml b/tools/java/cpp-build/pom.xml index b5fae7cc4..e745fde71 100644 --- a/tools/java/cpp-build/pom.xml +++ b/tools/java/cpp-build/pom.xml @@ -42,7 +42,7 @@ - + ../common/src/ diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java index 0362edfbe..1ba35d683 100644 --- a/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java +++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java @@ -179,15 +179,15 @@ public class BuildMetadataProtoFromXml extends Command { if (regionCode.equals("001") || regionCode.isEmpty()) { regionCode = Integer.toString(metadata.countryCode); } - PhoneMetadataCollection singleCollection = new PhoneMetadataCollection(); - singleCollection.metadata = new PhoneMetadata[1]; - singleCollection.metadata[0] = metadata; + PhoneMetadataCollection outMetadataCollection = new PhoneMetadataCollection(); + outMetadataCollection.metadata = new PhoneMetadata[1]; + outMetadataCollection.metadata[0] = metadata; FileOutputStream outputForRegion = new FileOutputStream(filePrefix + "_" + regionCode); ObjectOutputStream out = new ObjectOutputStream(outputForRegion); byte[] outputArray = new byte[MULTI_FILE_BUFFER_SIZE]; CodedOutputByteBufferNano outputBufferNano = CodedOutputByteBufferNano.newInstance(outputArray); - singleCollection.writeTo(outputBufferNano); + outMetadataCollection.writeTo(outputBufferNano); out.write(outputArray, 0, outputBufferNano.position()); out.flush(); out.close();