Feat: conflicts solved

MatejFrnka · Feb 1, 2024 · 278e5c9 · 278e5c9
1 parent c569fb3
commit 278e5c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/backend/sportsmatch/src/main/java/com/sportsmatch/mappers/SportMapper.java b/backend/sportsmatch/src/main/java/com/sportsmatch/mappers/SportMapper.java
@@ -19,7 +19,7 @@ public class SportMapper {
      * @param entity The Sport entity to be converted.
      * @return SportDTO containing information from the Sport entity.
      */
-    public static SportDTO toDTO(Sport entity) {
+    public SportDTO toDTO(Sport entity) {
         return SportDTO.builder()
                 .name(entity.getName())
                 .build();

diff --git a/backend/sportsmatch/src/main/java/com/sportsmatch/services/SportServiceImp.java b/backend/sportsmatch/src/main/java/com/sportsmatch/services/SportServiceImp.java
@@ -3,7 +3,6 @@
 import com.sportsmatch.dtos.SportDTO;
 import com.sportsmatch.mappers.SportMapper;
 import com.sportsmatch.repositories.SportRepository;
-import com.sportsmatch.services.SportService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -27,7 +26,7 @@ public class SportServiceImp implements SportService {
      */
     public List<SportDTO> getAllSports(final Pageable pageable) {
         return sportRepository.findAll(pageable).stream()
-                .map(SportMapper::toDTO)
+                .map(sportMapper::toDTO)
                 .collect(Collectors.toList());
     }
 }