lab

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

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

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

@@ -16,26 +16,30 @@ public final class PhoneNumber {
     // non-default constructor is package-protected
     protected PhoneNumber(String phoneNumber) throws InvalidPhoneNumberFormatException {
         //validate phone number with format `(###)-###-####`
-        if (!phoneNumber.matches("\\(\\d{3}\\)-\\d{3}-\\d{4}")) {
-            throw new InvalidPhoneNumberFormatException();
-        }
-        this.phoneNumberString = phoneNumber;
+
+            if (!phoneNumber.matches("\\(\\d{3}\\)-\\d{3}-\\d{4}")) {
+                throw new InvalidPhoneNumberFormatException();
+            }
+            this.phoneNumberString = phoneNumber;
+
+
+
     }
 
-    public String getAreaCode() {
+    public String getAreaCode() throws InvalidPhoneNumberFormatException{
         return toString().substring(1, 4);
     }
 
-    public String getCentralOfficeCode() {
+    public String getCentralOfficeCode() throws InvalidPhoneNumberFormatException  {
         return toString().substring(6, 9);
     }
 
-    public String getPhoneLineCode() {
+    public String getPhoneLineCode() throws InvalidPhoneNumberFormatException{
         return toString().substring(10, 14);
 }
 
     @Override
-    public String toString() {
+    public String toString(){
         return phoneNumberString;
     }
 }

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

@@ -1,13 +1,17 @@
 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 +23,24 @@ 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[] phn = new PhoneNumber[phoneNumberCount];
+        for(int i = 0; i < phoneNumberCount; i++) {
+            phn[i] = createRandomPhoneNumber();
+        }
+        return phn;
     }
 
     /**
      * @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 =  RandomNumberFactory.createInteger(100,999);
+        int centralOfficeCode = RandomNumberFactory.createInteger(100,999);
+        int phoneLineCode = RandomNumberFactory.createInteger(1000,9999);
+        return createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
+
     }
 
 
@@ -37,8 +50,18 @@ 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 num = "(" + areaCode + ")" + centralOfficeCode + "-" + phoneLineCode;
+            return createPhoneNumber(num);
+
+        } catch (InvalidPhoneNumberFormatException e) {
+            logger.log(Level.INFO, "(" + areaCode + ")" + centralOfficeCode + "-" + phoneLineCode + " is not a valid phone number");
+
+            return null;
+        }
     }
 
     /**
@@ -46,7 +69,11 @@ 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);
+
+
     }
 }

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