Eric Foster 8 лет назад
Родитель
Сommit
0bf5de72f3
1 измененных файлов: 20 добавлений и 5 удалений
  1. 20
    5
      src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java

+ 20
- 5
src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java Просмотреть файл

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