Merge 2276655485d95c21be30d7732cebbbffec2a17c4 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,6 +1,7 @@
 package com.zipcodewilmington.phone;
 
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
+import com.zipcodewilmington.tools.RandomNumberFactory;
 
 import java.util.logging.Logger;
 
@@ -20,14 +21,24 @@ public final class PhoneNumberFactory {
      * @return array of randomly generated PhoneNumber objects
      */ //TODO - Implement logic
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
-        return null;
+        PhoneNumber[] phoneNumbs = new PhoneNumber[phoneNumberCount];
+
+        for(int i = 0; i < phoneNumbs.length; i++){
+            phoneNumbs[i] = createRandomPhoneNumber();
+        }
+        return phoneNumbs;
     }
 
     /**
      * @return an instance of PhoneNumber with randomly generated phone number value
      */ //TODO - Implement logic
     public static PhoneNumber createRandomPhoneNumber() {
-        return createPhoneNumberSafely(-1, -1, -1);
+
+        int areaCode = RandomNumberFactory.createInteger(100, 999);
+        int centralOfficeCode = RandomNumberFactory.createInteger(100, 999);
+        int phoneLineCode = RandomNumberFactory.createInteger(1000, 9999);
+
+        return createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
     }
 
 
@@ -38,7 +49,15 @@ 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);
+        StringBuilder phoneNumberFormat = new StringBuilder();
+        phoneNumberFormat.append("(" + areaCode + ")-" + centralOfficeCode + "-" + phoneLineCode);
+
+        try{
+            return createPhoneNumber(phoneNumberFormat.toString());
+        } catch (InvalidPhoneNumberFormatException IPFE){
+            logger.warning(areaCode + "-" + centralOfficeCode + "-" + phoneLineCode + " is not a valid number!");
+            return null;
+        }
     }
 
     /**
@@ -46,7 +65,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.info("Attempting to create a new PhoneNumber object with a value of " + phoneNumberString);
+        return new PhoneNumber(phoneNumberString);
     }
 }

src/main/java/com/zipcodewilmington/tools/RandomNumberFactory.java

@@ -11,11 +11,13 @@ public abstract class RandomNumberFactory {
 
     /** @return a random float between the specified min and max numeric range */
     public static Float createFloat(float min, float max) {
+
         return random.nextFloat() * (max - min) + min;
     }
 
     /** @return a random integer between the specified min and max numeric range */
     public static Integer createInteger(Integer min, Integer max) {
+
         return createFloat(min, max).intValue();
     }
 }