Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
* Created by leon on 5/10/17.
*/ // Checked Exception
public final class InvalidPhoneNumberFormatException extends Exception {


}
38 changes: 30 additions & 8 deletions src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
package com.zipcodewilmington.phone;

import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
import com.zipcodewilmington.tools.RandomNumberFactory;

import java.util.logging.Level;
import java.util.logging.Logger;

/**
* Created by leon on 5/1/17.
*/
public final class PhoneNumberFactory {
private static final Logger logger = Logger.getGlobal();
// private int areaCode;
// private int centralOfficeCode;
// private int phoneLineCode;

private PhoneNumberFactory() {
/** This constructor is private
Expand All @@ -19,15 +24,23 @@ private PhoneNumberFactory() {
* @param phoneNumberCount - number of PhoneNumber objects to instantiate
* @return array of randomly generated PhoneNumber objects
*/ //TODO - Implement logic
public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
return null;
public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) throws InvalidPhoneNumberFormatException{
PhoneNumber[] phoneNumbers= new PhoneNumber[phoneNumberCount];
for (int i = 0; i < phoneNumberCount; i++ ){
phoneNumbers[i] = createRandomPhoneNumber();
}
return phoneNumbers;
}

/**
* @return an instance of PhoneNumber with randomly generated phone number value
*/ //TODO - Implement logic
public static PhoneNumber createRandomPhoneNumber() {
return createPhoneNumberSafely(-1, -1, -1);
public static PhoneNumber createRandomPhoneNumber() throws InvalidPhoneNumberFormatException {
Integer areaCode = RandomNumberFactory.createInteger(100, 999);
Integer centralOfficeCode = RandomNumberFactory.createInteger(100, 999);
Integer phoneLineCode = RandomNumberFactory.createInteger(1000 ,9999);

return createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
}


Expand All @@ -37,16 +50,25 @@ public static PhoneNumber createRandomPhoneNumber() {
* @param phoneLineCode - 4 digit code
* @return a new phone number object
*/ //TODO - if input is valid, return respective PhoneNumber object, else return null
public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
return createPhoneNumber(null);
public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) throws InvalidPhoneNumberFormatException{
StringBuilder sb = new StringBuilder();
String correctPhoneFormat = sb.append("(").append(areaCode).append(")-").append(centralOfficeCode).append("-").append(phoneLineCode).toString();

try { return createPhoneNumber(correctPhoneFormat);}
catch (InvalidPhoneNumberFormatException e) {
logger.log(Level.INFO, String.format("%s, is not a valid phone number", correctPhoneFormat));
return null;
}
}

/**
* @param phoneNumberString - some String corresponding to a phone number whose format is `(###)-###-####`
* @return a new phone number object
* @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
*/ // TODO - Add throws statement to method signature
public static PhoneNumber createPhoneNumber(String phoneNumberString) {
return null;
public static PhoneNumber createPhoneNumber(String phoneNumberString) throws InvalidPhoneNumberFormatException {
PhoneNumber phoneNumber = new PhoneNumber(phoneNumberString);
logger.log(Level.INFO, String.format("Attempting to create a new PhoneNumber object with a value of %s", phoneNumber));
return phoneNumber;
}
}
10 changes: 5 additions & 5 deletions src/test/java/com/zipcodewilmington/PhoneNumberFactoryTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public void testInvalidPhoneNumberFormatException() throws InvalidPhoneNumberFor
}

@Test
public void testCreatePhoneNumberSafely() {
public void testCreatePhoneNumberSafely() throws InvalidPhoneNumberFormatException {
// : Given
int areaCode = 0;
int centralOfficeCode = 0;
Expand All @@ -35,7 +35,7 @@ public void testCreatePhoneNumberSafely() {
}

@Test
public void testGetAreaCode() {
public void testGetAreaCode() throws InvalidPhoneNumberFormatException {
// : Given
Integer areaCode = 302;
int centralOfficeCode = 312;
Expand All @@ -49,7 +49,7 @@ public void testGetAreaCode() {
}

@Test
public void testGetCentralOfficeCode() {
public void testGetCentralOfficeCode() throws InvalidPhoneNumberFormatException {
// : Given
int areaCode = 302;
Integer centralOfficeCode = 312;
Expand All @@ -64,7 +64,7 @@ public void testGetCentralOfficeCode() {


@Test
public void testPhoneLineCode() {
public void testPhoneLineCode() throws InvalidPhoneNumberFormatException {
// : Given
int areaCode = 302;
int centralOfficeCode = 312;
Expand All @@ -78,7 +78,7 @@ public void testPhoneLineCode() {
}

@Test
public void testCreateRandomPhoneNumber() {
public void testCreateRandomPhoneNumber() throws InvalidPhoneNumberFormatException {
for (int i = 0; i < 999; i++) {
// : Given
// : When
Expand Down