1

Merge remote-tracking branch 'origin/master' into updateGroupsAPI

# Conflicts:
#	src/main/java/mops/gruppen2/service/EventService.java
This commit is contained in:
LukasEttel
2020-03-13 13:52:53 +01:00
11 changed files with 73 additions and 34 deletions

View File

@ -37,14 +37,6 @@ public class ControllerTest {
.that().resideInAPackage("..controller..")
.should().haveSimpleNameEndingWith("Controller");
@ArchTest
public static final ArchRule controllerClassesShouldHaveRequestMappingAnnotation = classes()
.that().resideInAPackage("..controller..")
.and().haveSimpleNameEndingWith("Controller")
.and().areAnnotatedWith(Controller.class)
.or().areAnnotatedWith(RestController.class)
.should().beAnnotatedWith(RequestMapping.class);
@ArchTest
public static final ArchRule controllerClassesShouldNotDependOnEachOther = noClasses()
.that().haveSimpleNameEndingWith("Controller")