Completed Exceptions&Logging

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.Logger;
+import java.util.logging.Level;
 
 /**
  * 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,17 +21,23 @@ 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){
+
+         PhoneNumber[] phoneNumberArray = new PhoneNumber[phoneNumberCount];
+        return phoneNumberArray;
+
     }
 
     /**
      * @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 areaCode = createInteger(100,999);
+        int centralOfficeCode = createInteger(100, 999);
+        int phoneLineCode = createInteger(1000, 9999);
 
+        return createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
+    }
 
     /**
      * @param areaCode          - 3 digit code
@@ -37,8 +45,15 @@ 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 {
+            return createPhoneNumber("(" + areaCode + ")-" + centralOfficeCode + "-" + phoneLineCode);
+        }
+        catch (InvalidPhoneNumberFormatException e) {
+            logger.log(Level.WARNING,
+             areaCode + centralOfficeCode +phoneLineCode + "is not valid");
+            return null;
+        }
     }
 
     /**
@@ -46,7 +61,10 @@ 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 value of "+ phoneNumberString);
+        PhoneNumber newNum = new PhoneNumber(phoneNumberString);
+        return newNum;
+
     }
 }

src/test/java/com/zipcodewilmington/PhoneNumberFactoryTest.java

@@ -21,7 +21,7 @@ public class PhoneNumberFactoryTest {
     }
 
     @Test
-    public void testCreatePhoneNumberSafely() {
+    public void testCreatePhoneNumberSafely()  throws InvalidPhoneNumberFormatException{
         // : Given
         int areaCode = 0;
         int centralOfficeCode = 0;
@@ -35,7 +35,7 @@ public class PhoneNumberFactoryTest {
     }
 
     @Test
-    public void testGetAreaCode() {
+    public void testGetAreaCode()  throws InvalidPhoneNumberFormatException{
         // : Given
         Integer areaCode = 302;
         int centralOfficeCode = 312;
@@ -49,7 +49,7 @@ public class PhoneNumberFactoryTest {
     }
 
     @Test
-    public void testGetCentralOfficeCode() {
+    public void testGetCentralOfficeCode()  throws InvalidPhoneNumberFormatException{
         // : Given
         int areaCode = 302;
         Integer centralOfficeCode = 312;
@@ -64,7 +64,7 @@ public class PhoneNumberFactoryTest {
 
 
     @Test
-    public void testPhoneLineCode() {
+    public void testPhoneLineCode()  throws InvalidPhoneNumberFormatException{
         // : Given
         int areaCode = 302;
         int centralOfficeCode = 312;
@@ -78,7 +78,7 @@ public class PhoneNumberFactoryTest {
     }
 
     @Test
-    public void testCreateRandomPhoneNumber() {
+    public void testCreateRandomPhoneNumber() throws InvalidPhoneNumberFormatException {
         for (int i = 0; i < 999; i++) {
             // : Given
             // : When