Garrett Completed Lab

src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java

@@ -1,6 +1,7 @@
 package com.zipcodewilmington.phone;
 
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
+import com.zipcodewilmington.tools.RandomNumberFactory;
 
 import java.util.logging.Logger;
 
@@ -20,14 +21,25 @@ public final class PhoneNumberFactory {
      * @return array of randomly generated PhoneNumber objects
      */ //TODO - Implement logic
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
-        return null;
+        PhoneNumber[] phoneNumbersArray = new PhoneNumber[phoneNumberCount];
+
+        for(int i =0; i <phoneNumberCount; i++){
+            phoneNumbersArray[i] = createRandomPhoneNumber();
+        }
+        return phoneNumbersArray;
+
     }
 
     /**
      * @return an instance of PhoneNumber with randomly generated phone number value
      */ //TODO - Implement logic
     public static PhoneNumber createRandomPhoneNumber() {
-        return createPhoneNumberSafely(-1, -1, -1);
+
+        int areaCode = RandomNumberFactory.createInteger(111,999);
+        int centralOfficeCode = RandomNumberFactory.createInteger(111,999);
+        int phoneLineCode = RandomNumberFactory.createInteger(111,999);
+
+        return createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
     }
 
 
@@ -38,15 +50,26 @@ public final class PhoneNumberFactory {
      * @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);
+        StringBuilder phoneNumberSafely = new StringBuilder();
+        phoneNumberSafely.append("(" + areaCode + ")" + "-" + centralOfficeCode + "-" + phoneLineCode);
+
+        try {
+            return createPhoneNumber(phoneNumberSafely.toString());
+        } catch (InvalidPhoneNumberFormatException IPFE) {
+            logger.warning("(" + areaCode + ")" + "-" + centralOfficeCode + "-" + phoneLineCode + "this is not a valid 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("Created a new Phone Number" + phoneNumberString);
+        return  new PhoneNumber(phoneNumberString);
     }
+
 }