Keith Brinker před 8 roky
rodič
revize
baafa01400

+ 1
- 0
src/main/java/com/zipcodewilmington/exceptions/InvalidPhoneNumberFormatException.java Zobrazit soubor

4
  * Created by leon on 5/10/17.
4
  * Created by leon on 5/10/17.
5
  */ // Checked Exception
5
  */ // Checked Exception
6
 public final class InvalidPhoneNumberFormatException extends Exception {
6
 public final class InvalidPhoneNumberFormatException extends Exception {
7
+
7
 }
8
 }

+ 30
- 5
src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java Zobrazit soubor

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[] phoneNumberArray = new PhoneNumber[phoneNumberCount];
25
+        for (int i = 0; i < phoneNumberCount; i++){
26
+            phoneNumberArray[i]=createRandomPhoneNumber();
27
+        }
28
+        return phoneNumberArray;
29
+
24
     }
30
     }
25
 
31
 
26
     /**
32
     /**
27
      * @return an instance of PhoneNumber with randomly generated phone number value
33
      * @return an instance of PhoneNumber with randomly generated phone number value
28
      */ //TODO - Implement logic
34
      */ //TODO - Implement logic
29
     public static PhoneNumber createRandomPhoneNumber() {
35
     public static PhoneNumber createRandomPhoneNumber() {
30
-        return createPhoneNumberSafely(-1, -1, -1);
36
+        int areaCode = RandomNumberFactory.createInteger(100, 999);
37
+        int centralOfficeCode = RandomNumberFactory.createInteger(100, 999);
38
+        int phoneLineCode = RandomNumberFactory.createInteger(1000, 9999);
39
+
40
+        return createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
31
     }
41
     }
32
 
42
 
33
 
43
 
44
+
45
+
46
+
47
+
34
     /**
48
     /**
35
      * @param areaCode          - 3 digit code
49
      * @param areaCode          - 3 digit code
36
      * @param centralOfficeCode - 3 digit code
50
      * @param centralOfficeCode - 3 digit code
38
      * @return a new phone number object
52
      * @return a new phone number object
39
      */ //TODO - if input is valid, return respective PhoneNumber object, else return null
53
      */ //TODO - if input is valid, return respective PhoneNumber object, else return null
40
     public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
54
     public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
41
-        return createPhoneNumber(null);
55
+        StringBuilder builder = new StringBuilder();
56
+        builder.append("("+areaCode +")"+ "-"+ centralOfficeCode + "-"+phoneLineCode);
57
+        String phoneNumberString = builder.toString();
58
+        try{
59
+            return createPhoneNumber(phoneNumberString);
60
+        }catch(InvalidPhoneNumberFormatException e){
61
+            logger.info(phoneNumberString + " is incorrect, please try again.");
62
+            return null;
63
+
64
+
65
+        }
66
+
42
     }
67
     }
43
 
68
 
44
     /**
69
     /**
46
      * @return a new phone number object
71
      * @return a new phone number object
47
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
72
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
48
      */ // TODO - Add throws statement to method signature
73
      */ // TODO - Add throws statement to method signature
49
-    public static PhoneNumber createPhoneNumber(String phoneNumberString) {
50
-        return null;
74
+    public static PhoneNumber createPhoneNumber(String phoneNumberString) throws InvalidPhoneNumberFormatException {
75
+        return new PhoneNumber(phoneNumberString);
51
     }
76
     }
52
 }
77
 }