#32 alizalang

Отворени
alizalang заяви обединяване на 1 ревизии от alizalang/CR-MicroLabs-ExceptionsAndLogging:master във master
променени са 1 файла, в които са добавени 21 реда и са изтрити 6 реда
  1. 21
    6
      src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java

+ 21
- 6
src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java Целия файл

1
 package com.zipcodewilmington.phone;
1
 package com.zipcodewilmington.phone;
2
 
2
 
3
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
3
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
4
-
4
+import com.zipcodewilmington.tools.RandomNumberFactory;
5
 import java.util.logging.Logger;
5
 import java.util.logging.Logger;
6
 
6
 
7
 /**
7
 /**
20
      * @return array of randomly generated PhoneNumber objects
20
      * @return array of randomly generated PhoneNumber objects
21
      */ //TODO - Implement logic
21
      */ //TODO - Implement logic
22
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
22
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
23
-        return null;
23
+        PhoneNumber[] phoneNumberArray = new PhoneNumber[phoneNumberCount];
24
+        for (int i = 0; i < phoneNumberCount; i++) {
25
+            phoneNumberArray[i] = createRandomPhoneNumber();
26
+        }
27
+        return phoneNumberArray;
24
     }
28
     }
25
 
29
 
26
     /**
30
     /**
27
      * @return an instance of PhoneNumber with randomly generated phone number value
31
      * @return an instance of PhoneNumber with randomly generated phone number value
28
      */ //TODO - Implement logic
32
      */ //TODO - Implement logic
29
     public static PhoneNumber createRandomPhoneNumber() {
33
     public static PhoneNumber createRandomPhoneNumber() {
30
-        return createPhoneNumberSafely(-1, -1, -1);
34
+      //  Random random = new Random();
35
+        int randomAreaCode = RandomNumberFactory.createInteger(100, 999);
36
+        int randomCentralOfficeCode = RandomNumberFactory.createInteger(100, 999);
37
+        int randomPhoneLineCode = RandomNumberFactory.createInteger(1000, 9999);
38
+        return createPhoneNumberSafely(randomAreaCode, randomCentralOfficeCode, randomPhoneLineCode);
31
     }
39
     }
32
 
40
 
33
 
41
 
38
      * @return a new phone number object
46
      * @return a new phone number object
39
      */ //TODO - if input is valid, return respective PhoneNumber object, else return null
47
      */ //TODO - if input is valid, return respective PhoneNumber object, else return null
40
     public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
48
     public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
41
-        return createPhoneNumber(null);
49
+        String str = "(" + areaCode + ")-" + centralOfficeCode + "-" + phoneLineCode;
50
+        try {
51
+            return createPhoneNumber(str);
52
+        } catch (InvalidPhoneNumberFormatException e) {
53
+            logger.warning(str+" is not a valid phone number");
54
+            return null;
55
+        }
42
     }
56
     }
43
 
57
 
44
     /**
58
     /**
46
      * @return a new phone number object
60
      * @return a new phone number object
47
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
61
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
48
      */ // TODO - Add throws statement to method signature
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
 }