-
Notifications
You must be signed in to change notification settings - Fork 438
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
Hw 23 solution #382
Open
ipantazi
wants to merge
9
commits into
mate-academy:main
Choose a base branch
from
ipantazi:hw-23-solution
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Hw 23 solution #382
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
1815684
Created `init_db.sql`, Classes: `BookDaoImpl`, `ConnectionUtilImpl`, …
ipantazi 2f9705e
Created `init_db.sql`, Classes: `BookDaoImpl`, `ConnectionUtilImpl`, …
ipantazi 21c5b9a
Created `init_db.sql`, Classes: `BookDaoImpl`, `ConnectionUtilImpl`, …
ipantazi fa9ae0b
Edit Classes `Main`, `ConnectionUtilImpl`, `Book`, `BookDaoImpl`.
ipantazi 6a36b98
Corrected style.
ipantazi 43c2fd5
Corrected code in Classes `BookDaoImpl` and `ConnectionUtilImpl`.
ipantazi f8f6563
Delete Classes `Entity` and `Table`.
ipantazi 8c06edb
Correct style.
ipantazi 340d320
Corrected mistakes.
ipantazi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,47 @@ | ||
package mate.academy; | ||
|
||
import java.math.BigDecimal; | ||
import java.util.ArrayList; | ||
import java.util.List; | ||
import java.util.Map; | ||
import mate.academy.dao.BookDao; | ||
import mate.academy.lib.Injector; | ||
import mate.academy.models.Book; | ||
import mate.academy.service.BookService; | ||
import mate.academy.service.BookServiceImpl; | ||
|
||
public class Main { | ||
private static final Injector injector = Injector | ||
.getInstance("mate.academy"); | ||
private static final BigDecimal NEW_PRICE = new BigDecimal("120.50"); | ||
|
||
public static void main(String[] args) { | ||
BookDao bookDao = (BookDao) injector.getInstance(BookDao.class); | ||
BookService bookService = new BookServiceImpl(bookDao); | ||
|
||
List<Book> savedBooks = new ArrayList<>(); | ||
Map.of("Java", new BigDecimal(300), | ||
"Python", new BigDecimal(200), | ||
"C++", new BigDecimal(100)) | ||
.forEach((key, value) -> { | ||
Book currentBook = new Book(); | ||
currentBook.setTitle(key); | ||
currentBook.setPrice(value); | ||
savedBooks.add(bookService.save(currentBook)); | ||
}); | ||
System.out.println("savedBooks = " + savedBooks); | ||
|
||
Book book = bookService.get(2L); | ||
System.out.printf("Method get return: " + book); | ||
|
||
book.setPrice(book.getPrice().multiply(NEW_PRICE)); | ||
book = bookService.update(book); | ||
System.out.printf("Method update return: " + book); | ||
|
||
boolean isDeleteBook = bookService.delete(savedBooks.get(0)); | ||
System.out.printf("Method delete return: " + isDeleteBook); | ||
|
||
List<Book> bookList2 = bookService.getAll(); | ||
System.out.printf("Method getAll return: " + bookList2.toString()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package mate.academy.dao; | ||
|
||
import java.util.List; | ||
import java.util.Optional; | ||
import mate.academy.models.Book; | ||
|
||
public interface BookDao { | ||
|
||
Book create(Book book); | ||
|
||
Optional<Book> findById(Long id); | ||
|
||
List<Book> findAll(); | ||
|
||
Book update(Book book); | ||
|
||
boolean deleteById(Long id); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,122 @@ | ||||||
package mate.academy.dao; | ||||||
|
||||||
import java.math.BigDecimal; | ||||||
import java.sql.PreparedStatement; | ||||||
import java.sql.ResultSet; | ||||||
import java.sql.SQLException; | ||||||
import java.sql.Statement; | ||||||
import java.util.ArrayList; | ||||||
import java.util.List; | ||||||
import java.util.Optional; | ||||||
import mate.academy.exceptions.DataProcessingException; | ||||||
import mate.academy.lib.Dao; | ||||||
import mate.academy.models.Book; | ||||||
|
||||||
@Dao | ||||||
public class BookDaoImpl implements BookDao { | ||||||
@Override | ||||||
public Book create(Book book) { | ||||||
String sql = "INSERT INTO books (title, price) VALUE (?, ?)"; | ||||||
try (PreparedStatement prepareStatement = ConnectionUtilImpl.getConnection() | ||||||
.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { | ||||||
|
||||||
prepareStatement.setString(1, book.getTitle()); | ||||||
prepareStatement.setBigDecimal(2, book.getPrice()); | ||||||
|
||||||
if (prepareStatement.executeUpdate() > 1) { | ||||||
book.setId(getIdFromResultSet(prepareStatement.getGeneratedKeys())); | ||||||
return book; | ||||||
} | ||||||
throw new DataProcessingException("Can't save the new book: " + book); | ||||||
} catch (SQLException e) { | ||||||
throw new DataProcessingException("Can't save a book: " + book, e); | ||||||
} | ||||||
} | ||||||
|
||||||
@Override | ||||||
public Optional<Book> findById(Long id) { | ||||||
String sql = "SELECT * FROM books WHERE id = ?"; | ||||||
try (PreparedStatement prepareStatement = ConnectionUtilImpl.getConnection() | ||||||
.prepareStatement(sql)) { | ||||||
|
||||||
prepareStatement.setLong(1, id); | ||||||
|
||||||
return getBookFromResultSet(prepareStatement.executeQuery()); | ||||||
} catch (SQLException e) { | ||||||
throw new DataProcessingException("Can't get a book by id: " + id, e); | ||||||
} | ||||||
} | ||||||
|
||||||
@Override | ||||||
public List<Book> findAll() { | ||||||
String sql = "SELECT * FROM books"; | ||||||
try (PreparedStatement prepareStatement = ConnectionUtilImpl.getConnection() | ||||||
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
It's more efficient to use Statement, if there are no ?-parameters |
||||||
.prepareStatement(sql)) { | ||||||
|
||||||
return getAllFromResultSet(prepareStatement.executeQuery()); | ||||||
} catch (SQLException e) { | ||||||
throw new DataProcessingException("Can't get any books from the database", e); | ||||||
} | ||||||
} | ||||||
|
||||||
@Override | ||||||
public Book update(Book book) { | ||||||
String sql = "UPDATE books SET title = ?, price = ?) WHERE id = ?"; | ||||||
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
|
||||||
try (PreparedStatement prepareStatement = ConnectionUtilImpl.getConnection() | ||||||
.prepareStatement(sql)) { | ||||||
|
||||||
prepareStatement.setString(1, book.getTitle()); | ||||||
prepareStatement.setBigDecimal(2, book.getPrice()); | ||||||
prepareStatement.setLong(3, book.getId()); | ||||||
|
||||||
if (prepareStatement.executeUpdate() > 1) { | ||||||
return book; | ||||||
} | ||||||
throw new DataProcessingException("Can't update the book: " + book); | ||||||
} catch (SQLException e) { | ||||||
throw new DataProcessingException("Can't update the book: " + book, e); | ||||||
} | ||||||
} | ||||||
|
||||||
@Override | ||||||
public boolean deleteById(Long id) { | ||||||
String sql = "DELETE FROM books WHERE id = ?"; | ||||||
try (PreparedStatement prepareStatement = ConnectionUtilImpl.getConnection() | ||||||
.prepareStatement(sql)) { | ||||||
|
||||||
prepareStatement.setLong(1, id); | ||||||
|
||||||
return prepareStatement.executeUpdate() > 1; | ||||||
} catch (SQLException e) { | ||||||
throw new DataProcessingException("Can't delete the book by id: " + id, e); | ||||||
} | ||||||
} | ||||||
|
||||||
private Long getIdFromResultSet(ResultSet generatedKeys) throws SQLException { | ||||||
if (generatedKeys.next()) { | ||||||
return generatedKeys.getObject(1, Long.class); | ||||||
} | ||||||
throw new DataProcessingException("Can't writing the book to the database, missing ID"); | ||||||
} | ||||||
|
||||||
private Optional<Book> getBookFromResultSet(ResultSet resultSet) throws SQLException { | ||||||
if (resultSet.next()) { | ||||||
Book book = new Book(); | ||||||
|
||||||
book.setId(resultSet.getObject("id", Long.class)); | ||||||
book.setTitle(resultSet.getString("title")); | ||||||
book.setPrice(resultSet.getObject("price", BigDecimal.class)); | ||||||
|
||||||
return Optional.of(book); | ||||||
} | ||||||
return Optional.empty(); | ||||||
} | ||||||
|
||||||
private List<Book> getAllFromResultSet(ResultSet resultSet) throws SQLException { | ||||||
List<Book> bookList = new ArrayList<>(); | ||||||
do { | ||||||
getBookFromResultSet(resultSet).ifPresent(bookList::add); | ||||||
} while (resultSet.next()); | ||||||
return bookList; | ||||||
} | ||||||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
package mate.academy.dao; | ||
|
||
public interface ConnectionUtil { | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
package mate.academy.dao; | ||
|
||
import java.sql.Connection; | ||
import java.sql.DriverManager; | ||
import java.sql.SQLException; | ||
import java.util.Properties; | ||
|
||
public class ConnectionUtilImpl implements ConnectionUtil { | ||
private static final String USER = "root"; | ||
private static final String PASSWORD = "illya"; | ||
private static final String DB_URL = "jdbs.mysql://localhost:3306/my_db"; | ||
private static final Properties DB_PROPERTIES; | ||
|
||
static { | ||
DB_PROPERTIES = new Properties(); | ||
DB_PROPERTIES.put("user", USER); | ||
DB_PROPERTIES.put("password", PASSWORD); | ||
|
||
try { | ||
Class.forName("com.mysql.cj.jdbs.Driver"); | ||
} catch (ClassNotFoundException e) { | ||
throw new RuntimeException("Can not load JDBS driver", e); | ||
} | ||
} | ||
|
||
static Connection getConnection() throws SQLException { | ||
return DriverManager.getConnection(DB_URL, DB_PROPERTIES); | ||
} | ||
|
||
} |
12 changes: 12 additions & 0 deletions
12
src/main/java/mate/academy/exceptions/DataProcessingException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package mate.academy.exceptions; | ||
|
||
public class DataProcessingException extends RuntimeException { | ||
public DataProcessingException(String message) { | ||
super(message); | ||
} | ||
|
||
public DataProcessingException(String message, Throwable cause) { | ||
super(message, cause); | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,4 @@ | ||
package mate.academy.lib; | ||
|
||
import java.lang.annotation.Retention; | ||
import java.lang.annotation.RetentionPolicy; | ||
|
||
@Retention(RetentionPolicy.RUNTIME) | ||
public @interface Dao { | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
package mate.academy.models; | ||
|
||
import java.math.BigDecimal; | ||
|
||
public class Book { | ||
private Long id; | ||
private String title; | ||
private BigDecimal price; | ||
|
||
public Book() { | ||
} | ||
|
||
public Long getId() { | ||
return id; | ||
} | ||
|
||
public void setId(Long id) { | ||
this.id = id; | ||
} | ||
|
||
public String getTitle() { | ||
return title; | ||
} | ||
|
||
public void setTitle(String title) { | ||
this.title = title; | ||
} | ||
|
||
public BigDecimal getPrice() { | ||
return price; | ||
} | ||
|
||
public void setPrice(BigDecimal price) { | ||
this.price = price; | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
return "Book{" | ||
+ "id=" + id | ||
+ ", title='" + title + '\'' | ||
+ ", price=" + price | ||
+ '}'; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package mate.academy.service; | ||
|
||
import java.util.List; | ||
import mate.academy.models.Book; | ||
|
||
public interface BookService { | ||
Book save(Book book); | ||
|
||
Book get(Long id); | ||
|
||
List<Book> getAll(); | ||
|
||
Book update(Book book); | ||
|
||
boolean delete(Book book); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
package mate.academy.service; | ||
|
||
import java.util.List; | ||
import mate.academy.dao.BookDao; | ||
import mate.academy.exceptions.DataProcessingException; | ||
import mate.academy.models.Book; | ||
|
||
public class BookServiceImpl implements BookService { | ||
private final BookDao bookDao; | ||
|
||
public BookServiceImpl(BookDao bookDao) { | ||
if (bookDao == null) { | ||
throw new DataProcessingException("The argument (bookDao) is null"); | ||
} | ||
this.bookDao = bookDao; | ||
} | ||
|
||
@Override | ||
public Book save(Book book) { | ||
if (book == null) { | ||
throw new DataProcessingException("The argument (book) is null"); | ||
} | ||
return bookDao.create(book); | ||
} | ||
|
||
@Override | ||
public Book get(Long id) { | ||
if (id == null) { | ||
throw new DataProcessingException("The argument (id) is null"); | ||
} | ||
return bookDao.findById(id) | ||
.orElseThrow(() -> new DataProcessingException("Can't find a book with id: " | ||
+ id)); | ||
} | ||
|
||
@Override | ||
public List<Book> getAll() { | ||
List<Book> bookList = bookDao.findAll(); | ||
if (bookList.isEmpty()) { | ||
throw new DataProcessingException("Can't get any books from the database"); | ||
} | ||
return bookList; | ||
} | ||
|
||
@Override | ||
public Book update(Book book) { | ||
if (book == null) { | ||
throw new DataProcessingException("The argument (book) is null"); | ||
} | ||
return bookDao.update(book); | ||
} | ||
|
||
@Override | ||
public boolean delete(Book book) { | ||
if (book == null || book.getId() == null) { | ||
throw new DataProcessingException("The argument (book) or id is null"); | ||
} | ||
return bookDao.deleteById(book.getId()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
CREATE DATABASE `my_db`; | ||
USE my_db; | ||
CREATE TABLE books ( | ||
id BIGINT PRIMARY KEY, | ||
title VARCHAR(50), | ||
price DECIMAL(10,2) | ||
); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.