updated lab

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 extends RandomNumberFactory {
     private static final Logger logger = Logger.getGlobal();
 
     private PhoneNumberFactory() {
@@ -19,15 +21,22 @@ 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) throws InvalidPhoneNumberFormatException{
+        PhoneNumber[] arrayOfNumbers = new PhoneNumber[phoneNumberCount];
+        for (int i=0; i<phoneNumberCount; i++) {
+            arrayOfNumbers[i] = createRandomPhoneNumber();
+        }
+        return arrayOfNumbers;
     }
 
     /**
      * @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() throws InvalidPhoneNumberFormatException{
+        int x = createInteger(100, 999);
+        int y = createInteger(100, 999);
+        int z = createInteger(1000, 9999);
+        return createPhoneNumberSafely(x, y, z);
     }
 
 
@@ -37,8 +46,14 @@ 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) throws InvalidPhoneNumberFormatException{
+        try{
+        String number = "(" + areaCode + ")-" + centralOfficeCode + "-" + phoneLineCode;
+            return createPhoneNumber(number);
+        } catch (InvalidPhoneNumberFormatException e){
+            logger.log(Level.INFO,"("+areaCode+")-"+centralOfficeCode+"-"+phoneLineCode+ " is not a valid phone number");
+            return null;
+        }
     }
 
     /**
@@ -46,7 +61,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);
     }
 }