Merge 63d6fcd7b37e2840e398fdc9c60f5395bce121d0 into 0665dd6f3de2bb92a7f856bde34efac87df0531f

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.Random;
 import java.util.logging.Logger;
 
 /**
@@ -20,14 +22,24 @@ public final class PhoneNumberFactory {
      * @return array of randomly generated PhoneNumber objects
      */ //TODO - Implement logic
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
-        return null;
+        PhoneNumber[] newPhoneNumbers = new PhoneNumber[phoneNumberCount];
+        for (int i =0; i <phoneNumberCount;i++){
+            createRandomPhoneNumber();
+        }
+        return newPhoneNumbers;
     }
 
     /**
      * @return an instance of PhoneNumber with randomly generated phone number value
      */ //TODO - Implement logic
     public static PhoneNumber createRandomPhoneNumber() {
-        return createPhoneNumberSafely(-1, -1, -1);
+       // return createPhoneNumberSafely(-1, -1, -1);
+        int newCodeNumber = RandomNumberFactory.createInteger(200,555);
+        int newCentralNum = RandomNumberFactory.createInteger(200,555);
+        int newLine = RandomNumberFactory.createInteger(2000,5555);
+        return createPhoneNumberSafely(newCodeNumber,newCentralNum,newLine);
+
+
     }
 
 
@@ -38,7 +50,14 @@ 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);
+        String newNumber = "("+ areaCode +")-" + centralOfficeCode + "-" + phoneLineCode;
+        try {
+            System.out.println(newNumber);
+            return createPhoneNumber(newNumber);
+        } catch(InvalidPhoneNumberFormatException){
+            return createPhoneNumber(null);
+        }
+
     }
 
     /**
@@ -47,6 +66,6 @@ public final class PhoneNumberFactory {
      * @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;
+        return new PhoneNumber(phoneNumberString);
     }
 }