Amy Gill пре 8 година
родитељ
комит
93e5ea930d

+ 24
- 5
src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java Прегледај датотеку

@@ -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,14 +21,20 @@ 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
+        PhoneNumber[] randomPhoneNumArray= new PhoneNumber[phoneNumberCount];
25
+        for (int i = 0; i <randomPhoneNumArray.length; i++){
26
+            randomPhoneNumArray[i] = createRandomPhoneNumber();
27
+        }
28
+
29
+        return randomPhoneNumArray;
24 30
     }
25 31
 
26 32
     /**
27 33
      * @return an instance of PhoneNumber with randomly generated phone number value
28 34
      */ //TODO - Implement logic
29 35
     public static PhoneNumber createRandomPhoneNumber() {
30
-        return createPhoneNumberSafely(-1, -1, -1);
36
+        return createPhoneNumberSafely(RandomNumberFactory.createInteger(100, 999),
37
+                RandomNumberFactory.createInteger(100, 999), RandomNumberFactory.createInteger(1000, 9999));
31 38
     }
32 39
 
33 40
 
@@ -38,7 +45,15 @@ public final class PhoneNumberFactory {
38 45
      * @return a new phone number object
39 46
      */ //TODO - if input is valid, return respective PhoneNumber object, else return null
40 47
     public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
41
-        return createPhoneNumber(null);
48
+
49
+        StringBuilder phoneNumberString = new StringBuilder();
50
+        phoneNumberString.append(String.format("(%3d)-%3d-%4d", areaCode, centralOfficeCode, phoneLineCode));
51
+        try {
52
+            return createPhoneNumber(phoneNumberString.toString());
53
+        } catch (InvalidPhoneNumberFormatException invalidPhoneNumMessage){
54
+            logger.info("We're sorry." + phoneNumberString.toString() + "is not a valid phone number.");
55
+        }
56
+        return null;
42 57
     }
43 58
 
44 59
     /**
@@ -46,7 +61,11 @@ 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;
64
+    public static PhoneNumber createPhoneNumber(String phoneNumberString) throws InvalidPhoneNumberFormatException {
65
+        PhoneNumber newPhoneNumber = new PhoneNumber(phoneNumberString);
66
+        logger.info("Attempting to create a new PhoneNumber object with a value of" + newPhoneNumber);
67
+
68
+        return newPhoneNumber;
69
+
51 70
     }
52 71
 }

+ 2
- 0
src/main/java/com/zipcodewilmington/tools/RandomNumberFactory.java Прегледај датотеку

@@ -11,11 +11,13 @@ public abstract class RandomNumberFactory {
11 11
 
12 12
     /** @return a random float between the specified min and max numeric range */
13 13
     public static Float createFloat(float min, float max) {
14
+
14 15
         return random.nextFloat() * (max - min) + min;
15 16
     }
16 17
 
17 18
     /** @return a random integer between the specified min and max numeric range */
18 19
     public static Integer createInteger(Integer min, Integer max) {
20
+
19 21
         return createFloat(min, max).intValue();
20 22
     }
21 23
 }