Submitt

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

@@ -1,7 +1,9 @@
 package com.zipcodewilmington.phone;
 
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
+import com.zipcodewilmington.tools.RandomNumberFactory;
 
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -19,15 +21,30 @@ public final class 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)
+    {
+
+        PhoneNumber[] phArray = new PhoneNumber[phoneNumberCount-1];
+        for(int i =0;i < phoneNumberCount;i++)
+        {
+                phArray[i] = createRandomPhoneNumber();
+        }
+
+        return  phArray;
+
     }
 
     /**
      * @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()
+    {
+
+        int areaCode = RandomNumberFactory.createInteger(100,999);
+        int centralOfficeCode = RandomNumberFactory.createInteger(100,999);
+        int phoneLineCode = RandomNumberFactory.createInteger(1000,9999);
+        return  createPhoneNumberSafely(areaCode,centralOfficeCode,phoneLineCode);
+
     }
 
 
@@ -37,8 +54,23 @@ public final class PhoneNumberFactory {
      * @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)
+    {
+
+        String newNum = "(" + areaCode +")" + "-" + centralOfficeCode + "-"+ phoneLineCode;
+        PhoneNumber ph;
+        try
+        {
+             ph = new  PhoneNumber(newNum);
+        }
+        catch (InvalidPhoneNumberFormatException e)
+        {
+
+            return null;
+
+        }
+        return ph;
+
     }
 
     /**
@@ -46,7 +78,15 @@ public final class PhoneNumberFactory {
      * @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.log(Level.SEVERE,"Attempting to create a new PhoneNumber object with a value of %s",
+                phoneNumberString);
+
+
+        return new PhoneNumber(phoneNumberString);
     }
 }