#9284 - Fix SonarQube issues (#9285)

* Remove redundant access modifiers

* Fix shadowing in PlaceServiceImplTest

* Remove unused imports

* Remove calls to deprecated classes

* Replace deprecated URL-related methods

* Remove incompatible NotNull annotations

* Expand RatingStatisticsServiceImplTest

* Remove redundant TODOs

* Remove commented-out test

Author: markotymofeiuk

core/src/main/java/greencity/config/SecurityConfig.java

@@ -25,7 +25,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
 import org.springframework.web.cors.CorsConfiguration;
 import static greencity.constant.AppConstant.ADMIN;
 import static greencity.constant.AppConstant.USER;
@@ -495,7 +495,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                 .hasAnyRole(ADMIN)
                 .anyRequest().permitAll())
             .logout(logout -> logout.logoutUrl("/logout")
-                .logoutRequestMatcher(new AntPathRequestMatcher("/management/logout", HttpMethod.GET.name()))
+                .logoutRequestMatcher(PathPatternRequestMatcher.withDefaults()
+                    .matcher(HttpMethod.GET, "/management/logout"))
                 .clearAuthentication(true)
                 .invalidateHttpSession(true)
                 .deleteCookies("accessToken")

core/src/main/java/greencity/webcontroller/ManagementController.java

@@ -48,7 +48,7 @@ public String redirectLogin() {
     public String login() {
         if (!SecurityUtils.isAuthenticated()) {
             String managementLoginUrl =
-                UriComponentsBuilder.fromHttpUrl(remoteWebClientProperties.getGreencityUserServerAddress())
+                UriComponentsBuilder.fromUriString(remoteWebClientProperties.getGreencityUserServerAddress())
                     .path("/management/login")
                     .build()
                     .toUriString();

core/src/test/java/greencity/security/providers/JwtAuthenticationProviderTest.java

@@ -36,7 +36,7 @@ class JwtAuthenticationProviderTest {
     private JwtAuthenticationProvider jwtAuthenticationProvider;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         jwtAuthenticationProvider = new JwtAuthenticationProvider(jwtTool);
     }
 

core/src/test/java/greencity/webcontroller/ManagementControllerTest.java

@@ -66,7 +66,7 @@ void loginTest() throws Exception {
             .setAuthentication(new AnonymousAuthenticationToken("GUEST", "anonymousUser", AuthorityUtils
                 .createAuthorityList("ROLE_ANONYMOUS")));
 
-        String expectedUrl = UriComponentsBuilder.fromHttpUrl(TestConst.GREENCITY_USER_SERVER_ADDRESS)
+        String expectedUrl = UriComponentsBuilder.fromUriString(TestConst.GREENCITY_USER_SERVER_ADDRESS)
             .path(link + loginLink)
             .build()
             .toUriString();

core/src/test/java/greencity/webcontroller/ManagementRatingStatisticsControllerTest.java

@@ -1,10 +1,8 @@
 package greencity.webcontroller;
 
-import com.softserve.ldm.service.ExportToFileService;
 import greencity.dto.PageableAdvancedDto;
 import greencity.dto.ratingstatistics.RatingStatisticsDto;
 import greencity.dto.ratingstatistics.RatingStatisticsDtoForTables;
-import greencity.dto.ratingstatistics.RatingStatisticsExportDto;
 import greencity.dto.ratingstatistics.RatingStatisticsViewDto;
 import greencity.exporter.RatingExcelExporter;
 import greencity.service.RatingStatisticsService;
@@ -24,9 +22,6 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import jakarta.servlet.http.HttpServletResponse;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Collections;
@@ -48,9 +43,6 @@ class ManagementRatingStatisticsControllerTest {
     @Mock
     private RatingStatisticsService ratingStatisticsService;
 
-    @Mock
-    private ExportToFileService exportToFileService;
-
     @Mock
     private RatingExcelExporter ratingExcelExporter;
 
@@ -82,22 +74,6 @@ void getUserRatingStatisticsTest() throws Exception {
         verify(ratingStatisticsService).getRatingStatisticsForManagementByPage(pageable);
     }
 
-//    @Test
-//    void exportToExcelTest() throws Exception {
-//        List<RatingStatisticsExportDto> list =
-//                List.of(RatingStatisticsExportDto.builder().build());
-//
-//        when(ratingStatisticsService.getAllRatingStatistics()).thenReturn(list);
-//        InputStream mockStream = new ByteArrayInputStream(new byte[]{1,2,3});
-//        when(exportToFileService.exportTableDataToExcel(any())).thenReturn(mockStream);
-//
-//        mockMvc.perform(get(managementRatingStatisticsLink + "/export"))
-//                .andExpect(status().isOk());
-//
-//        verify(ratingStatisticsService).getAllRatingStatistics();
-//        verify(exportToFileService).exportTableDataToExcel(any());
-//    }
-
     @Test
     void exportFilteredToExcelTest() throws Exception {
         RatingStatisticsViewDto ratingStatisticsViewDto = new RatingStatisticsViewDto();

core/src/test/java/greencity/webcontroller/ManagementTagsControllerTest.java

@@ -17,14 +17,12 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import org.springframework.validation.BindingResult;
 import org.springframework.validation.Validator;
 import java.util.Arrays;
 import java.util.Collections;
@@ -49,9 +47,6 @@ class ManagementTagsControllerTest {
     @Mock
     private Validator validator;
 
-    @MockBean
-    private BindingResult bindingResult;
-
     @InjectMocks
     private ManagementTagsController tagsController;
 

dao/src/main/java/greencity/repository/UserRepo.java

@@ -37,7 +37,7 @@ public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExe
      * @author Anton Bondar
      */
     @NonNull
-    Page<User> findAll(@NonNull Specification<User> filter, @NonNull Pageable pageable);
+    Page<User> findAll(Specification<User> filter, @NonNull Pageable pageable);
 
     /**
      * Updates user rating as event organizer.

service-api/src/main/java/greencity/client/RestClient.java

@@ -94,7 +94,7 @@ public PageableAdvancedDto<UbsNotificationDto> findAllNotificationsForUserFromUb
         HttpEntity<String> httpEntity = new HttpEntity<>(httpHeaders);
         String userEmail = principal.getName();
 
-        UriComponentsBuilder ubsNotificationsUrlBuilder = UriComponentsBuilder.fromHttpUrl(
+        UriComponentsBuilder ubsNotificationsUrlBuilder = UriComponentsBuilder.fromUriString(
             remoteWebClientProperties.getGreencityUbsServerAddress() + RestTemplateLinks.NOTIFICATIONS);
 
         String url = ubsNotificationsUrlBuilder

service-api/src/main/java/greencity/client/UserRemoteClient.java

@@ -377,7 +377,6 @@ public SocialNetworkImageResponseDTO getEcoNewsById(Long id) {
             .block();
     }
 
-    // TODO: add caching
     /**
      * Method to get all languages as {@link LanguageDTO}.
      *
@@ -392,7 +391,6 @@ public List<LanguageDTO> getAllLanguages() {
             .toList();
     }
 
-    // TODO: add caching
     /**
      * Find language {@link LanguageDTO} by code.
      *

service-api/src/test/java/greencity/ModelUtils.java

@@ -17,8 +17,8 @@
 import greencity.dto.socialnetwork.SocialNetworkImageResponseDTO;
 import greencity.dto.socialnetwork.SocialNetworkImageVO;
 import greencity.dto.socialnetwork.SocialNetworkVO;
-import greencity.dto.todolistitem.CustomToDoListItemResponseDto;
 import greencity.dto.tag.TagUkEnDto;
+import greencity.dto.todolistitem.CustomToDoListItemResponseDto;
 import greencity.dto.user.EcoNewsAuthorDto;
 import greencity.dto.user.SubscriberDto;
 import greencity.dto.user.UserActivationDto;
@@ -31,22 +31,21 @@
 import greencity.enums.ToDoListItemStatus;
 import greencity.enums.UserStatus;
 import greencity.message.ScheduledEmailMessage;
-import greencity.message.SendReportEmailMessage;
 import greencity.message.SendHabitNotification;
-
-import java.time.LocalDateTime;
-import java.util.UUID;
-
+import greencity.message.SendReportEmailMessage;
 import jakarta.validation.ConstraintValidatorContext;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
+import java.time.LocalDateTime;
 import java.time.ZonedDateTime;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 
 public class ModelUtils {
     public static UserVO getUserVO() {
@@ -188,7 +187,7 @@ public static CustomHabitDtoResponse getAddCustomHabitDtoResponse() {
     }
 
     public static URL getUrl() throws MalformedURLException {
-        return new URL(TestConst.SITE);
+        return URI.create(TestConst.SITE).toURL();
     }
 
     public static ScheduledEmailMessage getScheduledEmailMessage() {