#29 dmjpub

Offen
dmjpub möchte 1 Commits von dmjpub/CR-MicroLabs-ExceptionsAndLogging:master nach master zusammenführen
1 geänderte Dateien mit 20 neuen und 5 gelöschten Zeilen
  1. 20
    5
      src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java

+ 20
- 5
src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java Datei anzeigen

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
+import com.zipcodewilmington.tools.RandomNumberFactory;
4
 
5
 
5
 import java.util.logging.Logger;
6
 import java.util.logging.Logger;
6
 
7
 
20
      * @return array of randomly generated PhoneNumber objects
21
      * @return array of randomly generated PhoneNumber objects
21
      */ //TODO - Implement logic
22
      */ //TODO - Implement logic
22
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
23
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
23
-        return null;
24
+        PhoneNumber[] phoneBook = new PhoneNumber[phoneNumberCount];
25
+        for(int i = 1; i <= phoneNumberCount; i++) {
26
+            phoneBook[i-1] = createRandomPhoneNumber();
27
+        }
28
+        return phoneBook;
24
     }
29
     }
25
 
30
 
26
     /**
31
     /**
27
      * @return an instance of PhoneNumber with randomly generated phone number value
32
      * @return an instance of PhoneNumber with randomly generated phone number value
28
      */ //TODO - Implement logic
33
      */ //TODO - Implement logic
29
     public static PhoneNumber createRandomPhoneNumber() {
34
     public static PhoneNumber createRandomPhoneNumber() {
30
-        return createPhoneNumberSafely(-1, -1, -1);
35
+        int areaCd = RandomNumberFactory.createInteger(100,999);
36
+        int centralOCd = RandomNumberFactory.createInteger(100, 999);
37
+        int phoneLineCd = RandomNumberFactory.createInteger(100, 999);
38
+        return createPhoneNumberSafely(areaCd, centralOCd, phoneLineCd);
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 phoneNumberStr = "(" + areaCode + ")-" + centralOfficeCode + "-" + phoneLineCode;
50
+        try {return createPhoneNumber(phoneNumberStr);}
51
+        catch(InvalidPhoneNumberFormatException e) {
52
+            logger.info(phoneNumberStr + "is not a valid phone number");
53
+            return null;
54
+        }
42
     }
55
     }
43
 
56
 
44
     /**
57
     /**
46
      * @return a new phone number object
59
      * @return a new phone number object
47
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
60
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
48
      */ // TODO - Add throws statement to method signature
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 phoneNum = new PhoneNumber(phoneNumberString);
64
+        logger.info("Attempting to create a new PhoneNumber object with a value of " + phoneNumberString);
65
+        return phoneNum;
51
     }
66
     }
52
 }
67
 }