Merge 4b01f31dae035da96c41c6b7dd4ff37a10386906 into 0665dd6f3de2bb92a7f856bde34efac87df0531f

src/main/java/com/zipcodewilmington/exceptions/InvalidPhoneNumberFormatException.java

@@ -4,4 +4,5 @@ package com.zipcodewilmington.exceptions;
  * Created by leon on 5/10/17.
  */ // Checked Exception
 public final class InvalidPhoneNumberFormatException extends Exception {
+
 }

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,22 @@ public final class PhoneNumberFactory {
      * @return array of randomly generated PhoneNumber objects
      */ //TODO - Implement logic
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
-        return null;
+        PhoneNumber[] newNumbers = new PhoneNumber[phoneNumberCount];
+        for(int i = 0; i < phoneNumberCount; i++){
+             createRandomPhoneNumber();
+        }
+        return newNumbers;
     }
 
     /**
      * @return an instance of PhoneNumber with randomly generated phone number value
      */ //TODO - Implement logic
     public static PhoneNumber createRandomPhoneNumber() {
-        return createPhoneNumberSafely(-1, -1, -1);
+        int newCode = RandomNumberFactory.createInteger(100,999);
+        int newCentral = RandomNumberFactory.createInteger(100, 999);
+        int newLine = RandomNumberFactory.createInteger(1000, 9999);
+        return createPhoneNumberSafely(newCode, newCentral, newLine);
+
     }
 
 
@@ -38,7 +48,13 @@ 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 e){
+            return null;
+        }
     }
 
     /**
@@ -46,7 +62,7 @@ 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 {
+        return new PhoneNumber(phoneNumberString);
     }
 }