John Kim il y a 8 ans
Parent
révision
22387a3456

+ 22
- 6
src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java Voir le fichier

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