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
4 changes: 1 addition & 3 deletions src/main/java/com/zipcodewilmington/phone/PhoneNumber.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ protected PhoneNumber(String phoneNumber) throws InvalidPhoneNumberFormatExcepti
this.phoneNumberString = phoneNumber;
}

public String getAreaCode() {
return toString().substring(1, 4);
}
public String getAreaCode() { return toString().substring(1, 4); }

public String getCentralOfficeCode() {
return toString().substring(6, 9);
Expand Down
44 changes: 33 additions & 11 deletions src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.zipcodewilmington.phone;

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

import java.util.logging.Logger;

Expand All @@ -11,42 +12,63 @@ public final class PhoneNumberFactory {
private static final Logger logger = Logger.getGlobal();

private PhoneNumberFactory() {
/** This constructor is private
* This class is uninstantiable */
/** This constructor is private
* This class is uninstantiable */

}

/**
* @param phoneNumberCount - number of PhoneNumber objects to instantiate
* @return array of randomly generated PhoneNumber objects
/**
* @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;
PhoneNumber[] phoneBook=new PhoneNumber[phoneNumberCount];
for(int i=0;i<phoneNumberCount;i++){
phoneBook[i]=createRandomPhoneNumber();
}
return phoneBook;
}

/**
* @return an instance of PhoneNumber with randomly generated phone number value
*/ //TODO - Implement logic
public static PhoneNumber createRandomPhoneNumber() {
return createPhoneNumberSafely(-1, -1, -1);
}


Integer areaCode = RandomNumberFactory.createInteger(100, 900);
Integer centralOfficeCode = RandomNumberFactory.createInteger(100, 900);
Integer phoneLineCode = RandomNumberFactory.createInteger(1000, 9999);
return createPhoneNumberSafely(areaCode,centralOfficeCode,phoneLineCode);
}

/**
* @param areaCode - 3 digit code
* @param centralOfficeCode - 3 digit code
* @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);
String s=String.format("(%d)-%d-%d",areaCode,centralOfficeCode,phoneLineCode);
try{

return createPhoneNumber(s);}
catch (InvalidPhoneNumberFormatException e) {
e.printStackTrace();
logger.info(s+"is not a valid phone number");
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
{logger.info("Attempting to create a new PhoneNumber object with a value of " + phoneNumberString);
return new PhoneNumber(phoneNumberString);

}
}