diff --git a/pom.xml b/pom.xml index 5d4b826..61eb6ee 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.powsybl powsybl-parent-ws - 26.1 + 28 diff --git a/src/main/java/org/gridsuite/useradmin/server/controller/UserProfileController.java b/src/main/java/org/gridsuite/useradmin/server/controller/UserProfileController.java index 902b7d7..34dce7a 100644 --- a/src/main/java/org/gridsuite/useradmin/server/controller/UserProfileController.java +++ b/src/main/java/org/gridsuite/useradmin/server/controller/UserProfileController.java @@ -41,7 +41,8 @@ public UserProfileController(UserProfileService userService) { @Operation(summary = "get all the user profiles") @ApiResponse(responseCode = "200", description = "The profiles list") public ResponseEntity> getProfiles(@RequestHeader("userId") String userId, - @Parameter(description = "To check if parameters and spreadsheet config collection links are still valid") @RequestParam(name = "checkLinksValidity", required = false, defaultValue = "true") boolean checkLinksValidity) { + @Parameter(description = "To check if parameters and spreadsheet config collection links are still valid") @RequestParam(name = + "checkLinksValidity", required = false, defaultValue = "true") boolean checkLinksValidity) { return ResponseEntity.ok().body(service.getProfiles(userId, checkLinksValidity)); } diff --git a/src/main/java/org/gridsuite/useradmin/server/service/AdminRightService.java b/src/main/java/org/gridsuite/useradmin/server/service/AdminRightService.java index f7a9b69..1af4813 100644 --- a/src/main/java/org/gridsuite/useradmin/server/service/AdminRightService.java +++ b/src/main/java/org/gridsuite/useradmin/server/service/AdminRightService.java @@ -16,7 +16,7 @@ import static org.gridsuite.useradmin.server.Utils.getCurrentUserRoles; /** - * @author David Braquart */ @Service public class AdminRightService { diff --git a/src/main/java/org/gridsuite/useradmin/server/service/AnnouncementService.java b/src/main/java/org/gridsuite/useradmin/server/service/AnnouncementService.java index 874e2c8..a64b369 100644 --- a/src/main/java/org/gridsuite/useradmin/server/service/AnnouncementService.java +++ b/src/main/java/org/gridsuite/useradmin/server/service/AnnouncementService.java @@ -7,13 +7,12 @@ package org.gridsuite.useradmin.server.service; import lombok.AllArgsConstructor; -import org.gridsuite.useradmin.server.error.UserAdminException; import org.gridsuite.useradmin.server.dto.Announcement; import org.gridsuite.useradmin.server.entity.AnnouncementEntity; import org.gridsuite.useradmin.server.entity.AnnouncementSeverity; +import org.gridsuite.useradmin.server.error.UserAdminException; import org.gridsuite.useradmin.server.repository.AnnouncementRepository; import org.springframework.stereotype.Service; - import java.time.Instant; import java.util.List; import java.util.Optional; diff --git a/src/main/java/org/gridsuite/useradmin/server/service/DirectoryService.java b/src/main/java/org/gridsuite/useradmin/server/service/DirectoryService.java index 3b91916..4687c21 100644 --- a/src/main/java/org/gridsuite/useradmin/server/service/DirectoryService.java +++ b/src/main/java/org/gridsuite/useradmin/server/service/DirectoryService.java @@ -6,6 +6,7 @@ */ package org.gridsuite.useradmin.server.service; +import org.gridsuite.useradmin.server.dto.ElementAttributes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -18,8 +19,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; -import org.gridsuite.useradmin.server.dto.ElementAttributes; - import java.util.List; import java.util.Set; import java.util.UUID; diff --git a/src/main/java/org/gridsuite/useradmin/server/service/NotificationService.java b/src/main/java/org/gridsuite/useradmin/server/service/NotificationService.java index e417dc8..c218909 100644 --- a/src/main/java/org/gridsuite/useradmin/server/service/NotificationService.java +++ b/src/main/java/org/gridsuite/useradmin/server/service/NotificationService.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; /** - * @author Abdelsalem Hedhili */ @Service @AllArgsConstructor diff --git a/src/main/java/org/gridsuite/useradmin/server/service/UserGroupService.java b/src/main/java/org/gridsuite/useradmin/server/service/UserGroupService.java index 358638f..dec4962 100644 --- a/src/main/java/org/gridsuite/useradmin/server/service/UserGroupService.java +++ b/src/main/java/org/gridsuite/useradmin/server/service/UserGroupService.java @@ -7,16 +7,15 @@ package org.gridsuite.useradmin.server.service; import jakarta.annotation.Nullable; -import org.gridsuite.useradmin.server.error.UserAdminException; import org.gridsuite.useradmin.server.dto.UserGroup; import org.gridsuite.useradmin.server.entity.GroupInfosEntity; import org.gridsuite.useradmin.server.entity.UserInfosEntity; +import org.gridsuite.useradmin.server.error.UserAdminException; import org.gridsuite.useradmin.server.repository.UserGroupRepository; import org.gridsuite.useradmin.server.repository.UserInfosRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; - import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/org/gridsuite/useradmin/server/service/UserProfileService.java b/src/main/java/org/gridsuite/useradmin/server/service/UserProfileService.java index bea1aa5..2b6400b 100644 --- a/src/main/java/org/gridsuite/useradmin/server/service/UserProfileService.java +++ b/src/main/java/org/gridsuite/useradmin/server/service/UserProfileService.java @@ -9,13 +9,12 @@ import com.google.common.collect.Sets; import org.apache.commons.lang3.BooleanUtils; import org.gridsuite.useradmin.server.UserAdminApplicationProps; -import org.gridsuite.useradmin.server.error.UserAdminException; import org.gridsuite.useradmin.server.dto.UserProfile; import org.gridsuite.useradmin.server.entity.UserProfileEntity; +import org.gridsuite.useradmin.server.error.UserAdminException; import org.gridsuite.useradmin.server.repository.UserProfileRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -41,6 +40,7 @@ public UserProfileService(final UserProfileRepository userProfileRepository, } @Transactional(readOnly = true) + @SuppressWarnings("checkstyle:LambdaBodyLength") public List getProfiles(String userId, boolean checkLinksValidity) { adminRightService.assertIsAdmin(); List profiles = userProfileRepository.findAll().stream().toList(); diff --git a/src/test/java/org/gridsuite/useradmin/server/AnnouncementTest.java b/src/test/java/org/gridsuite/useradmin/server/AnnouncementTest.java index 442507d..667041b 100644 --- a/src/test/java/org/gridsuite/useradmin/server/AnnouncementTest.java +++ b/src/test/java/org/gridsuite/useradmin/server/AnnouncementTest.java @@ -72,8 +72,6 @@ void cleanDB() { private void assertQueuesEmptyThenClear(List destinations, OutputDestination output) { try { destinations.forEach(destination -> assertNull(output.receive(TIMEOUT, destination), "Should not be any messages in queue " + destination + " : ")); - } catch (NullPointerException e) { - // Ignoring } finally { output.clear(); // purge in order to not fail the other tests } @@ -144,7 +142,8 @@ void testCreateAnnouncement() throws Exception { .andExpect(status().isInternalServerError()) .andReturn(); - assertTrue(result.getResponse().getContentAsString().contains("Failed to convert value of type 'java.lang.String' to required type 'org.gridsuite.useradmin.server.entity.AnnouncementSeverity'")); + assertTrue(result.getResponse().getContentAsString().contains( + "Failed to convert value of type 'java.lang.String' to required type 'org.gridsuite.useradmin.server.entity.AnnouncementSeverity'")); // Should be ok because user is admin result = mockMvc.perform(put("/" + UserAdminApi.API_VERSION + "/announcements") diff --git a/src/test/java/org/gridsuite/useradmin/server/NoQuotaTest.java b/src/test/java/org/gridsuite/useradmin/server/NoQuotaTest.java index 3fe2966..3e4f6f4 100644 --- a/src/test/java/org/gridsuite/useradmin/server/NoQuotaTest.java +++ b/src/test/java/org/gridsuite/useradmin/server/NoQuotaTest.java @@ -13,9 +13,6 @@ import org.gridsuite.useradmin.server.entity.UserProfileEntity; import org.gridsuite.useradmin.server.repository.UserInfosRepository; import org.gridsuite.useradmin.server.repository.UserProfileRepository; - -import static org.gridsuite.useradmin.server.Utils.ROLES_HEADER; -import static org.gridsuite.useradmin.server.utils.TestConstants.*; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -25,9 +22,9 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; - import java.util.Optional; - +import static org.gridsuite.useradmin.server.Utils.ROLES_HEADER; +import static org.gridsuite.useradmin.server.utils.TestConstants.*; import static org.junit.jupiter.api.Assertions.*; import static org.springframework.http.MediaType.APPLICATION_JSON; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; diff --git a/src/test/java/org/gridsuite/useradmin/server/UserAdminExceptionHandlerTest.java b/src/test/java/org/gridsuite/useradmin/server/UserAdminExceptionHandlerTest.java index 1853d89..0f649dc 100644 --- a/src/test/java/org/gridsuite/useradmin/server/UserAdminExceptionHandlerTest.java +++ b/src/test/java/org/gridsuite/useradmin/server/UserAdminExceptionHandlerTest.java @@ -7,14 +7,13 @@ package org.gridsuite.useradmin.server; import com.powsybl.ws.commons.error.PowsyblWsProblemDetail; -import org.gridsuite.useradmin.server.error.UserAdminExceptionHandler; import org.gridsuite.useradmin.server.error.UserAdminException; +import org.gridsuite.useradmin.server.error.UserAdminExceptionHandler; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.mock.web.MockHttpServletRequest; - import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/org/gridsuite/useradmin/server/UserAdminTest.java b/src/test/java/org/gridsuite/useradmin/server/UserAdminTest.java index 2769775..d1a560c 100644 --- a/src/test/java/org/gridsuite/useradmin/server/UserAdminTest.java +++ b/src/test/java/org/gridsuite/useradmin/server/UserAdminTest.java @@ -29,18 +29,16 @@ import org.springframework.http.MediaType; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; - import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.List; import java.util.Set; - import static org.gridsuite.useradmin.server.Utils.ROLES_HEADER; +import static org.gridsuite.useradmin.server.utils.TestConstants.*; import static org.junit.jupiter.api.Assertions.*; import static org.springframework.http.MediaType.APPLICATION_JSON; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.gridsuite.useradmin.server.utils.TestConstants.*; /** * @author Etienne Homer diff --git a/src/test/java/org/gridsuite/useradmin/server/UserProfileTest.java b/src/test/java/org/gridsuite/useradmin/server/UserProfileTest.java index ba9ec3b..00e373a 100644 --- a/src/test/java/org/gridsuite/useradmin/server/UserProfileTest.java +++ b/src/test/java/org/gridsuite/useradmin/server/UserProfileTest.java @@ -252,7 +252,8 @@ private void updateProfile(boolean validParameters) throws Exception { UUID networkVisualizationParametersUuid = UUID.fromString("88888888-9594-4e55-8ec7-07ea965d24eb"); UUID diagramConfigUuid = UUID.fromString("9999999-9594-4e55-8ec7-07ea965d24eb"); List elementsUuids = List.of(loadFlowParametersUuid, securityAnalysisParametersUuid, - sensitivityAnalysisParametersUuid, shortcircuitParametersUuid, pccminParametersUuid, voltageInitParametersUuid, spreadsheetConfigCollectionUuid, networkVisualizationParametersUuid, diagramConfigUuid); + sensitivityAnalysisParametersUuid, shortcircuitParametersUuid, pccminParametersUuid, voltageInitParametersUuid, + spreadsheetConfigCollectionUuid, networkVisualizationParametersUuid, diagramConfigUuid); // stub for parameters and spreadsheet config collection elements existence check final String urlPath = "/v1/elements"; @@ -276,7 +277,8 @@ private void updateProfile(boolean validParameters) throws Exception { // udpate the profile: change name and set its parameters, maxAllowedCases, maxAllowedBuilds and spreadsheet config collection UserProfile userProfile = new UserProfile(profileUuid, PROFILE_2, loadFlowParametersUuid, securityAnalysisParametersUuid, - sensitivityAnalysisParametersUuid, shortcircuitParametersUuid, pccminParametersUuid, voltageInitParametersUuid, null, 10, 11, spreadsheetConfigCollectionUuid, networkVisualizationParametersUuid, diagramConfigUuid); + sensitivityAnalysisParametersUuid, shortcircuitParametersUuid, pccminParametersUuid, voltageInitParametersUuid, null, + 10, 11, spreadsheetConfigCollectionUuid, networkVisualizationParametersUuid, diagramConfigUuid); updateProfile(userProfile, ADMIN_USER, USER_ADMIN_ROLE, HttpStatus.OK); // profiles list (with validity flag) diff --git a/src/test/java/org/gridsuite/useradmin/server/controller/UserGroupControllerTest.java b/src/test/java/org/gridsuite/useradmin/server/controller/UserGroupControllerTest.java index 92d10a9..bdebf93 100644 --- a/src/test/java/org/gridsuite/useradmin/server/controller/UserGroupControllerTest.java +++ b/src/test/java/org/gridsuite/useradmin/server/controller/UserGroupControllerTest.java @@ -23,24 +23,22 @@ import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultMatcher; - import java.util.List; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; - import static org.gridsuite.useradmin.server.Utils.ROLES_HEADER; +import static org.gridsuite.useradmin.server.utils.TestConstants.*; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.when; import static org.springframework.http.MediaType.APPLICATION_JSON; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static org.gridsuite.useradmin.server.utils.TestConstants.*; /** * @author Franck Lecuyer diff --git a/src/test/java/org/gridsuite/useradmin/server/schedule/ScheduledAnnouncementCheckerTest.java b/src/test/java/org/gridsuite/useradmin/server/schedule/ScheduledAnnouncementCheckerTest.java index 728bbeb..05e5592 100644 --- a/src/test/java/org/gridsuite/useradmin/server/schedule/ScheduledAnnouncementCheckerTest.java +++ b/src/test/java/org/gridsuite/useradmin/server/schedule/ScheduledAnnouncementCheckerTest.java @@ -110,8 +110,6 @@ private void assertAnnouncementMessageSent(String expectedMessage, long expected private static void assertQueuesEmptyThenClear(List destinations, OutputDestination output) { try { destinations.forEach(destination -> assertNull(output.receive(TIMEOUT, destination), "Should not be any messages in queue " + destination + " : ")); - } catch (NullPointerException e) { - // Ignoring } finally { output.clear(); // purge in order to not fail the other tests }