|
|
@@ -1,6 +1,7 @@
|
|
1
|
1
|
package com.zipcodewilmington.phone;
|
|
2
|
2
|
|
|
3
|
3
|
import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
|
|
|
4
|
+import com.zipcodewilmington.tools.RandomNumberFactory;
|
|
4
|
5
|
|
|
5
|
6
|
import java.util.logging.Logger;
|
|
6
|
7
|
|
|
|
@@ -20,16 +21,27 @@ public final class PhoneNumberFactory {
|
|
20
|
21
|
* @return array of randomly generated PhoneNumber objects
|
|
21
|
22
|
*/ //TODO - Implement logic
|
|
22
|
23
|
public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
|
|
23
|
|
- return null;
|
|
|
24
|
+
|
|
|
25
|
+ PhoneNumber[] pns = new PhoneNumber[phoneNumberCount];
|
|
|
26
|
+ for(int i = 0; i < phoneNumberCount; i++){
|
|
|
27
|
+ pns[i] = createRandomPhoneNumber();
|
|
|
28
|
+ }
|
|
|
29
|
+ return pns;
|
|
|
30
|
+
|
|
24
|
31
|
}
|
|
25
|
32
|
|
|
26
|
33
|
/**
|
|
27
|
34
|
* @return an instance of PhoneNumber with randomly generated phone number value
|
|
28
|
35
|
*/ //TODO - Implement logic
|
|
29
|
36
|
public static PhoneNumber createRandomPhoneNumber() {
|
|
30
|
|
- return createPhoneNumberSafely(-1, -1, -1);
|
|
31
|
|
- }
|
|
32
|
37
|
|
|
|
38
|
+ Integer areaCode = RandomNumberFactory.byLength(3);
|
|
|
39
|
+ Integer centralOfficeCode = RandomNumberFactory.byLength(3);
|
|
|
40
|
+ Integer phoneLineCode = RandomNumberFactory.byLength(4);
|
|
|
41
|
+
|
|
|
42
|
+ PhoneNumber pn = createPhoneNumberSafely(areaCode, centralOfficeCode, phoneLineCode);
|
|
|
43
|
+ return pn;
|
|
|
44
|
+ }
|
|
33
|
45
|
|
|
34
|
46
|
/**
|
|
35
|
47
|
* @param areaCode - 3 digit code
|
|
|
@@ -38,7 +50,17 @@ public final class PhoneNumberFactory {
|
|
38
|
50
|
* @return a new phone number object
|
|
39
|
51
|
*/ //TODO - if input is valid, return respective PhoneNumber object, else return null
|
|
40
|
52
|
public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
|
|
41
|
|
- return createPhoneNumber(null);
|
|
|
53
|
+ String buildNumber = "(" + areaCode +")-" + centralOfficeCode + "-" + phoneLineCode;
|
|
|
54
|
+ try {
|
|
|
55
|
+// System.out.println(areaCode);
|
|
|
56
|
+// System.out.println(centralOfficeCode);
|
|
|
57
|
+// System.out.println(phoneLineCode);
|
|
|
58
|
+ return createPhoneNumber(buildNumber);
|
|
|
59
|
+ } catch (InvalidPhoneNumberFormatException e) {
|
|
|
60
|
+ //e.printStackTrace();
|
|
|
61
|
+ logger.info(buildNumber + " is not a valid phone number");
|
|
|
62
|
+ return null;
|
|
|
63
|
+ }
|
|
42
|
64
|
}
|
|
43
|
65
|
|
|
44
|
66
|
/**
|
|
|
@@ -46,7 +68,28 @@ public final class PhoneNumberFactory {
|
|
46
|
68
|
* @return a new phone number object
|
|
47
|
69
|
* @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
|
|
48
|
70
|
*/ // TODO - Add throws statement to method signature
|
|
49
|
|
- public static PhoneNumber createPhoneNumber(String phoneNumberString) {
|
|
50
|
|
- return null;
|
|
|
71
|
+ public static PhoneNumber createPhoneNumber(String phoneNumberString) throws InvalidPhoneNumberFormatException{
|
|
|
72
|
+ logger.info("Attempting to create a new PhoneNumber object with value of " + phoneNumberString);
|
|
|
73
|
+ return new PhoneNumber(phoneNumberString);
|
|
51
|
74
|
}
|
|
|
75
|
+
|
|
|
76
|
+ private static int randomNums(int length){
|
|
|
77
|
+ StringBuilder sb = new StringBuilder();
|
|
|
78
|
+ for(int i = 1; i <= length; i++){
|
|
|
79
|
+ sb.append(1);
|
|
|
80
|
+ //sb.append(Integer.toString(random()));
|
|
|
81
|
+ }
|
|
|
82
|
+ return Integer.parseInt(sb.toString());
|
|
|
83
|
+ }
|
|
|
84
|
+
|
|
|
85
|
+// public static int random(){
|
|
|
86
|
+// int randomNumber = -1;
|
|
|
87
|
+// while(true){
|
|
|
88
|
+// randomNumber = (int)Math.floor(Math.random() * 10);
|
|
|
89
|
+// if(randomNumber >= 0 && randomNumber <= 9){
|
|
|
90
|
+// return randomNumber;
|
|
|
91
|
+// }
|
|
|
92
|
+// }
|
|
|
93
|
+// }
|
|
|
94
|
+
|
|
52
|
95
|
}
|