Remove MapStruct dependency

Author: Ivan Franchin

author-book-api/src/main/java/com/ivanfranchin/authorbookapi/graphql/AuthorController.java

@@ -1,7 +1,6 @@
 package com.ivanfranchin.authorbookapi.graphql;
 
 import com.ivanfranchin.authorbookapi.graphql.input.AuthorInput;
-import com.ivanfranchin.authorbookapi.graphql.mapper.AuthorMapper;
 import com.ivanfranchin.authorbookapi.model.Author;
 import com.ivanfranchin.authorbookapi.service.AuthorService;
 import lombok.RequiredArgsConstructor;
@@ -17,7 +16,6 @@
 public class AuthorController {
 
  private final AuthorService authorService;
- private final AuthorMapper authorMapper;
 
  @QueryMapping
  public List<Author> getAuthors() {
@@ -36,14 +34,14 @@ public List<Author> getAuthorByName(@Argument String authorName) {
 
  @MutationMapping
  public Author createAuthor(@Argument AuthorInput authorInput) {
- Author author = authorMapper.toAuthor(authorInput);
+ Author author = Author.from(authorInput);
  return authorService.saveAuthor(author);
  }
 
  @MutationMapping
  public Author updateAuthor(@Argument Long authorId, @Argument AuthorInput authorInput) {
  Author author = authorService.validateAndGetAuthorById(authorId);
- authorMapper.updateAuthorFromRequest(authorInput, author);
+ Author.updateFrom(authorInput, author);
  return authorService.saveAuthor(author);
  }
 

author-book-api/src/main/java/com/ivanfranchin/authorbookapi/graphql/BookController.java

@@ -3,7 +3,6 @@
 import com.ivanfranchin.authorbookapi.client.BookReviewApiClient;
 import com.ivanfranchin.authorbookapi.client.BookReviewApiQueryBuilder;
 import com.ivanfranchin.authorbookapi.graphql.input.BookInput;
-import com.ivanfranchin.authorbookapi.graphql.mapper.BookMapper;
 import com.ivanfranchin.authorbookapi.model.Author;
 import com.ivanfranchin.authorbookapi.model.Book;
 import com.ivanfranchin.authorbookapi.model.BookReview;
@@ -24,7 +23,6 @@ public class BookController {
 
  private final AuthorService authorService;
  private final BookService bookService;
- private final BookMapper bookMapper;
  private final BookReviewApiQueryBuilder bookReviewApiQueryBuilder;
  private final BookReviewApiClient bookReviewApiClient;
 
@@ -41,15 +39,15 @@ public Book getBookById(@Argument Long bookId) {
  @MutationMapping
  public Book createBook(@Argument BookInput bookInput) {
  Author author = authorService.validateAndGetAuthorById(bookInput.authorId());
- Book book = bookMapper.toBook(bookInput);
+ Book book = Book.from(bookInput);
  book.setAuthor(author);
  return bookService.saveBook(book);
  }
 
  @MutationMapping
  public Book updateBook(@Argument Long bookId, @Argument BookInput bookInput) {
  Book book = bookService.validateAndGetBookById(bookId);
- bookMapper.updateBookFromRequest(bookInput, book);
+ Book.updateFrom(bookInput, book);
 
  Long authorId = bookInput.authorId();
  if (authorId != null) {

author-book-api/src/main/java/com/ivanfranchin/authorbookapi/graphql/mapper/AuthorMapper.java

@@ -1,5 +1,8 @@
 package com.ivanfranchin.authorbookapi.model;
 
+import com.ivanfranchin.authorbookapi.graphql.input.AuthorInput;
+import com.ivanfranchin.authorbookapi.restapi.dto.CreateAuthorRequest;
+import com.ivanfranchin.authorbookapi.restapi.dto.UpdateAuthorRequest;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -47,4 +50,28 @@ public void onPrePersist() {
  public void onPreUpdate() {
  updatedAt = Instant.now();
  }
+
+ public static Author from(AuthorInput authorInput) {
+ Author author = new Author();
+ author.setName(authorInput.name());
+ return author;
+ }
+
+ public static void updateFrom(AuthorInput authorInput, Author author) {
+ if (authorInput.name() != null) {
+ author.setName(authorInput.name());
+ }
+ }
+
+ public static Author from(CreateAuthorRequest createAuthorRequest) {
+ Author author = new Author();
+ author.setName(createAuthorRequest.name());
+ return author;
+ }
+
+ public static void updateFrom(UpdateAuthorRequest updateAuthorRequest, Author author) {
+ if (updateAuthorRequest.name() != null) {
+ author.setName(updateAuthorRequest.name());
+ }
+ }
 }

author-book-api/src/main/java/com/ivanfranchin/authorbookapi/graphql/mapper/BookMapper.java

@@ -1,5 +1,8 @@
 package com.ivanfranchin.authorbookapi.model;
 
+import com.ivanfranchin.authorbookapi.graphql.input.BookInput;
+import com.ivanfranchin.authorbookapi.restapi.dto.CreateBookRequest;
+import com.ivanfranchin.authorbookapi.restapi.dto.UpdateBookRequest;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -58,4 +61,44 @@ public void onPrePersist() {
  public void onPreUpdate() {
  updatedAt = Instant.now();
  }
+
+ public static Book from(BookInput bookInput) {
+ Book book = new Book();
+ book.setIsbn(bookInput.isbn());
+ book.setTitle(bookInput.title());
+ book.setYear(bookInput.year());
+ return book;
+ }
+
+ public static void updateFrom(BookInput bookInput, Book book) {
+ if (bookInput.isbn() != null) {
+ book.setIsbn(bookInput.isbn());
+ }
+ if (bookInput.title() != null) {
+ book.setTitle(bookInput.title());
+ }
+ if (bookInput.year() != null) {
+ book.setYear(bookInput.year());
+ }
+ }
+
+ public static Book from(CreateBookRequest createBookRequest) {
+ Book book = new Book();
+ book.setIsbn(createBookRequest.isbn());
+ book.setTitle(createBookRequest.title());
+ book.setYear(createBookRequest.year());
+ return book;
+ }
+
+ public static void updateFrom(UpdateBookRequest updateBookRequest, Book book) {
+ if (updateBookRequest.isbn() != null) {
+ book.setIsbn(updateBookRequest.isbn());
+ }
+ if (updateBookRequest.title() != null) {
+ book.setTitle(updateBookRequest.title());
+ }
+ if (updateBookRequest.year() != null) {
+ book.setYear(updateBookRequest.year());
+ }
+ }
 }

author-book-api/src/main/java/com/ivanfranchin/authorbookapi/model/Author.java

@@ -5,8 +5,6 @@
 import com.ivanfranchin.authorbookapi.restapi.dto.BookResponse;
 import com.ivanfranchin.authorbookapi.restapi.dto.CreateAuthorRequest;
 import com.ivanfranchin.authorbookapi.restapi.dto.UpdateAuthorRequest;
-import com.ivanfranchin.authorbookapi.restapi.mapper.AuthorMapper;
-import com.ivanfranchin.authorbookapi.restapi.mapper.BookMapper;
 import com.ivanfranchin.authorbookapi.service.AuthorService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -31,60 +29,58 @@
 public class AuthorController {
 
  private final AuthorService authorService;
- private final AuthorMapper authorMapper;
- private final BookMapper bookMapper;
 
  @GetMapping
  public List<AuthorResponse> getAuthors() {
  return authorService.getAuthors()
  .stream()
- .map(authorMapper::toAuthorResponse)
+ .map(AuthorResponse::from)
  .collect(Collectors.toList());
  }
 
  @GetMapping("/name/{authorName}")
  public List<AuthorResponse> getAuthorByName(@PathVariable String authorName) {
  return authorService.validateAndGetAuthorByName(authorName)
  .stream()
- .map(authorMapper::toAuthorResponse)
+ .map(AuthorResponse::from)
  .collect(Collectors.toList());
  }
 
  @GetMapping("/{authorId}")
  public AuthorResponse getAuthorById(@PathVariable Long authorId) {
  Author author = authorService.validateAndGetAuthorById(authorId);
- return authorMapper.toAuthorResponse(author);
+ return AuthorResponse.from(author);
  }
 
  @ResponseStatus(HttpStatus.CREATED)
  @PostMapping
  public AuthorResponse createAuthor(@Valid @RequestBody CreateAuthorRequest createAuthorRequest) {
- Author author = authorMapper.toAuthor(createAuthorRequest);
+ Author author = Author.from(createAuthorRequest);
  author = authorService.saveAuthor(author);
- return authorMapper.toAuthorResponse(author);
+ return AuthorResponse.from(author);
  }
 
  @PutMapping("/{authorId}")
  public AuthorResponse updateAuthor(@PathVariable Long authorId, @Valid @RequestBody UpdateAuthorRequest updateAuthorRequest) {
  Author author = authorService.validateAndGetAuthorById(authorId);
- authorMapper.updateAuthorFromRequest(updateAuthorRequest, author);
+ Author.updateFrom(updateAuthorRequest, author);
  author = authorService.saveAuthor(author);
- return authorMapper.toAuthorResponse(author);
+ return AuthorResponse.from(author);
  }
 
  @DeleteMapping("/{authorId}")
  public AuthorResponse deleteAuthor(@PathVariable Long authorId) {
  Author author = authorService.validateAndGetAuthorById(authorId);
  authorService.deleteAuthor(author);
- return authorMapper.toAuthorResponse(author);
+ return AuthorResponse.from(author);
  }
 
  @GetMapping("/{authorId}/books")
  public Set<BookResponse> getAuthorBooks(@PathVariable Long authorId) {
  Author author = authorService.validateAndGetAuthorById(authorId);
  return author.getBooks()
  .stream()
- .map(bookMapper::toBookResponse)
+ .map(BookResponse::from)
  .collect(Collectors.toSet());
  }
 }

author-book-api/src/main/java/com/ivanfranchin/authorbookapi/model/Book.java

@@ -8,7 +8,6 @@
 import com.ivanfranchin.authorbookapi.restapi.dto.BookResponse;
 import com.ivanfranchin.authorbookapi.restapi.dto.CreateBookRequest;
 import com.ivanfranchin.authorbookapi.restapi.dto.UpdateBookRequest;
-import com.ivanfranchin.authorbookapi.restapi.mapper.BookMapper;
 import com.ivanfranchin.authorbookapi.service.AuthorService;
 import com.ivanfranchin.authorbookapi.service.BookService;
 import jakarta.validation.Valid;
@@ -36,50 +35,49 @@ public class BookController {
  private final AuthorService authorService;
  private final BookReviewApiClient bookReviewApiClient;
  private final BookReviewApiQueryBuilder bookReviewApiQueryBuilder;
- private final BookMapper bookMapper;
 
  @GetMapping
  public List<BookResponse> getBooks() {
  return bookService.getBooks()
  .stream()
- .map(bookMapper::toBookResponse)
+ .map(BookResponse::from)
  .collect(Collectors.toList());
  }
 
  @GetMapping("/{bookId}")
  public BookResponse getBook(@PathVariable Long bookId) {
  Book book = bookService.validateAndGetBookById(bookId);
- return bookMapper.toBookResponse(book);
+ return BookResponse.from(book);
  }
 
  @ResponseStatus(HttpStatus.CREATED)
  @PostMapping
  public BookResponse createBook(@Valid @RequestBody CreateBookRequest createBookRequest) {
  Author author = authorService.validateAndGetAuthorById(createBookRequest.authorId());
- Book book = bookMapper.toBook(createBookRequest);
+ Book book = Book.from(createBookRequest);
  book.setAuthor(author);
  book = bookService.saveBook(book);
- return bookMapper.toBookResponse(book);
+ return BookResponse.from(book);
  }
 
  @PutMapping("/{bookId}")
  public BookResponse updateBook(@PathVariable Long bookId, @Valid @RequestBody UpdateBookRequest updateBookRequest) {
  Book book = bookService.validateAndGetBookById(bookId);
- bookMapper.updateBookFromRequest(updateBookRequest, book);
+ Book.updateFrom(updateBookRequest, book);
  Long authorId = updateBookRequest.authorId();
  if (authorId != null) {
  Author author = authorService.validateAndGetAuthorById(authorId);
  book.setAuthor(author);
  }
  book = bookService.saveBook(book);
- return bookMapper.toBookResponse(book);
+ return BookResponse.from(book);
  }
 
  @DeleteMapping("/{bookId}")
  public BookResponse deleteBook(@PathVariable Long bookId) {
  Book book = bookService.validateAndGetBookById(bookId);
  bookService.deleteBook(book);
- return bookMapper.toBookResponse(book);
+ return BookResponse.from(book);
  }
 
  @GetMapping("/{bookId}/reviews")

author-book-api/src/main/java/com/ivanfranchin/authorbookapi/restapi/AuthorController.java

@@ -1,4 +1,10 @@
 package com.ivanfranchin.authorbookapi.restapi.dto;
 
+import com.ivanfranchin.authorbookapi.model.Author;
+
 public record AuthorResponse(Long id, String name) {
+
+ public static AuthorResponse from(Author author) {
+ return new AuthorResponse(author.getId(), author.getName());
+ }
 }

author-book-api/src/main/java/com/ivanfranchin/authorbookapi/restapi/BookController.java

@@ -1,4 +1,10 @@
 package com.ivanfranchin.authorbookapi.restapi.dto;
 
+import com.ivanfranchin.authorbookapi.model.Book;
+
 public record BookResponse(Long id, String isbn, String title, Integer year) {
+
+ public static BookResponse from(Book book) {
+ return new BookResponse(book.getId(), book.getIsbn(), book.getTitle(), book.getYear());
+ }
 }