📍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:
abstract-document/src
main
java
com
iluwatar
abstractdocument
test
java
com
iluwatar
abstractdocument
abstract-factory/src
main
java
com
iluwatar
abstractfactory
test
java
com
iluwatar
abstractfactory
acyclic-visitor/src
main
java
com
iluwatar
test
java
com
adapter
aggregator-microservices
aggregator-service
src
main
java
com
iluwatar
aggregator
test
java
com
iluwatar
aggregator
microservices
information-microservice
src
main
java
com
iluwatar
information
microservice
test
java
com
iluwatar
information
microservice
inventory-microservice
src
main
java
com
iluwatar
inventory
microservice
test
java
com
iluwatar
inventory
microservice
ambassador
api-gateway
api-gateway-service
src
main
java
test
java
com
iluwatar
api
gateway
image-microservice
src
main
java
com
iluwatar
image
microservice
test
java
com
iluwatar
image
microservice
price-microservice
src
main
java
com
iluwatar
price
microservice
test
java
com
iluwatar
price
microservice
arrange-act-assert
async-method-invocation/src/main/java/com/iluwatar/async/method/invocation
balking/src/main/java/com/iluwatar/balking
bridge/src/main/java/com/iluwatar/bridge
builder/src
main
java
com
iluwatar
test
java
com
iluwatar
builder
business-delegate/src
main
java
com
iluwatar
test
java
com
iluwatar
business
delegate
bytecode/src
main
java
com
iluwatar
test
java
com
iluwatar
caching/src/main/java/com/iluwatar/caching
callback
README.md
src
chain
circuit-breaker
collection-pipeline/src
main
java
com
iluwatar
collectionpipeline
test
java
com
iluwatar
collectionpipeline
combinator/src
main
java
com
iluwatar
combinator
test
java
com
iluwatar
command
commander/src/main/java/com/iluwatar/commander
composite/src
converter/src
main
java
com
iluwatar
test
java
com
iluwatar
converter
cqrs/src
main
java
com
iluwatar
cqrs
test
java
com
iluwatar
dao
data-bus
data-locality/src
main
java
com
test
java
com
iluwatar
data
locality
data-mapper/src
main
java
com
iluwatar
datamapper
test
java
com
iluwatar
datamapper
data-transfer-object/src
main
java
com
iluwatar
datatransfer
test
java
com
iluwatar
datatransfer
decorator
delegation/src
main
java
com
iluwatar
delegation
simple
test
java
com
iluwatar
delegation
simple
dependency-injection
dirty-flag/src/main/java/com/iluwatar/dirtyflag
double-buffer/src
main
java
com
iluwatar
doublebuffer
test
java
com
iluwatar
doublebuffer
double-checked-locking/src
main
java
com
iluwatar
doublechecked
locking
test
java
com
iluwatar
doublechecked
locking
double-dispatch/src
main
java
com
iluwatar
doubledispatch
test
java
eip-aggregator
eip-message-channel/src/main/java/com/iluwatar/eip/message/channel
eip-publish-subscribe/src/main/java/com/iluwatar/eip/publish/subscribe
eip-splitter
eip-wire-tap
event-aggregator/src
main
java
com
iluwatar
event
aggregator
test
event-asynchronous/src
main
java
com
iluwatar
event
asynchronous
test
java
com
iluwatar
event
asynchronous
event-driven-architecture/src
main
java
com
iluwatar
test
java
com
iluwatar
eda
event-queue/src
main
java
com
iluwatar
event
test
java
com
iluwatar
event
queue
event-sourcing/src
main
java
com
iluwatar
event
test
execute-around/src/test/java/com/iluwatar/execute/around
extension-objects/src
main
java
test
facade
factory-kit/src
main
java
com
iluwatar
factorykit
test
java
com
iluwatar
factorykit
factorykit
factory-method/src
main
java
com
test
java
com
iluwatar
factory
method
factory/src
main
java
com
iluwatar
test
java
com
iluwatar
feature-toggle/src
main
java
com
iluwatar
featuretoggle
test
java
com
iluwatar
featuretoggle
pattern
propertiesversion
tieredversion
user
filterer/src
main
java
test
java
com
iluwatar
fluentinterface/src
main
java
com
iluwatar
fluentinterface
test
java
com
iluwatar
fluentinterface
fluentiterable
flux/src
main
java
com
iluwatar
test
java
com
iluwatar
flyweight
front-controller/src
main
java
com
iluwatar
front
test
java
com
iluwatar
front
controller
game-loop/src
main
java
com
iluwatar
gameloop
test
guarded-suspension/src
main
java
com
iluwatar
guarded
suspension
test
java
com
iluwatar
guarded
suspension
half-sync-half-async/src
main
java
com
iluwatar
halfsynchalfasync
test
java
com
iluwatar
halfsynchalfasync
hexagonal/src
main
java
com
iluwatar
test
java
com
iluwatar
hexagonal
database
intercepting-filter/src/test/java/com/iluwatar/intercepting/filter
interpreter/src/main/java/com/iluwatar/interpreter
iterator/src/main/java/com/iluwatar/iterator
layers
lazy-loading/src
main
java
com
iluwatar
test
java
com
iluwatar
lazy
leader-election/src
main
java
com
iluwatar
leaderelection
test
java
com
iluwatar
leader-followers/src
main
java
com
iluwatar
leaderfollowers
test
marker/src
master-worker-pattern/src/main/java/com/iluwatar/masterworker
mediator/src
memento/src
model-view-controller/src
main
java
com
iluwatar
model
view
controller
test
java
com
iluwatar
model
model-view-presenter/src/test/java/com/iluwatar/model/view/presenter
module/src
main
java
com
iluwatar
test
java
com
iluwatar
monad/src
monostate/src
main
java
com
iluwatar
monostate
test
java
com
iluwatar
monostate
multiton/src
main
java
com
iluwatar
multiton
test
java
com
iluwatar
mute-idiom/src/main/java/com/iluwatar/mute
naked-objects
dom
src
test
java
domainapp
dom
modules
integtests
src
test
java
domainapp
integtests
webapp
src
main
java
domainapp
webapp
null-object
object-mother/src/test/java/com/iluwatar/objectmother/test
object-pool/src
main
java
com
iluwatar
object
pool
test
java
com
iluwatar
object
observer
page-object
sample-application
src
main
java
com
iluwatar
pageobject
src
test
java
com
iluwatar
test-automation
src
main
java
com
iluwatar
test
java
com
iluwatar
partial-response/src/main/java/com/iluwatar/partialresponse
pipeline/src/test/java/com/iluwatar/pipeline
poison-pill/src
main
java
com
iluwatar
poison
test
java
com
priority-queue
private-class-data
producer-consumer/src
main
java
com
iluwatar
producer
consumer
test
java
com
iluwatar
producer
promise/src
property/src
prototype/src
main
java
test
java
com
iluwatar
prototype
proxy
queue-load-leveling/src
main
java
com
iluwatar
test
java
com
iluwatar
queue
load
reactor/src
main
java
com
iluwatar
test
java
com
iluwatar
reactor
reader-writer-lock/src
main
java
com
iluwatar
reader
test
java
com
iluwatar
reader
registry/src/test/java/com/iluwatar/registry
repository
resource-acquisition-is-initialization/src
main
java
com
iluwatar
resource
acquisition
is
initialization
test
java
com
iluwatar
resource
acquisition
is
initialization
retry/src/test/java/com/iluwatar/retry
role-object/src
main
java
com
iluwatar
roleobject
test
java
com
iluwatar
roleobject
saga/src
main
java
com
iluwatar
saga
test
java
com
iluwatar
saga
separated-interface/src
main
java
com
iluwatar
separatedinterface
test
java
com
iluwatar
separatedinterface
servant/src
main
java
com
iluwatar
servant
test
java
com
iluwatar
serverless/src/main/java/com/iluwatar/serverless
service-layer/src
main
java
com
iluwatar
servicelayer
test
java
com
iluwatar
servicelayer
common
magic
spell
spellbook
wizard
service-locator/src
main
java
com
iluwatar
servicelocator
test
java
com
iluwatar
servicelocator
sharding/src
main
java
test
java
com
iluwatar
sharding
singleton/src
main
java
com
iluwatar
test
java
com
iluwatar
singleton
spatial-partition/src/main/java/com/iluwatar/spatialpartition
special-case/src/main/java/com/iluwatar/specialcase
specification/src
main
test
java
com
iluwatar
state
README.md
src
step-builder/src
strangler/src
main
java
test
strategy
subclass-sandbox/src
main
java
com
iluwatar
subclasssandbox
test
java
com
iluwatar
subclasssandbox
template-method
thread-pool
throttling
tls/src
main
java
com
iluwatar
test
tolerant-reader/src
main
java
com
iluwatar
test
java
com
iluwatar
tolerantreader
trampoline/src
transaction-script
twin/src
main
java
com
iluwatar
test
java
com
iluwatar
typeobjectpattern/src/main/java/com/iluwatar/typeobject
unit-of-work
update-method/src
main
java
com
iluwatar
test
java
com
iluwatar
updatemethod
value-object/src
visitor
zh
@@ -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