|
|
@@ -20,14 +20,23 @@ 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[] phoneNum = new PhoneNumber[phoneNumberCount];
|
|
|
24
|
+
|
|
|
25
|
+ for(int i=0; i<phoneNumberCount; i++){
|
|
|
26
|
+ phoneNum[i] = createRandomPhoneNumber();
|
|
|
27
|
+ }
|
|
|
28
|
+ return phoneNum;
|
|
24
|
29
|
}
|
|
25
|
30
|
|
|
26
|
31
|
/**
|
|
27
|
32
|
* @return an instance of PhoneNumber with randomly generated phone number value
|
|
28
|
33
|
*/ //TODO - Implement logic
|
|
29
|
|
- public static PhoneNumber createRandomPhoneNumber() {
|
|
30
|
|
- return createPhoneNumberSafely(-1, -1, -1);
|
|
|
34
|
+ public static PhoneNumber createRandomPhoneNumber(){
|
|
|
35
|
+ int areaCode = (int)((Math.random()*900)+100);
|
|
|
36
|
+ int centralOfficeCode = (int)((Math.random()*900)+100);
|
|
|
37
|
+ int phoneLineCode = (int)((Math.random()*9000)+1000);
|
|
|
38
|
+
|
|
|
39
|
+ return createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
|
|
31
|
40
|
}
|
|
32
|
41
|
|
|
33
|
42
|
|
|
|
@@ -37,8 +46,14 @@ public final class PhoneNumberFactory {
|
|
37
|
46
|
* @param phoneLineCode - 4 digit code
|
|
38
|
47
|
* @return a new phone number object
|
|
39
|
48
|
*/ //TODO - if input is valid, return respective PhoneNumber object, else return null
|
|
40
|
|
- public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
|
|
41
|
|
- return createPhoneNumber(null);
|
|
|
49
|
+ public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode){
|
|
|
50
|
+ try {
|
|
|
51
|
+ String phoneNumberString = "(" + areaCode + ")" + "-" + centralOfficeCode + "-" + phoneLineCode;
|
|
|
52
|
+ return createPhoneNumber(phoneNumberString);
|
|
|
53
|
+ }catch (InvalidPhoneNumberFormatException e){
|
|
|
54
|
+ //logger.warning("this is a t " + createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode));;
|
|
|
55
|
+ return null;
|
|
|
56
|
+ }
|
|
42
|
57
|
}
|
|
43
|
58
|
|
|
44
|
59
|
/**
|
|
|
@@ -46,7 +61,14 @@ 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;
|
|
51
|
|
- }
|
|
|
64
|
+ public static PhoneNumber createPhoneNumber(String phoneNumberString)throws InvalidPhoneNumberFormatException {
|
|
|
65
|
+
|
|
|
66
|
+ PhoneNumber phoneNumber = new PhoneNumber(phoneNumberString);
|
|
|
67
|
+ logger.warning("this is a t " + phoneNumber);
|
|
|
68
|
+ return phoneNumber;
|
|
|
69
|
+
|
|
|
70
|
+
|
|
|
71
|
+ }
|
|
|
72
|
+
|
|
|
73
|
+
|
|
52
|
74
|
}
|