From d34d09aa2be7257aad20aaa758b66020e7d50b81 Mon Sep 17 00:00:00 2001 From: Marc Beyer Date: Mon, 10 Jan 2022 13:22:59 +0100 Subject: [PATCH] Changed REST-endpoints --- client/data/src/main/java/res/DataController.java | 13 +++++++------ client/data/src/main/java/res/Event.java | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/client/data/src/main/java/res/DataController.java b/client/data/src/main/java/res/DataController.java index 88566b6..52cac15 100644 --- a/client/data/src/main/java/res/DataController.java +++ b/client/data/src/main/java/res/DataController.java @@ -16,11 +16,12 @@ public class DataController { public static long USER_ID = -1; - private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/vpr/all-events"; - private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/vpr/all-users"; - private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/vpr/add-event"; - private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/vpr/del-event"; - private static final String LOGIN_ENDPOINT = "http://localhost:8080/vpr/login"; + private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/event/all"; + private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/event/add"; + private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/event/del"; + + private static final String LOGIN_ENDPOINT = "http://localhost:8080/user/login"; + private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/user/all"; private final HttpRequest httpRequest; @@ -110,4 +111,4 @@ public class DataController { return objectMapper.readValue(jsonString, Event[].class); } -} +} \ No newline at end of file diff --git a/client/data/src/main/java/res/Event.java b/client/data/src/main/java/res/Event.java index be598c2..5a6e585 100644 --- a/client/data/src/main/java/res/Event.java +++ b/client/data/src/main/java/res/Event.java @@ -73,7 +73,7 @@ public class Event { Pattern pattern = Pattern.compile("[A-Za-zÄÖÜäöü0-9 =!?+*/$%€.:,;_<>()-]*"); Matcher matcher = pattern.matcher(name); if(!matcher.matches()){ - throw new IllegalArgumentException("Der Name Darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: =!?+*/$%€.:,;_ <>()-"); + throw new IllegalArgumentException("Der Name darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: =!?+*/$%€.:,;_ <>()-"); } if(priority < 0){ throw new IllegalArgumentException("Bitte eine Priorit\u00e4t w\u00e4hlen.");