Merge remote-tracking branch 'origin/merge' into merge

# Conflicts:
#	client/data/src/main/java/res/Event.java

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);
     }
-}
+}

client/data/src/main/java/res/Event.java

@@ -66,21 +66,20 @@ public class Event {
                  String end,
                  LocalDateTime date,
                  int ownerId
-    ) throws IllegalArgumentException {
-        if (name.length() < 3) {
+    ) throws IllegalArgumentException{
+        if(name.length() < 3){
             throw new IllegalArgumentException("Der Name muss eine L\u00e4nge von 3 haben.");
         }
         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: =!?+*/$%€.:,;_ <>()-");
+        if(!matcher.matches()){
+            throw new IllegalArgumentException("Der Name darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: =!?+*/$%€.:,;_ <>()-");
         }
-        if (priority < 0) {
+        if(priority < 0){
             throw new IllegalArgumentException("Bitte eine Priorit\u00e4t w\u00e4hlen.");
         }
         LocalDateTime today = LocalDateTime.now().toLocalDate().atStartOfDay();
-        if (Duration.between(today, date).isNegative()) {
+        if(Duration.between(today, date).isNegative()){
             throw new IllegalArgumentException("Das Datum muss in der Zukunft liegen.");
         }