📍Use lombok, reformat, and optimize the code (#1560)
* Use lombok, reformat, and optimize the code * Fix merge conflicts and some sonar issues Co-authored-by: va1m <va1m@email.com>
This commit is contained in:
@ -67,7 +67,7 @@ public class App {
|
||||
|
||||
// Print room booking status
|
||||
getRoomStatus(dao);
|
||||
|
||||
|
||||
var hotel = new Hotel(dao);
|
||||
|
||||
// Book rooms
|
||||
|
@ -23,11 +23,10 @@
|
||||
|
||||
package com.iluwatar.transactionscript;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
@Slf4j
|
||||
public class Hotel {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
|
||||
|
||||
private final HotelDaoImpl hotelDao;
|
||||
|
||||
@ -65,7 +64,7 @@ public class Hotel {
|
||||
* @throws Exception if any error
|
||||
*/
|
||||
public void cancelRoomBooking(int roomNumber) throws Exception {
|
||||
|
||||
|
||||
var room = hotelDao.getById(roomNumber);
|
||||
|
||||
if (room.isEmpty()) {
|
||||
|
@ -33,11 +33,10 @@ import java.util.function.Consumer;
|
||||
import java.util.stream.Stream;
|
||||
import java.util.stream.StreamSupport;
|
||||
import javax.sql.DataSource;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
@Slf4j
|
||||
public class HotelDaoImpl implements HotelDao {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(App.class);
|
||||
|
||||
private final DataSource dataSource;
|
||||
|
||||
|
@ -23,9 +23,20 @@
|
||||
|
||||
package com.iluwatar.transactionscript;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
/**
|
||||
* A room POJO that represents the data that will be read from the data source.
|
||||
*/
|
||||
@Setter
|
||||
@Getter
|
||||
@ToString
|
||||
@EqualsAndHashCode
|
||||
@AllArgsConstructor
|
||||
public class Room {
|
||||
|
||||
private int id;
|
||||
@ -33,91 +44,4 @@ public class Room {
|
||||
private int price;
|
||||
private boolean booked;
|
||||
|
||||
/**
|
||||
* Create an instance of room.
|
||||
* @param id room id
|
||||
* @param roomType room type
|
||||
* @param price room price
|
||||
* @param booked room booking status
|
||||
*/
|
||||
public Room(int id, String roomType, int price, boolean booked) {
|
||||
this.id = id;
|
||||
this.roomType = roomType;
|
||||
this.price = price;
|
||||
this.booked = booked;
|
||||
}
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(int id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getRoomType() {
|
||||
return roomType;
|
||||
}
|
||||
|
||||
public void setRoomType(String roomType) {
|
||||
this.roomType = roomType;
|
||||
}
|
||||
|
||||
public int getPrice() {
|
||||
return price;
|
||||
}
|
||||
|
||||
public void setPrice(int price) {
|
||||
this.price = price;
|
||||
}
|
||||
|
||||
public boolean isBooked() {
|
||||
return booked;
|
||||
}
|
||||
|
||||
public void setBooked(boolean booked) {
|
||||
this.booked = booked;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) {
|
||||
return true;
|
||||
}
|
||||
if (o == null || getClass() != o.getClass()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
Room room = (Room) o;
|
||||
|
||||
if (id != room.id) {
|
||||
return false;
|
||||
}
|
||||
if (price != room.price) {
|
||||
return false;
|
||||
}
|
||||
if (booked != room.booked) {
|
||||
return false;
|
||||
}
|
||||
return roomType.equals(room.roomType);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
int result = id;
|
||||
result = 31 * result + roomType.hashCode();
|
||||
result = 31 * result + price;
|
||||
result = 31 * result + (booked ? 1 : 0);
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Room{"
|
||||
+ "id=" + id
|
||||
+ ", roomType=" + roomType
|
||||
+ ", price=" + price
|
||||
+ ", booked=" + booked
|
||||
+ '}';
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user