Jv-rick-and-morty implementation (fix 5 full fix)

pom.xml

@@ -30,6 +30,7 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
+			<version>3.2.10</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -97,7 +98,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>${maven.checkstyle.plugin.version}</version>
 				<executions>
 					<execution>
 						<phase>compile</phase>
@@ -111,6 +112,8 @@
 					<consoleOutput>true</consoleOutput>
 					<failsOnError>true</failsOnError>
 					<linkXRef>false</linkXRef>
+					<excludes>target/generated-sources/annotations/**/*.java</excludes>
+					<includes>src/main/java/**/*.java</includes>
 				</configuration>
 			</plugin>
 			<plugin>

src/main/java/mate/academy/rickandmorty/Application.java

@@ -1,21 +1,21 @@
 package mate.academy.rickandmorty;
 
 import lombok.RequiredArgsConstructor;
+
 import mate.academy.rickandmorty.external.api.service.DbSynchronizationService;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 @RequiredArgsConstructor
 public class Application implements CommandLineRunner {
-    private static final String RICK_AND_MORTY_API_CHARACTER_URL = "https://rickandmortyapi.com/api/character";
-
     private final DbSynchronizationService dbSynchronizationService;
 
     @Override
     public void run(String... args) throws Exception {
-        dbSynchronizationService.synchronize(RICK_AND_MORTY_API_CHARACTER_URL);
+        dbSynchronizationService.synchronize();
     }
 
     public static void main(String[] args) {

src/main/java/mate/academy/rickandmorty/dto/external/CharacterFullResponseDto.java

@@ -2,8 +2,11 @@
 
 import java.util.List;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
-@Data
+@Getter
+@Setter
 public class CharacterFullResponseDto {
     private CharacterMetadataDto info;
     private List<CharacterResponseDto> results;

src/main/java/mate/academy/rickandmorty/dto/external/CharacterMetadataDto.java

@@ -1,4 +1,11 @@
 package mate.academy.rickandmorty.dto.external;
 
-public record CharacterMetadataDto(String next) {
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Objects;
+@Getter
+@Setter
+public class CharacterMetadataDto {
+    private String next;
 }

src/main/java/mate/academy/rickandmorty/dto/external/CharacterResponseDto.java

@@ -1,9 +1,16 @@
 package mate.academy.rickandmorty.dto.external;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
 
-public record CharacterResponseDto(@JsonProperty("id") String externalId,
-                                   String name,
-                                   String status,
-                                   String gender) {
+import java.util.Objects;
+@Getter
+@Setter
+public final class CharacterResponseDto {
+    @JsonProperty("id")
+    private String externalId;
+    private String name;
+    private String status;
+    private String gender;
 }

src/main/java/mate/academy/rickandmorty/exeption/ConnectionException.java

@@ -0,0 +1,11 @@
+package mate.academy.rickandmorty.exeption;
+
+public class ConnectionException extends RuntimeException{
+    public ConnectionException(String message) {
+        super(message);
+    }
+
+    public ConnectionException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

src/main/java/mate/academy/rickandmorty/exeption/ConvertException.java

@@ -0,0 +1,11 @@
+package mate.academy.rickandmorty.exeption;
+
+public class ConvertException extends RuntimeException{
+    public ConvertException(String message) {
+        super(message);
+    }
+
+    public ConvertException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

src/main/java/mate/academy/rickandmorty/external/api/service/CharacterClient.java

@@ -0,0 +1,7 @@
+package mate.academy.rickandmorty.external.api.service;
+
+import mate.academy.rickandmorty.dto.external.CharacterFullResponseDto;
+
+public interface CharacterClient {
+    CharacterFullResponseDto getDtoFromApi(String url);
+}

src/main/java/mate/academy/rickandmorty/external/api/service/DbSynchronizationService.java

@@ -1,5 +1,5 @@
 package mate.academy.rickandmorty.external.api.service;
 
 public interface DbSynchronizationService {
-    void synchronize(String url);
+    void synchronize();
 }

src/main/java/mate/academy/rickandmorty/external/api/service/ExternalCharacterService.java

@@ -2,6 +2,8 @@
 
 import mate.academy.rickandmorty.dto.external.CharacterResponseDto;
 
+import java.util.List;
+
 public interface ExternalCharacterService {
-    void saveOrUpdate(CharacterResponseDto characterResponseDto);
+    void saveOrUpdate(List<CharacterResponseDto> responseDtoList);
 }

src/main/java/mate/academy/rickandmorty/external/api/service/impl/GetCharactersClientImpl.java → src/main/java/mate/academy/rickandmorty/external/api/service/impl/CharactersClientImpl.java

@@ -7,14 +7,18 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+
 import lombok.RequiredArgsConstructor;
 import mate.academy.rickandmorty.dto.external.CharacterFullResponseDto;
-import mate.academy.rickandmorty.external.api.service.GetClient;
+import mate.academy.rickandmorty.exeption.ConnectionException;
+import mate.academy.rickandmorty.exeption.ConvertException;
+import mate.academy.rickandmorty.external.api.service.CharacterClient;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
-public class GetCharactersClientImpl implements GetClient<CharacterFullResponseDto> {
+public class CharactersClientImpl implements CharacterClient {
     private final ObjectMapper objectMapper;
 
     public CharacterFullResponseDto getDtoFromApi(String url) {
@@ -27,7 +31,7 @@ public CharacterFullResponseDto getDtoFromApi(String url) {
         try {
             response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
         } catch (IOException | InterruptedException e) {
-            throw new RuntimeException("Can't get response from: " + url, e);
+            throw new ConnectionException("Can't get response from: " + url, e);
         }
 
         return convertResponse(response);
@@ -38,7 +42,7 @@ private CharacterFullResponseDto convertResponse(HttpResponse<String> response)
             return objectMapper.readValue(response.body(),
                     CharacterFullResponseDto.class);
         } catch (JsonProcessingException e) {
-            throw new RuntimeException(
+            throw new ConvertException(
                     "Can't convert response to CharacterFullResponseDto.class", e);
         }
     }

src/main/java/mate/academy/rickandmorty/external/api/service/impl/DbSynchronizationServiceImpl.java

@@ -4,31 +4,35 @@
 import mate.academy.rickandmorty.dto.external.CharacterFullResponseDto;
 import mate.academy.rickandmorty.external.api.service.DbSynchronizationService;
 import mate.academy.rickandmorty.external.api.service.ExternalCharacterService;
-import mate.academy.rickandmorty.external.api.service.GetClient;
+import mate.academy.rickandmorty.external.api.service.CharacterClient;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
 public class DbSynchronizationServiceImpl implements DbSynchronizationService {
-    private final GetClient<CharacterFullResponseDto> getClient;
+    private final CharacterClient characterClient;
     private final ExternalCharacterService externalCharacterService;
 
+    @Value("${mate.academy.rickandmorty.api}")
+    private String RICK_AND_MORTY_API_CHARACTER_URL;
+
     @Override
-    public void synchronize(String url) {
-        CharacterFullResponseDto fullResponseDto = getClient.getDtoFromApi(url);
+    public void synchronize() {
+        CharacterFullResponseDto fullResponseDto = characterClient.getDtoFromApi(RICK_AND_MORTY_API_CHARACTER_URL);
 
         if (fullResponseDto.getResults().isEmpty()) {
             return;
         }
 
         while (true) {
-            fullResponseDto.getResults().forEach(externalCharacterService::saveOrUpdate);
+            externalCharacterService.saveOrUpdate(fullResponseDto.getResults());
 
-            if (fullResponseDto.getInfo().next() == null) {
+            if (fullResponseDto.getInfo().getNext() == null) {
                 break;
             }
 
-            fullResponseDto = getClient.getDtoFromApi(fullResponseDto.getInfo().next());
+            fullResponseDto = characterClient.getDtoFromApi(fullResponseDto.getInfo().getNext());
         }
 
     }

src/main/java/mate/academy/rickandmorty/external/api/service/impl/ExternalCharacterServiceImpl.java

@@ -1,5 +1,7 @@
 package mate.academy.rickandmorty.external.api.service.impl;
 
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import mate.academy.rickandmorty.dto.external.CharacterResponseDto;
@@ -16,30 +18,33 @@ public class ExternalCharacterServiceImpl implements ExternalCharacterService {
     private final CharacterMapper characterMapper;
 
     @Override
-    public void saveOrUpdate(CharacterResponseDto characterResponseDto) {
-        Optional<Character> characterOptional = characterRepository
-                .findByExternalId(characterResponseDto.externalId())
-                .stream()
-                .findFirst();
+    public void saveOrUpdate(List<CharacterResponseDto> responseDtoList) {
+        List<Character> listToSave = new LinkedList<>();
 
-        if (characterOptional.isEmpty()) {
-            characterRepository.save(
-                    characterMapper.convertFromResponseDto(characterResponseDto));
-        } else {
-            Character character = characterOptional.get();
+        for (CharacterResponseDto responseDto : responseDtoList) {
+            Optional<Character> characterOptional = characterRepository
+                    .findFirstByExternalId(responseDto.getExternalId());
 
-            if (isEqual(characterResponseDto, character)) {
-                return;
-            }
+            if (characterOptional.isEmpty()) {
+                listToSave.add(
+                        characterMapper.convertFromResponseDto(responseDto));
+            } else {
+                Character character = characterOptional.get();
+                if (isEqual(responseDto, character)) {
+                    return;
+                }
 
-            characterMapper.updateCharacterFromResponseDto(characterResponseDto, character);
-            characterRepository.save(character);
+                Character updateCharacter = characterMapper.convertFromResponseDto(responseDto);
+                updateCharacter.setId(character.getId());
+                listToSave.add(updateCharacter);
+            }
         }
+        characterRepository.saveAll(listToSave);
     }
 
     private boolean isEqual(CharacterResponseDto characterResponseDto, Character character) {
-        return characterResponseDto.name().equals(character.getName())
-                && characterResponseDto.gender().equals(character.getGender())
-                && characterResponseDto.status().equals(character.getStatus());
+        return characterResponseDto.getName().equals(character.getName())
+                && characterResponseDto.getGender().equals(character.getGender())
+                && characterResponseDto.getStatus().equals(character.getStatus());
     }
 }

src/main/java/mate/academy/rickandmorty/repository/CharacterRepository.java

@@ -1,6 +1,8 @@
 package mate.academy.rickandmorty.repository;
 
 import java.util.List;
+import java.util.Optional;
+
 import mate.academy.rickandmorty.models.Character;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -9,10 +11,10 @@
 
 public interface CharacterRepository extends JpaRepository<Character,Long>,
         JpaSpecificationExecutor<Character> {
-    List<Character> findByExternalId(String externalId);
+    Optional<Character> findFirstByExternalId(String externalId);
 
     List<Character> findByNameContaining(Pageable pageable, String name);
 
     @Query(value = "SELECT * FROM characters ORDER BY RAND() LIMIT 1", nativeQuery = true)
-    Character findRandomCharacter();
+    Optional<Character> findRandomCharacter();
 }

src/main/java/mate/academy/rickandmorty/service/impl/CharacterServiceImpl.java

@@ -1,6 +1,8 @@
 package mate.academy.rickandmorty.service.impl;
 
 import java.util.List;
+import java.util.NoSuchElementException;
+
 import lombok.RequiredArgsConstructor;
 import mate.academy.rickandmorty.dto.internal.CharacterDto;
 import mate.academy.rickandmorty.mapping.CharacterMapper;
@@ -25,6 +27,8 @@ public List<CharacterDto> findByName(Pageable pageable, String name) {
 
     @Override
     public CharacterDto getRandomCharacter() {
-        return characterMapper.convertToDto(characterRepository.findRandomCharacter());
+        return characterMapper.convertToDto(
+                characterRepository.findRandomCharacter()
+                .orElseThrow(() -> new NoSuchElementException("Random character not found")));
     }
 }

src/main/resources/application.properties

@@ -6,3 +6,5 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.jpa.hibernate.ddl-auto=validate
 spring.jpa.show-sql=true
 spring.jpa.open-in-view=false
+
+mate.academy.rickandmorty.api=https://rickandmortyapi.com/api/character

src/test/resources/application.properties

@@ -3,3 +3,5 @@ spring.datasource.driverClassName=org.h2.Driver
 spring.datasource.username=sa
 spring.datasource.password=password
 spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
+
+mate.academy.rickandmorty.api=https://rickandmortyapi.com/api/character