-task solution/mark.2

mate-academy · May 17, 2024 · a187f56 · a187f56
1 parent 796e611
commit a187f56
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/mate/academy/rickandmorty/controller/CharacterController.java b/src/main/java/mate/academy/rickandmorty/controller/CharacterController.java
@@ -27,7 +27,7 @@ public CharacterDto getRandomCharacter() {
 
     @Operation(summary = "Get list characters", description = "Get list characters by name from db")
     @GetMapping()
-    public List<CharacterDto> getAllByName(@RequestParam String name) {
-        return service.getAllByName(name);
+    public List<CharacterDto> findAllByName(@RequestParam String name) {
+        return service.findAllByName(name);
     }
 }
diff --git a/src/main/java/mate/academy/rickandmorty/model/CharacterModel.java b/src/main/java/mate/academy/rickandmorty/model/CharacterModel.java
@@ -5,9 +5,11 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
-@Data
+@Getter
+@Setter
 @Entity
 @Table(name = "characters")
 public class CharacterModel {

diff --git a/src/main/java/mate/academy/rickandmorty/service/CharacterService.java b/src/main/java/mate/academy/rickandmorty/service/CharacterService.java
@@ -7,7 +7,7 @@
 public interface CharacterService {
     CharacterDto getRandomCharacter();
 
-    List<CharacterDto> getAllByName(String name);
+    List<CharacterDto> findAllByName(String name);
 
     CharacterDto save(CreateCharacterRequestDto requestDto);
 }
diff --git a/src/main/java/mate/academy/rickandmorty/service/impl/CharacterServiceImpl.java b/src/main/java/mate/academy/rickandmorty/service/impl/CharacterServiceImpl.java
@@ -22,7 +22,7 @@ public CharacterDto getRandomCharacter() {
     }
 
     @Override
-    public List<CharacterDto> getAllByName(String name) {
+    public List<CharacterDto> findAllByName(String name) {
         return repository.findAllByNameContainingIgnoreCase(name)
                 .stream()
                 .map(mapper::toDto)

diff --git a/src/main/java/mate/academy/rickandmorty/service/impl/CharactersClient.java b/src/main/java/mate/academy/rickandmorty/service/impl/CharactersClient.java
@@ -41,8 +41,7 @@ private void getListWithExternalApi() {
                         response.body(),
                         CharacterResponseDataDto.class);
                 characterResponseDataDto.results()
-                        .stream().map(createCharacterRequestDto ->
-                                characterService.save(createCharacterRequestDto))
+                        .stream().map(characterService::save)
                         .toList();
                 url = characterResponseDataDto.info().next();
             } catch (IOException | InterruptedException e) {