Fix patterns

joeyberkovitz · Apr 22, 2020 · 4d66fc5 · 4d66fc5
1 parent ff28624
commit 4d66fc5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.../src/main/java/edu/cooper/ece366/restaurantReservation/grpc/Addresses/AddressManager.java b/.../src/main/java/edu/cooper/ece366/restaurantReservation/grpc/Addresses/AddressManager.java
@@ -70,7 +70,7 @@ private void validateAddr(Address address)
     }
 
     public void checkName(String name) throws InvalidAddrNameException {
-        if (!name.matches("(\\p{IsLatin}|[0-9 ])*$")) {
+        if (!name.matches("([a-zA-Z0-9 \\\"\\;\\:\\'\\?\\/\\<\\>\\,\\{\\}\\[\\]\\(\\)\\!\\@\\#\\$\\%\\^\\&\\*\\-\\_=+])*$")) {
             throw new InvalidAddrNameException("Name must only include alphanumeric characters.");
         }
     }

diff --git a/...main/java/edu/cooper/ece366/restaurantReservation/grpc/Restaurants/RestaurantManager.java b/...main/java/edu/cooper/ece366/restaurantReservation/grpc/Restaurants/RestaurantManager.java
@@ -211,7 +211,7 @@ public void deleteRestaurant(int rest_id) throws AddressManager.InvalidAddressId
 	}
 
 	public void checkName(String name) throws InvalidRestNameException {
-		if (!name.matches("(\\p{IsLatin}|[0-9 ])*$")) {
+		if (!name.matches("([a-zA-Z0-9 \\\"\\;\\:\\'\\?\\/\\<\\>\\,\\{\\}\\[\\]\\(\\)\\!\\@\\#\\$\\%\\^\\&\\*\\-\\_=+])*$")) {
 			throw new InvalidRestNameException("Name must only include alphanumeric characters.");
 		}
 	}