completed

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

@@ -1,13 +1,15 @@
 package com.zipcodewilmington.phone;
 
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
+import com.zipcodewilmington.tools.RandomNumberFactory;
 
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
  * Created by leon on 5/1/17.
  */
-public final class PhoneNumberFactory {
+public final class PhoneNumberFactory{
     private static final Logger logger = Logger.getGlobal();
 
     private PhoneNumberFactory() {
@@ -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[] array = new PhoneNumber[phoneNumberCount];
+        for(int i=0; i<phoneNumberCount; i++){
+            array[i]= createRandomPhoneNumber();
+        }
+        return array;
     }
 
     /**
      * @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,999);
+        Integer centralOfficeCode = RandomNumberFactory.createInteger(100,999);
+        Integer phoneLineCode = RandomNumberFactory.createInteger(1000,9999);
+
+        return createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
     }
 
 
@@ -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);
+
+        try {
+            return createPhoneNumber("("+ String.valueOf(areaCode) + ")-" + String.valueOf(centralOfficeCode) + "-" + String.valueOf(phoneLineCode));
+        } catch (InvalidPhoneNumberFormatException e) {
+            logger.log(Level.INFO,"("+ String.valueOf(areaCode) + ")-" + String.valueOf(centralOfficeCode) + "-" + String.valueOf(phoneLineCode)+" is not a valid phone number");
+            return null;
+        }
     }
 
     /**
@@ -46,7 +62,8 @@ 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.INFO,"Attempting to create a new PhoneNumber object with a value of "+ phoneNumberString);
+        return new PhoneNumber(phoneNumberString);
     }
 }