From 4ac3164569a9b09962599415d75443b3e49ff802 Mon Sep 17 00:00:00 2001 From: Christoph Date: Wed, 8 Apr 2020 21:08:57 +0200 Subject: [PATCH] fix some warnings --- config/checkstyle/checkstyle.xml | 2 +- .../controller/GroupCreationController.java | 1 + .../controller/GroupDetailsController.java | 1 + .../controller/GruppenfindungController.java | 1 + .../controller/SearchAndInviteController.java | 1 + .../mops/gruppen2/service/APIService.java | 10 +---- .../gruppen2/service/EventStoreService.java | 10 ++--- .../mops/gruppen2/service/GroupService.java | 4 +- .../resources/templates/changeMetadata.html | 4 +- src/main/resources/templates/createOrga.html | 6 +-- .../resources/templates/createStudent.html | 8 ++-- .../resources/templates/detailsMember.html | 44 +++++++++---------- .../resources/templates/detailsNoMember.html | 16 +++---- src/main/resources/templates/editMembers.html | 22 +++++----- src/main/resources/templates/error.html | 4 +- src/main/resources/templates/index.html | 20 ++++----- src/main/resources/templates/joinprivate.html | 8 ++-- src/main/resources/templates/search.html | 10 ++--- .../gruppen2/Gruppen2ApplicationTests.java | 1 + .../gruppen2/architecture/ControllerTest.java | 2 +- .../gruppen2/architecture/DomainTest.java | 2 +- .../architecture/LayeredArchitectureTest.java | 2 +- .../gruppen2/architecture/RepositoryTest.java | 2 +- .../gruppen2/architecture/ServiceTest.java | 2 +- .../controller/APIControllerTest.java | 1 + .../service/EventStoreServiceTest.java | 1 + .../gruppen2/service/GroupServiceTest.java | 1 + 27 files changed, 94 insertions(+), 92 deletions(-) diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 8cbd8b6..cd60d60 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -223,7 +223,7 @@ - + diff --git a/src/main/java/mops/gruppen2/controller/GroupCreationController.java b/src/main/java/mops/gruppen2/controller/GroupCreationController.java index 91365be..4920d51 100644 --- a/src/main/java/mops/gruppen2/controller/GroupCreationController.java +++ b/src/main/java/mops/gruppen2/controller/GroupCreationController.java @@ -28,6 +28,7 @@ import static mops.gruppen2.service.ControllerService.getParent; import static mops.gruppen2.service.ControllerService.getUserLimit; import static mops.gruppen2.service.ControllerService.getVisibility; +@SuppressWarnings("SameReturnValue") @Controller @SessionScope @RequestMapping("/gruppen2") diff --git a/src/main/java/mops/gruppen2/controller/GroupDetailsController.java b/src/main/java/mops/gruppen2/controller/GroupDetailsController.java index 04046a7..9f5bacb 100644 --- a/src/main/java/mops/gruppen2/controller/GroupDetailsController.java +++ b/src/main/java/mops/gruppen2/controller/GroupDetailsController.java @@ -28,6 +28,7 @@ import javax.annotation.security.RolesAllowed; import javax.servlet.http.HttpServletRequest; import java.util.UUID; +@SuppressWarnings("SameReturnValue") @Controller @SessionScope @RequestMapping("/gruppen2") diff --git a/src/main/java/mops/gruppen2/controller/GruppenfindungController.java b/src/main/java/mops/gruppen2/controller/GruppenfindungController.java index 1835769..b94ba1e 100644 --- a/src/main/java/mops/gruppen2/controller/GruppenfindungController.java +++ b/src/main/java/mops/gruppen2/controller/GruppenfindungController.java @@ -15,6 +15,7 @@ import javax.annotation.security.RolesAllowed; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; +@SuppressWarnings("SameReturnValue") @Controller @Log4j2 public class GruppenfindungController { diff --git a/src/main/java/mops/gruppen2/controller/SearchAndInviteController.java b/src/main/java/mops/gruppen2/controller/SearchAndInviteController.java index f6bd670..c764f12 100644 --- a/src/main/java/mops/gruppen2/controller/SearchAndInviteController.java +++ b/src/main/java/mops/gruppen2/controller/SearchAndInviteController.java @@ -27,6 +27,7 @@ import java.util.Collections; import java.util.List; import java.util.UUID; +@SuppressWarnings("SameReturnValue") @Controller @SessionScope @RequestMapping("/gruppen2") diff --git a/src/main/java/mops/gruppen2/service/APIService.java b/src/main/java/mops/gruppen2/service/APIService.java index b76825d..c56e694 100644 --- a/src/main/java/mops/gruppen2/service/APIService.java +++ b/src/main/java/mops/gruppen2/service/APIService.java @@ -11,17 +11,9 @@ import java.util.List; @Log4j2 public class APIService { - // private APIService() {} + private APIService() {} public static GroupRequestWrapper wrap(long status, List groupList) { return new GroupRequestWrapper(status, groupList); } - - // public static void updateGroups() - - // public static void getGroupIdsOfUser() - - // public static void getGroupById() - - // public static void updateNecessary() } diff --git a/src/main/java/mops/gruppen2/service/EventStoreService.java b/src/main/java/mops/gruppen2/service/EventStoreService.java index 70611cb..adfce38 100644 --- a/src/main/java/mops/gruppen2/service/EventStoreService.java +++ b/src/main/java/mops/gruppen2/service/EventStoreService.java @@ -99,13 +99,13 @@ public class EventStoreService { * * @return Liste von Events */ - static List getEventsFromDTOs(List eventDTOS) { + private static List getEventsFromDTOs(List eventDTOS) { return eventDTOS.stream() .map(EventStoreService::getEventFromDTO) .collect(Collectors.toList()); } - static Event getEventFromDTO(EventDTO dto) { + private static Event getEventFromDTO(EventDTO dto) { try { return JsonService.deserializeEvent(dto.getEvent_payload()); } catch (JsonProcessingException e) { @@ -136,7 +136,7 @@ public class EventStoreService { } /** - * Sucht alle Events, welche zu einer der übergebenen Gruppen gehören + * Sucht alle Events, welche zu einer der übergebenen Gruppen gehören. * * @param groupIds Liste an IDs * @@ -241,7 +241,7 @@ public class EventStoreService { * * @return Eine Liste von einem Add- oder DeleteUserEvent pro Gruppe */ - List findLatestEventsFromGroupsByUser(User user) { + private List findLatestEventsFromGroupsByUser(User user) { return getEventsFromDTOs(eventStore.findLatestEventDTOsPartitionedByGroupByUser(user.getId())); } @@ -253,7 +253,7 @@ public class EventStoreService { * * @return Eine Liste von einem Event pro Gruppe */ - List findLatestEventsFromGroupsByType(String... types) { + private List findLatestEventsFromGroupsByType(String... types) { return getEventsFromDTOs(eventStore.findLatestEventDTOsPartitionedByGroupByType(Arrays.asList(types))); } } diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java index 2727e6d..c4f8b71 100644 --- a/src/main/java/mops/gruppen2/service/GroupService.java +++ b/src/main/java/mops/gruppen2/service/GroupService.java @@ -104,7 +104,7 @@ public class GroupService { * @return Das neue Teilnehmermaximum */ private static long getAdjustedUserLimit(List newUsers, Group group) { - return Math.max(group.getMembers().size() + newUsers.size(), group.getUserLimit()); + return Math.max((long) group.getMembers().size() + newUsers.size(), group.getUserLimit()); } /** @@ -210,7 +210,7 @@ public class GroupService { eventStoreService.saveEvent(event); } - public void updateRole(User user, Group group, Role role) { + private void updateRole(User user, Group group, Role role) { ValidationService.throwIfNoMember(group, user); Event event = new UpdateRoleEvent(group, user, role); diff --git a/src/main/resources/templates/changeMetadata.html b/src/main/resources/templates/changeMetadata.html index 473f2b6..d09020e 100644 --- a/src/main/resources/templates/changeMetadata.html +++ b/src/main/resources/templates/changeMetadata.html @@ -42,7 +42,7 @@

Metadaten ändern

+ style=" border: 10px solid aliceblue; background: aliceblue;">
diff --git a/src/main/resources/templates/createStudent.html b/src/main/resources/templates/createStudent.html index 8f4d258..fc2db29 100644 --- a/src/main/resources/templates/createStudent.html +++ b/src/main/resources/templates/createStudent.html @@ -39,7 +39,7 @@

Gruppenerstellung

+ style=" border: 10px solid aliceblue; border-radius: 5px; background: aliceblue;">
@@ -57,9 +57,9 @@ unbegrenzt
- + + type="number" min="1" max="10000" id="userMax">
@@ -77,7 +77,7 @@
diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html index 61e88e2..79eabf2 100644 --- a/src/main/resources/templates/detailsMember.html +++ b/src/main/resources/templates/detailsMember.html @@ -33,38 +33,38 @@
+ style="border: 10px solid aliceblue; display: inline-block; border-radius: 5px; background: aliceblue;">
-

- Private Gruppe - Öffentliche Gruppe - Veranstaltung - Parent -
Einladungslink: + style="background: #52a1eb;">Einladungslink:


-
-

+
+


- -
+

Mitglieder

@@ -112,7 +112,7 @@
-
@@ -120,10 +120,10 @@
-
    +
      -
    • +
    • -
      -

      +
      +

      - Private Gruppe - Öffentliche Gruppe Veranstaltung - Parent

      -
      -

      +

      diff --git a/src/main/resources/templates/editMembers.html b/src/main/resources/templates/editMembers.html index bebee88..2a03b59 100644 --- a/src/main/resources/templates/editMembers.html +++ b/src/main/resources/templates/editMembers.html @@ -47,7 +47,7 @@

unbegrenzte Teilnehmeranzahl
-
+
@@ -74,29 +74,31 @@
- +
- - + + @@ -124,7 +126,7 @@ type="hidden"> - @@ -135,7 +137,7 @@
MitgliedRolleOptionenRolleOptionen
-
diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html index 4757838..5697bed 100644 --- a/src/main/resources/templates/error.html +++ b/src/main/resources/templates/error.html @@ -11,7 +11,7 @@
-
+

UPSI

Da ist wohl etwas schiefgelaufen :(


@@ -30,7 +30,7 @@
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index a6d8c97..00f914b 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -34,28 +34,28 @@

Meine Gruppen

-

- Mitglied in - + Mitglied in + - Gruppe. - Gruppen.


-

+ style="border: none; border-radius: 5px; background: aliceblue;"> +

Veranstaltung

-
-

+

diff --git a/src/main/resources/templates/joinprivate.html b/src/main/resources/templates/joinprivate.html index 825db4e..41eb222 100644 --- a/src/main/resources/templates/joinprivate.html +++ b/src/main/resources/templates/joinprivate.html @@ -34,11 +34,11 @@
-

+

-
-

+

diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html index b18b568..906d6c8 100644 --- a/src/main/resources/templates/search.html +++ b/src/main/resources/templates/search.html @@ -34,7 +34,7 @@

Gruppensuche

+ style="border: 10px solid aliceblue; border-radius: 5px; background: aliceblue;">
@@ -43,12 +43,12 @@ th:name="suchbegriff" type="text">
-
diff --git a/src/test/java/mops/gruppen2/Gruppen2ApplicationTests.java b/src/test/java/mops/gruppen2/Gruppen2ApplicationTests.java index 5b437f6..5bbd706 100644 --- a/src/test/java/mops/gruppen2/Gruppen2ApplicationTests.java +++ b/src/test/java/mops/gruppen2/Gruppen2ApplicationTests.java @@ -6,6 +6,7 @@ import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest class Gruppen2ApplicationTests { + @SuppressWarnings("EmptyMethod") @Test void contextLoads() { } diff --git a/src/test/java/mops/gruppen2/architecture/ControllerTest.java b/src/test/java/mops/gruppen2/architecture/ControllerTest.java index c954cce..840fabb 100644 --- a/src/test/java/mops/gruppen2/architecture/ControllerTest.java +++ b/src/test/java/mops/gruppen2/architecture/ControllerTest.java @@ -11,7 +11,7 @@ import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; @AnalyzeClasses(packages = "mops.gruppen2", importOptions = ImportOption.DoNotIncludeTests.class) -public class ControllerTest { +class ControllerTest { @ArchTest public static final ArchRule controllerClassesShouldBeAnnotatedWithControllerOrRestControllerAnnotation = classes() diff --git a/src/test/java/mops/gruppen2/architecture/DomainTest.java b/src/test/java/mops/gruppen2/architecture/DomainTest.java index caaa242..0c69387 100644 --- a/src/test/java/mops/gruppen2/architecture/DomainTest.java +++ b/src/test/java/mops/gruppen2/architecture/DomainTest.java @@ -10,7 +10,7 @@ import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses; @AnalyzeClasses(packages = "mops.gruppen2", importOptions = ImportOption.DoNotIncludeTests.class) -public class DomainTest { +class DomainTest { @ArchTest public static final ArchRule domainClassesShouldNotAccessClassesFromOtherPackagesExceptDomainItself = noClasses() diff --git a/src/test/java/mops/gruppen2/architecture/LayeredArchitectureTest.java b/src/test/java/mops/gruppen2/architecture/LayeredArchitectureTest.java index 2596a1d..9078e3f 100644 --- a/src/test/java/mops/gruppen2/architecture/LayeredArchitectureTest.java +++ b/src/test/java/mops/gruppen2/architecture/LayeredArchitectureTest.java @@ -7,7 +7,7 @@ import com.tngtech.archunit.lang.ArchRule; import com.tngtech.archunit.library.Architectures; @AnalyzeClasses(packages = "mops.gruppen2", importOptions = ImportOption.DoNotIncludeTests.class) -public class LayeredArchitectureTest { +class LayeredArchitectureTest { private static final Architectures.LayeredArchitecture layeredArchitecture = Architectures .layeredArchitecture() diff --git a/src/test/java/mops/gruppen2/architecture/RepositoryTest.java b/src/test/java/mops/gruppen2/architecture/RepositoryTest.java index 946da19..a0cc115 100644 --- a/src/test/java/mops/gruppen2/architecture/RepositoryTest.java +++ b/src/test/java/mops/gruppen2/architecture/RepositoryTest.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes; @AnalyzeClasses(packages = "mops.gruppen2", importOptions = ImportOption.DoNotIncludeTests.class) -public class RepositoryTest { +class RepositoryTest { @ArchTest public static final ArchRule repositoryClassesThatAreAnnotatedWithRepositoryShouldHaveRepositoryInName = classes() diff --git a/src/test/java/mops/gruppen2/architecture/ServiceTest.java b/src/test/java/mops/gruppen2/architecture/ServiceTest.java index 716e8a0..f38a330 100644 --- a/src/test/java/mops/gruppen2/architecture/ServiceTest.java +++ b/src/test/java/mops/gruppen2/architecture/ServiceTest.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes; @AnalyzeClasses(packages = "mops.gruppen2", importOptions = ImportOption.DoNotIncludeTests.class) -public class ServiceTest { +class ServiceTest { @ArchTest public static final ArchRule serviceClassesShouldHaveServiceInName = classes() diff --git a/src/test/java/mops/gruppen2/controller/APIControllerTest.java b/src/test/java/mops/gruppen2/controller/APIControllerTest.java index 1aa3950..ad4d877 100644 --- a/src/test/java/mops/gruppen2/controller/APIControllerTest.java +++ b/src/test/java/mops/gruppen2/controller/APIControllerTest.java @@ -42,6 +42,7 @@ class APIControllerTest { @Autowired private JdbcTemplate template; + @SuppressWarnings("SyntaxError") @BeforeEach void setUp() { eventRepository.deleteAll(); diff --git a/src/test/java/mops/gruppen2/service/EventStoreServiceTest.java b/src/test/java/mops/gruppen2/service/EventStoreServiceTest.java index 3ed2b9c..6d0b97a 100644 --- a/src/test/java/mops/gruppen2/service/EventStoreServiceTest.java +++ b/src/test/java/mops/gruppen2/service/EventStoreServiceTest.java @@ -35,6 +35,7 @@ class EventStoreServiceTest { @Autowired private JdbcTemplate template; + @SuppressWarnings("SyntaxError") @BeforeEach void setUp() { eventStoreService = new EventStoreService(eventRepository); diff --git a/src/test/java/mops/gruppen2/service/GroupServiceTest.java b/src/test/java/mops/gruppen2/service/GroupServiceTest.java index d56aeb2..800d5b6 100644 --- a/src/test/java/mops/gruppen2/service/GroupServiceTest.java +++ b/src/test/java/mops/gruppen2/service/GroupServiceTest.java @@ -57,6 +57,7 @@ class GroupServiceTest { @Autowired private InviteService inviteService; + @SuppressWarnings("SyntaxError") @BeforeEach void setUp() { groupService = new GroupService(eventStoreService, inviteService);