-
Notifications
You must be signed in to change notification settings - Fork 237
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
solution #189
base: main
Are you sure you want to change the base?
solution #189
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,74 +1,134 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<groupId>org.springframework.boot</groupId> | ||
<artifactId>spring-boot-starter-parent</artifactId> | ||
<version>3.1.4</version> | ||
<relativePath/> | ||
</parent> | ||
<groupId>mate.academy</groupId> | ||
<artifactId>jv-rick-and-morty</artifactId> | ||
<version>0.0.1-SNAPSHOT</version> | ||
<name>jv-rick-and-morty</name> | ||
<description>jv-rick-and-morty</description> | ||
<properties> | ||
<java.version>17</java.version> | ||
<maven.checkstyle.plugin.version>3.1.1</maven.checkstyle.plugin.version> | ||
<maven.checkstyle.plugin.configLocation> | ||
https://raw.githubusercontent.com/mate-academy/style-guides/master/java/checkstyle.xml | ||
</maven.checkstyle.plugin.configLocation> | ||
</properties> | ||
<dependencies> | ||
<dependency> | ||
<groupId>org.springframework.boot</groupId> | ||
<artifactId>spring-boot-starter</artifactId> | ||
</dependency> | ||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
<parent> | ||
<groupId>org.springframework.boot</groupId> | ||
<artifactId>spring-boot-starter-parent</artifactId> | ||
<version>3.1.4</version> | ||
<relativePath/> | ||
</parent> | ||
<groupId>mate.academy</groupId> | ||
<artifactId>jv-rick-and-morty</artifactId> | ||
<version>0.0.1-SNAPSHOT</version> | ||
<name>jv-rick-and-morty</name> | ||
<description>jv-rick-and-morty</description> | ||
<properties> | ||
<java.version>17</java.version> | ||
<maven.checkstyle.plugin.version>3.1.1</maven.checkstyle.plugin.version> | ||
<maven.checkstyle.plugin.configLocation> | ||
https://raw.githubusercontent.com/mate-academy/style-guides/master/java/checkstyle.xml | ||
</maven.checkstyle.plugin.configLocation> | ||
</properties> | ||
<dependencies> | ||
<dependency> | ||
<groupId>org.springframework.boot</groupId> | ||
<artifactId>spring-boot-starter</artifactId> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>org.springframework.boot</groupId> | ||
<artifactId>spring-boot-starter-test</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.springframework.boot</groupId> | ||
<artifactId>spring-boot-starter-test</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>org.springframework.boot</groupId> | ||
<artifactId>spring-boot-starter-data-jpa</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.springframework.boot</groupId> | ||
<artifactId>spring-boot-starter-data-jpa</artifactId> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>com.h2database</groupId> | ||
<artifactId>h2</artifactId> | ||
</dependency> | ||
</dependencies> | ||
<dependency> | ||
<groupId>org.springframework.boot</groupId> | ||
<artifactId>spring-boot-starter-web</artifactId> | ||
</dependency> | ||
|
||
<build> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.springframework.boot</groupId> | ||
<artifactId>spring-boot-maven-plugin</artifactId> | ||
</plugin> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-checkstyle-plugin</artifactId> | ||
<version>3.3.0</version> | ||
<executions> | ||
<execution> | ||
<phase>compile</phase> | ||
<goals> | ||
<goal>check</goal> | ||
</goals> | ||
</execution> | ||
</executions> | ||
<configuration> | ||
<configLocation>${maven.checkstyle.plugin.configLocation}</configLocation> | ||
<consoleOutput>true</consoleOutput> | ||
<failsOnError>true</failsOnError> | ||
<linkXRef>false</linkXRef> | ||
</configuration> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
<dependency> | ||
<groupId>org.projectlombok</groupId> | ||
<artifactId>lombok</artifactId> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>org.apache.commons</groupId> | ||
<artifactId>commons-dbcp2</artifactId> | ||
<version>2.9.0</version> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>org.hibernate.orm</groupId> | ||
<artifactId>hibernate-core</artifactId> | ||
<version>6.5.2.Final</version> | ||
<scope>compile</scope> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>org.hibernate.validator</groupId> | ||
<artifactId>hibernate-validator</artifactId> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>mysql</groupId> | ||
<artifactId>mysql-connector-java</artifactId> | ||
<version>8.0.33</version> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>com.h2database</groupId> | ||
<artifactId>h2</artifactId> | ||
<scope>test</scope> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>org.mapstruct</groupId> | ||
<artifactId>mapstruct</artifactId> | ||
<version>1.5.5.Final</version> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>org.mapstruct</groupId> | ||
<artifactId>mapstruct-processor</artifactId> | ||
<version>1.5.5.Final</version> | ||
<scope>provided</scope> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>org.springframework.boot</groupId> | ||
<artifactId>spring-boot-starter-validation</artifactId> | ||
</dependency> | ||
|
||
<dependency> | ||
<groupId>org.springdoc</groupId> | ||
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> | ||
<version>2.1.0</version> | ||
</dependency> | ||
</dependencies> | ||
|
||
<build> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.springframework.boot</groupId> | ||
<artifactId>spring-boot-maven-plugin</artifactId> | ||
</plugin> | ||
<plugin> | ||
<groupId>org.apache.maven.plugins</groupId> | ||
<artifactId>maven-checkstyle-plugin</artifactId> | ||
<version>3.3.0</version> | ||
<executions> | ||
<execution> | ||
<phase>compile</phase> | ||
<goals> | ||
<goal>check</goal> | ||
</goals> | ||
</execution> | ||
</executions> | ||
<configuration> | ||
<configLocation>${maven.checkstyle.plugin.configLocation}</configLocation> | ||
<consoleOutput>true</consoleOutput> | ||
<sourceDirectories>src/main/java/mate/academy/rickandmorty/mapper/CharacterMapper.java</sourceDirectories> | ||
<failsOnError>true</failsOnError> | ||
<linkXRef>false</linkXRef> | ||
</configuration> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
|
||
</project> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,28 @@ | ||
package mate.academy.rickandmorty; | ||
|
||
import mate.academy.rickandmorty.service.CharacterService; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.boot.SpringApplication; | ||
import org.springframework.boot.autoconfigure.SpringBootApplication; | ||
import org.springframework.boot.context.event.ApplicationReadyEvent; | ||
import org.springframework.context.event.EventListener; | ||
|
||
@SpringBootApplication | ||
public class Application { | ||
|
||
private final CharacterService characterService; | ||
|
||
@Autowired | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. JFYI this annotation is optional ;) |
||
public Application(CharacterService characterService) { | ||
this.characterService = characterService; | ||
} | ||
|
||
public static void main(String[] args) { | ||
SpringApplication.run(Application.class, args); | ||
} | ||
|
||
@EventListener(ApplicationReadyEvent.class) | ||
public void runAfterStartup() { | ||
characterService.saveAll(); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package mate.academy.rickandmorty.config; | ||
|
||
import org.mapstruct.InjectionStrategy; | ||
import org.mapstruct.NullValueCheckStrategy; | ||
|
||
@org.mapstruct.MapperConfig( | ||
componentModel = "spring", | ||
injectionStrategy = InjectionStrategy.CONSTRUCTOR, | ||
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, | ||
implementationPackage = "<PACKAGE_NAME>.impl" | ||
) | ||
public class MapperConfig { | ||
} |
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,31 @@ | ||||||||||
package mate.academy.rickandmorty.controller; | ||||||||||
|
||||||||||
import io.swagger.v3.oas.annotations.Operation; | ||||||||||
import io.swagger.v3.oas.annotations.tags.Tag; | ||||||||||
import java.util.List; | ||||||||||
import lombok.RequiredArgsConstructor; | ||||||||||
import mate.academy.rickandmorty.model.CharacterEntity; | ||||||||||
import mate.academy.rickandmorty.service.CharacterService; | ||||||||||
import org.springframework.web.bind.annotation.GetMapping; | ||||||||||
import org.springframework.web.bind.annotation.RequestMapping; | ||||||||||
import org.springframework.web.bind.annotation.RestController; | ||||||||||
|
||||||||||
@Tag(name = "Сharacters management", description = "Endpoints for managing Сharacters") | ||||||||||
@RestController | ||||||||||
@RequestMapping("/characters") | ||||||||||
@RequiredArgsConstructor | ||||||||||
public class CharactersController { | ||||||||||
private final CharacterService characterService; | ||||||||||
|
||||||||||
@Operation(summary = "Get one random character") | ||||||||||
@GetMapping("/randomly") | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
makes more sense for RESTful naming |
||||||||||
public CharacterEntity randomCharacter() { | ||||||||||
return characterService.findRandom(); | ||||||||||
} | ||||||||||
|
||||||||||
@Operation(summary = "Search characters by name") | ||||||||||
@GetMapping("/search") | ||||||||||
public List<CharacterEntity> searchByName(String name) { | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
make name a request parameter |
||||||||||
return characterService.findByName(name); | ||||||||||
} | ||||||||||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package mate.academy.rickandmorty.dto; | ||
|
||
import com.fasterxml.jackson.annotation.JsonProperty; | ||
import lombok.Data; | ||
|
||
@Data | ||
public class CharacterDto { | ||
@JsonProperty("id") | ||
private long externalId; | ||
private String name; | ||
private String status; | ||
private String gender; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package mate.academy.rickandmorty.dto; | ||
|
||
import java.util.List; | ||
import lombok.Data; | ||
|
||
@Data | ||
public class CharacterResponseDataDto { | ||
private CharacterResponseInfoDto info; | ||
private List<CharacterDto> results; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package mate.academy.rickandmorty.dto; | ||
|
||
import lombok.Data; | ||
|
||
@Data | ||
public class CharacterResponseInfoDto { | ||
private int pages; | ||
private String next; | ||
private String prev; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
package mate.academy.rickandmorty.mapper; | ||
|
||
import java.util.List; | ||
import mate.academy.rickandmorty.config.MapperConfig; | ||
import mate.academy.rickandmorty.dto.CharacterDto; | ||
import mate.academy.rickandmorty.model.CharacterEntity; | ||
import org.mapstruct.AfterMapping; | ||
import org.mapstruct.Mapper; | ||
import org.mapstruct.MappingTarget; | ||
|
||
@Mapper(config = MapperConfig.class) | ||
public interface CharacterMapper { | ||
CharacterEntity toModel(CharacterDto requestDto); | ||
|
||
List<CharacterEntity> toListModel(List<CharacterDto> requestDto); | ||
|
||
@AfterMapping | ||
default void setExternalId(CharacterDto requestDto, @MappingTarget CharacterEntity entity) { | ||
entity.setExternalId(requestDto.getExternalId()); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,21 @@ | ||||||
package mate.academy.rickandmorty.model; | ||||||
|
||||||
import jakarta.persistence.Entity; | ||||||
import jakarta.persistence.GeneratedValue; | ||||||
import jakarta.persistence.GenerationType; | ||||||
import jakarta.persistence.Id; | ||||||
import lombok.Getter; | ||||||
import lombok.Setter; | ||||||
|
||||||
@Getter | ||||||
@Setter | ||||||
@Entity | ||||||
public class CharacterEntity { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
@Id | ||||||
@GeneratedValue(strategy = GenerationType.IDENTITY) | ||||||
private long id; | ||||||
private long externalId; | ||||||
private String name; | ||||||
private String status; | ||||||
private String gender; | ||||||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
package mate.academy.rickandmorty.repository; | ||
|
||
import java.util.List; | ||
import mate.academy.rickandmorty.model.CharacterEntity; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; | ||
import org.springframework.data.jpa.repository.Query; | ||
|
||
public interface CharacterRepository extends JpaRepository<CharacterEntity, Long>, | ||
JpaSpecificationExecutor<CharacterEntity> { | ||
|
||
@Query("SELECT c FROM CharacterEntity c WHERE UPPER(c.name) " | ||
+ "LIKE UPPER(CONCAT('%', :name, '%'))") | ||
List<CharacterEntity> findByName(String name); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package mate.academy.rickandmorty.service; | ||
|
||
import java.util.List; | ||
import mate.academy.rickandmorty.model.CharacterEntity; | ||
|
||
public interface CharacterService { | ||
void saveAll(); | ||
|
||
CharacterEntity findRandom(); | ||
|
||
List<CharacterEntity> findByName(String name); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package mate.academy.rickandmorty.service; | ||
|
||
import java.util.List; | ||
import mate.academy.rickandmorty.dto.CharacterDto; | ||
|
||
public interface CharactersClient { | ||
List<CharacterDto> findAll(); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do you apply checkstyle plugin only to one class? Let's apply it to the
src
directory;)