Bläddra i källkod

finished lab maybe

Jared Norris 8 år sedan
förälder
incheckning
d3132caa08
1 ändrade filer med 22 tillägg och 6 borttagningar
  1. 22
    6
      src/main/java/com/zipcodewilmington/phone/PhoneNumberFactory.java

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

@@ -1,13 +1,15 @@
1 1
 package com.zipcodewilmington.phone;
2 2
 
3 3
 import com.zipcodewilmington.exceptions.InvalidPhoneNumberFormatException;
4
+import com.zipcodewilmington.tools.RandomNumberFactory;
4 5
 
6
+import java.util.Random;
5 7
 import java.util.logging.Logger;
6 8
 
7 9
 /**
8 10
  * Created by leon on 5/1/17.
9 11
  */
10
-public final class PhoneNumberFactory {
12
+public final class PhoneNumberFactory extends RandomNumberFactory {
11 13
     private static final Logger logger = Logger.getGlobal();
12 14
 
13 15
     private PhoneNumberFactory() {
@@ -20,14 +22,21 @@ public final class PhoneNumberFactory {
20 22
      * @return array of randomly generated PhoneNumber objects
21 23
      */ //TODO - Implement logic
22 24
     public static PhoneNumber[] createRandomPhoneNumberArray(int phoneNumberCount) {
23
-        return null;
25
+        PhoneNumber[] result = new PhoneNumber[phoneNumberCount];
26
+        for (PhoneNumber e : result) {
27
+            e = createRandomPhoneNumber();
28
+        }
29
+        return result;
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
+        int aC = RandomNumberFactory.createInteger(100, 999);
37
+        int cOC = RandomNumberFactory.createInteger(100, 999);
38
+        int pLC = RandomNumberFactory.createInteger(1000, 9999);
39
+        return createPhoneNumberSafely(aC, cOC, pLC);
31 40
     }
32 41
 
33 42
 
@@ -38,7 +47,13 @@ public final class PhoneNumberFactory {
38 47
      * @return a new phone number object
39 48
      */ //TODO - if input is valid, return respective PhoneNumber object, else return null
40 49
     public static PhoneNumber createPhoneNumberSafely(int areaCode, int centralOfficeCode, int phoneLineCode) {
41
-        return createPhoneNumber(null);
50
+        String number = "(" + areaCode + ")" + "-" + centralOfficeCode + "-" + phoneLineCode;
51
+        try {
52
+            return createPhoneNumber(number);
53
+        } catch (InvalidPhoneNumberFormatException e) {
54
+            logger.warning(number + " is not a valid phone number!");
55
+            return null;
56
+        }
42 57
     }
43 58
 
44 59
     /**
@@ -46,7 +61,8 @@ 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
+        logger.info("Trying to create a phone number with input " + phoneNumberString);
66
+        return new PhoneNumber(phoneNumberString);
51 67
     }
52 68
 }