#26 shakila3

Abierta
shakila3 desea fusionar 1 commits de shakila3/CR-MicroLabs-ExceptionsAndLogging:master en master

+ 21
- 6
src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java Ver fichero

@@ -1,6 +1,7 @@
1 1
 package com.zipcodewilmington.phone;
2 2
 
3 3
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
4
+import com.zipcodewilmington.tools.RandomNumberFactory;
4 5
 
5 6
 import java.util.logging.Logger;
6 7
 
@@ -20,14 +21,22 @@ public final class PhoneNumberFactory {
20 21
      * @return array of randomly generated PhoneNumber objects
21 22
      */ //TODO - Implement logic
22 23
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
23
-        return null;
24
+        PhoneNumber[] phoneBook = new PhoneNumber[phoneNumberCount];
25
+
26
+        for(int i = 1; i<= phoneNumberCount; i++){
27
+            phoneBook[i-1] = createRandomPhoneNumber();
28
+        }
29
+        return phoneBook;
24 30
     }
25 31
 
26 32
     /**
27 33
      * @return an instance of PhoneNumber with randomly generated phone number value
28 34
      */ //TODO - Implement logic
29 35
     public static PhoneNumber createRandomPhoneNumber() {
30
-        return createPhoneNumberSafely(-1, -1, -1);
36
+        int aC = RandomNumberFactory.createInteger(100, 999);
37
+        int cOc = RandomNumberFactory.createInteger(100, 999);
38
+        int pLc = RandomNumberFactory.createInteger(1000, 9999);
39
+        return createPhoneNumberSafely(aC, cOc, pLc);
31 40
     }
32 41
 
33 42
 
@@ -37,8 +46,12 @@ public final class PhoneNumberFactory {
37 46
      * @param phoneLineCode     - 4 digit code
38 47
      * @return a new phone number object
39 48
      */ //TODO - if input is valid, return respective PhoneNumber object, else return null
40
-    public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
41
-        return createPhoneNumber(null);
49
+    public static PhoneNumber createPhoneNumberSafely (int areaCode, int centralOfficeCode, int phoneLineCode) {
50
+        String number = ("("+ areaCode + ")-" + centralOfficeCode + "-" + phoneLineCode);
51
+        try{return createPhoneNumber(number);}
52
+        catch(InvalidPhoneNumberFormatException e){
53
+            logger.info(number + "is not a valid number");
54
+            return null;}
42 55
     }
43 56
 
44 57
     /**
@@ -46,7 +59,9 @@ public final class PhoneNumberFactory {
46 59
      * @return a new phone number object
47 60
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
48 61
      */ // TODO - Add throws statement to method signature
49
-    public static PhoneNumber createPhoneNumber(String phoneNumberString) {
50
-        return null;
62
+    public static PhoneNumber createPhoneNumber(String phoneNumberString) throws InvalidPhoneNumberFormatException {
63
+       PhoneNumber num;
64
+       logger.info("Attempting to create a new phone number object with a value of" + phoneNumberString);
65
+        return num = new PhoneNumber(phoneNumberString);
51 66
     }
52 67
 }