Bläddra i källkod

Completed all of lab

William Brown 7 år sedan
förälder
incheckning
97eeb3b521

+ 3
- 1
src/main/java/com/zipcodewilmington/exceptions/InvalidPhoneNumberFormatException.java Visa fil

@@ -1,7 +1,9 @@
1 1
 package com.zipcodewilmington.exceptions;
2 2
 
3
+import java.io.IOException;
4
+
3 5
 /**
4 6
  * Created by leon on 5/10/17.
5 7
  */ // Checked Exception
6
-public final class InvalidPhoneNumberFormatException extends Exception {
8
+public final class InvalidPhoneNumberFormatException extends IOException {
7 9
 }

+ 1
- 1
src/main/java/com/zipcodewilmington/phone/PhoneNumber.java Visa fil

@@ -9,7 +9,7 @@ public final class PhoneNumber {
9 9
     private final String phoneNumberString;
10 10
 
11 11
     // default constructor is uncallable
12
-    private PhoneNumber() throws InvalidPhoneNumberFormatException {
12
+    private PhoneNumber() throws InvalidPhoneNumberFormatException{
13 13
         this(null);
14 14
     }
15 15
 

+ 25
- 6
src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java Visa fil

@@ -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,24 @@ 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[] phoneNumbers = new PhoneNumber[phoneNumberCount];
25
+        for(int i = 0; i < phoneNumbers.length; i++){
26
+            phoneNumbers[i] = createRandomPhoneNumber();
27
+        }
28
+        return phoneNumbers;
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
+        RandomNumberFactory randomNumberFactory = new RandomNumberFactory(){};
36
+
37
+        int randomAreaCode = randomNumberFactory.createInteger(100,999);
38
+        int randomCentral = randomNumberFactory.createInteger(100,999);
39
+        int randomLineCode = randomNumberFactory.createInteger(1000,9999);
40
+
41
+        return createPhoneNumberSafely(randomAreaCode, randomCentral, randomLineCode);
31 42
     }
32 43
 
33 44
 
@@ -38,7 +49,13 @@ public final class PhoneNumberFactory {
38 49
      * @return a new phone number object
39 50
      */ //TODO - if input is valid, return respective PhoneNumber object, else return null
40 51
     public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
41
-        return createPhoneNumber(null);
52
+        String number = "(" + areaCode + ")-" + centralOfficeCode + "-" + phoneLineCode;
53
+        try {
54
+            return createPhoneNumber(number);
55
+        } catch (InvalidPhoneNumberFormatException e){
56
+            logger.info(number +" is not a valid phone number");
57
+            return null;
58
+        }
42 59
     }
43 60
 
44 61
     /**
@@ -46,7 +63,9 @@ public final class PhoneNumberFactory {
46 63
      * @return a new phone number object
47 64
      * @throws InvalidPhoneNumberFormatException - thrown if phoneNumberString does not match acceptable format
48 65
      */ // TODO - Add throws statement to method signature
49
-    public static PhoneNumber createPhoneNumber(String phoneNumberString) {
50
-        return null;
66
+    public static PhoneNumber createPhoneNumber(String phoneNumberString) throws InvalidPhoneNumberFormatException{
67
+        PhoneNumber phoneNumber = new PhoneNumber(phoneNumberString);
68
+        logger.info("Attempting to create a new PhoneNumber object with a value of " + phoneNumberString);
69
+        return phoneNumber;
51 70
     }
52 71
 }