christoph/lecture-professional-software-development
1
Fork 0
Code Activity

Merge branch 'master' into refactor-controller

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
This commit is contained in:
Christoph
2020-03-25 13:03:22 +01:00
parent f0a1a9c7bb a4d603c580
commit 551534d4ff
22 changed files with 438 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/mops/gruppen2/service/UserService.java
View File

@ -5,7 +5,6 @@ import mops.gruppen2.domain.User;
import mops.gruppen2.domain.event.Event;
import mops.gruppen2.domain.exception.EventException;
import mops.gruppen2.domain.exception.GroupNotFoundException;
import mops.gruppen2.repository.EventRepository;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@ -47,7 +46,7 @@ public class UserService {
List<Event> events = groupService.getGroupEvents(groupIds);
return groupService.projectEventList(events).get(0);
} catch (IndexOutOfBoundsException e) {
throw new GroupNotFoundException(this.getClass().toString());
throw new GroupNotFoundException("@UserService");
}
}
}