iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BAEL-7547: formatting & code review

This commit is contained in:
emanuel.trandafir 2024-03-28 10:49:04 +01:00
parent 9502473ac2
commit 7d14d37fda
7 changed files with 102 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
spring-boot-modules/spring-boot-libraries-3/pom.xml
View File

@ -17,7 +17,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId> <artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.kafka</groupId> <groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId> <artifactId>spring-kafka</artifactId>
@ -28,20 +27,27 @@
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<version>${postgresql.version}</version> <version>${postgresql.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.modulith</groupId> <groupId>org.springframework.modulith</groupId>
<artifactId>spring-modulith-events-api</artifactId> <artifactId>spring-modulith-events-api</artifactId>
<version>${spring-modulith-events-kafka.version}</version> <version>${spring-modulith.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.modulith</groupId> <groupId>org.springframework.modulith</groupId>
<artifactId>spring-modulith-events-kafka</artifactId> <artifactId>spring-modulith-events-kafka</artifactId>
<version>${spring-modulith-events-kafka.version}</version> <version>${spring-modulith.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.modulith</groupId> <groupId>org.springframework.modulith</groupId>
<artifactId>spring-modulith-starter-jpa</artifactId> <artifactId>spring-modulith-starter-jpa</artifactId>
<version>${spring-modulith-events-kafka.version}</version> <version>${spring-modulith.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.modulith</groupId>
<artifactId>spring-modulith-starter-test</artifactId>
<version>${spring-modulith.version}</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -54,20 +60,6 @@
<artifactId>spring-boot-testcontainers</artifactId> <artifactId>spring-boot-testcontainers</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.modulith</groupId>
<artifactId>spring-modulith-starter-test</artifactId>
<version>1.1.3</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.2.224</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.testcontainers</groupId> <groupId>org.testcontainers</groupId>
<artifactId>kafka</artifactId> <artifactId>kafka</artifactId>
@ -86,7 +78,6 @@
<version>${testcontainers.version}</version> <version>${testcontainers.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.testcontainers</groupId> <groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
@ -100,16 +91,23 @@
<version>${awaitility.version}</version> <version>${awaitility.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<properties> <properties>
<java.version>17</java.version> <java.version>17</java.version>
<spring-boot.version>3.1.5</spring-boot.version> <spring-boot.version>3.1.5</spring-boot.version>
<spring-modulith-events-kafka.version>1.1.2</spring-modulith-events-kafka.version> <spring-modulith.version>1.1.3</spring-modulith.version>
<testcontainers.version>1.19.3</testcontainers.version> <testcontainers.version>1.19.3</testcontainers.version>
<awaitility.version>4.2.0</awaitility.version> <awaitility.version>4.2.0</awaitility.version>
<postgresql.version>42.3.1</postgresql.version> <postgresql.version>42.3.1</postgresql.version>
<h2.version>2.2.224</h2.version>
</properties> </properties>
</project> </project>

6
spring-boot-modules/spring-boot-libraries-3/src/main/java/com/baeldung/springmodulith/application/events/orders/Order.java
View File

@ -5,8 +5,8 @@ import java.util.List;
record Order(String id, String customerId, List<String> productIds, Instant timestamp) { record Order(String id, String customerId, List<String> productIds, Instant timestamp) {
public Order(String customerId, List<String> productIds) { public Order(String customerId, List<String> productIds) {
this(null, customerId, productIds, Instant.now()); this(null, customerId, productIds, Instant.now());
} }
} }

28
spring-boot-modules/spring-boot-libraries-3/src/main/java/com/baeldung/springmodulith/application/events/orders/OrderRepository.java
View File

@ -1,25 +1,27 @@
package com.baeldung.springmodulith.application.events.orders; package com.baeldung.springmodulith.application.events.orders;
import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import org.springframework.stereotype.Component;
@Component @Component
class OrderRepository { class OrderRepository {
private final List<Order> orders = new ArrayList<>(); private final List<Order> orders = new ArrayList<>();
public Order save(Order order) { public Order save(Order order) {
order = new Order(UUID.randomUUID().toString(), order.customerId(), order.productIds(), order.timestamp()); order = new Order(UUID.randomUUID()
orders.add(order); .toString(), order.customerId(), order.productIds(), order.timestamp());
return order; orders.add(order);
} return order;
}
public List<Order> ordersByCustomer(String customerId) { public List<Order> ordersByCustomer(String customerId) {
return orders.stream() return orders.stream()
.filter(it -> it.customerId().equals(customerId)) .filter(it -> it.customerId()
.toList(); .equals(customerId))
} .toList();
}
} }

30
spring-boot-modules/spring-boot-libraries-3/src/main/java/com/baeldung/springmodulith/application/events/orders/OrderService.java
View File

@ -1,29 +1,29 @@
package com.baeldung.springmodulith.application.events.orders; package com.baeldung.springmodulith.application.events.orders;
import java.util.Arrays;
import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Arrays;
@Service @Service
public class OrderService { public class OrderService {
private final OrderRepository repository; private final OrderRepository repository;
private final ApplicationEventPublisher eventPublisher; private final ApplicationEventPublisher eventPublisher;
public OrderService(OrderRepository orders, ApplicationEventPublisher eventsPublisher) { public OrderService(OrderRepository orders, ApplicationEventPublisher eventsPublisher) {
this.repository = orders; this.repository = orders;
this.eventPublisher = eventsPublisher; this.eventPublisher = eventsPublisher;
} }
public void placeOrder(String customerId, String... productIds) { public void placeOrder(String customerId, String... productIds) {
Order order = new Order(customerId, Arrays.asList(productIds)); Order order = new Order(customerId, Arrays.asList(productIds));
// business logic to validate and place the order // business logic to validate and place the order
Order savedOrder = repository.save(order); Order savedOrder = repository.save(order);
OrderCompletedEvent event = new OrderCompletedEvent(savedOrder.id(), savedOrder.customerId(), savedOrder.timestamp()); OrderCompletedEvent event = new OrderCompletedEvent(savedOrder.id(), savedOrder.customerId(), savedOrder.timestamp());
eventPublisher.publishEvent(event); eventPublisher.publishEvent(event);
} }
} }

52
spring-boot-modules/spring-boot-libraries-3/src/main/java/com/baeldung/springmodulith/application/events/rewards/LoyalCustomersRepository.java
View File

@ -1,44 +1,44 @@
package com.baeldung.springmodulith.application.events.rewards; package com.baeldung.springmodulith.application.events.rewards;
import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import org.springframework.stereotype.Component;
@Component @Component
public class LoyalCustomersRepository { public class LoyalCustomersRepository {
private List<LoyalCustomer> customers = new ArrayList<>(); private List<LoyalCustomer> customers = new ArrayList<>();
public Optional<LoyalCustomer> find(String customerId) { public Optional<LoyalCustomer> find(String customerId) {
return customers.stream() return customers.stream()
.filter(it -> it.customerId().equals(customerId)) .filter(it -> it.customerId()
.findFirst(); .equals(customerId))
} .findFirst();
}
public void awardPoints(String customerId, int points) { public void awardPoints(String customerId, int points) {
var customer = find(customerId) var customer = find(customerId).orElseGet(() -> save(new LoyalCustomer(customerId, 0)));
.orElseGet(() -> save(new LoyalCustomer(customerId, 0)));
customers.remove(customer); customers.remove(customer);
customers.add(customer.addPoints(points)); customers.add(customer.addPoints(points));
} }
public LoyalCustomer save(LoyalCustomer customer) { public LoyalCustomer save(LoyalCustomer customer) {
customers.add(customer); customers.add(customer);
return customer; return customer;
} }
public boolean isLoyalCustomer(String customerId) { public boolean isLoyalCustomer(String customerId) {
return find(customerId).isPresent(); return find(customerId).isPresent();
} }
public record LoyalCustomer(String customerId, int points) { public record LoyalCustomer(String customerId, int points) {
LoyalCustomer addPoints(int points) { LoyalCustomer addPoints(int points) {
return new LoyalCustomer(customerId, this.points() + points); return new LoyalCustomer(customerId, this.points() + points);
} }
} }
} }

23
spring-boot-modules/spring-boot-libraries-3/src/main/java/com/baeldung/springmodulith/application/events/rewards/LoyaltyPointsService.java
View File

@ -1,23 +1,24 @@
package com.baeldung.springmodulith.application.events.rewards; package com.baeldung.springmodulith.application.events.rewards;
import com.baeldung.springmodulith.application.events.orders.OrderCompletedEvent;
import org.springframework.context.event.EventListener; import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baeldung.springmodulith.application.events.orders.OrderCompletedEvent;
@Service @Service
public class LoyaltyPointsService { public class LoyaltyPointsService {
public static final int ORDER_COMPLETED_POINTS = 60; public static final int ORDER_COMPLETED_POINTS = 60;
private final LoyalCustomersRepository loyalCustomers; private final LoyalCustomersRepository loyalCustomers;
public LoyaltyPointsService(LoyalCustomersRepository loyalCustomers) { public LoyaltyPointsService(LoyalCustomersRepository loyalCustomers) {
this.loyalCustomers = loyalCustomers; this.loyalCustomers = loyalCustomers;
} }
@EventListener @EventListener
public void onOrderCompleted(OrderCompletedEvent event) { public void onOrderCompleted(OrderCompletedEvent event) {
// business logic to award points to loyal customers // business logic to award points to loyal customers
loyalCustomers.awardPoints(event.customerId(), ORDER_COMPLETED_POINTS); loyalCustomers.awardPoints(event.customerId(), ORDER_COMPLETED_POINTS);
} }
} }

28
spring-boot-modules/spring-boot-libraries-3/src/test/java/com/baeldung/springmodulith/application/events/EventListenerUnitTest.java
View File

@ -4,12 +4,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.time.Instant; import java.time.Instant;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.ComponentScan;
import com.baeldung.springmodulith.application.events.orders.OrderCompletedEvent; import com.baeldung.springmodulith.application.events.orders.OrderCompletedEvent;
import com.baeldung.springmodulith.application.events.rewards.LoyalCustomersRepository; import com.baeldung.springmodulith.application.events.rewards.LoyalCustomersRepository;
@ -17,22 +15,22 @@ import com.baeldung.springmodulith.application.events.rewards.LoyalCustomersRepo
@SpringBootTest @SpringBootTest
class EventListenerUnitTest { class EventListenerUnitTest {
@Autowired @Autowired
private LoyalCustomersRepository customers; private LoyalCustomersRepository customers;
@Autowired @Autowired
private ApplicationEventPublisher testEventPublisher; private ApplicationEventPublisher testEventPublisher;
@Test @Test
void whenPublishingOrderCompletedEvent_thenRewardCustomerWithLoyaltyPoints() { void whenPublishingOrderCompletedEvent_thenRewardCustomerWithLoyaltyPoints() {
OrderCompletedEvent event = new OrderCompletedEvent("order-1", "customer-1", Instant.now()); OrderCompletedEvent event = new OrderCompletedEvent("order-1", "customer-1", Instant.now());
testEventPublisher.publishEvent(event); testEventPublisher.publishEvent(event);
assertThat(customers.find("customer-1")) assertThat(customers.find("customer-1"))
.isPresent().get() .isPresent().get()
.hasFieldOrPropertyWithValue("customerId", "customer-1") .hasFieldOrPropertyWithValue("customerId", "customer-1")
.hasFieldOrPropertyWithValue("points", 60); .hasFieldOrPropertyWithValue("points", 60);
} }
} }