Merge branch 'refactoring' into error-handling
# Conflicts: # src/main/java/mops/gruppen2/controller/Gruppen2Controller.java # src/main/java/mops/gruppen2/domain/Exceptions/UserAlreadyExistsException.java # src/main/java/mops/gruppen2/domain/Exceptions/UserNotFoundException.java # src/main/java/mops/gruppen2/domain/Group.java # src/main/java/mops/gruppen2/domain/event/AddUserEvent.java # src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java # src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java # src/main/java/mops/gruppen2/domain/event/Event.java # src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java # src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java # src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java # src/main/java/mops/gruppen2/domain/exception/EventException.java # src/main/java/mops/gruppen2/domain/exception/GroupIdMismatchException.java # src/main/java/mops/gruppen2/domain/exception/GroupNotFoundException.java # src/main/java/mops/gruppen2/domain/exception/NoValueException.java # src/main/java/mops/gruppen2/service/ControllerService.java # src/main/java/mops/gruppen2/service/GroupService.java # src/main/java/mops/gruppen2/service/UserService.java # src/main/resources/templates/errorRenameLater.html
This commit is contained in:
@ -1,4 +1,3 @@
|
||||
server.port=8080
|
||||
application.name=gruppen2
|
||||
logging.pattern.console=[${application.name}],%magenta(%-5level), %d{dd-MM-yyyy HH:mm:ss.SSS}, %highlight(%msg),%thread,%logger.%M%n
|
||||
spring.datasource.url=jdbc:h2:mem:blogdb
|
||||
@ -16,7 +15,6 @@ keycloak.resource=gruppenfindung
|
||||
keycloak.credentials.secret=fc6ebf10-8c63-4e71-a667-4eae4e8209a1
|
||||
keycloak.verify-token-audience=true
|
||||
keycloak.use-resource-role-mappings=true
|
||||
|
||||
keycloak.autodetect-bearer-only=true
|
||||
keycloak.confidential-port=443
|
||||
server.error.include-stacktrace=always
|
||||
|
||||
Reference in New Issue
Block a user