From 86df819f0fe001b0a4031fc75a49518f2dd5db0a Mon Sep 17 00:00:00 2001 From: Alexey Zinchenko Date: Mon, 27 May 2019 22:27:09 +0300 Subject: [PATCH] Small refactoring. --- .../carrepair/CarRepairApplication.java | 3 +- .../carrepair/demo/DemoDataPopulator.java | 32 +++++++++++-------- .../carrepair/service/ClientService.java | 2 +- .../carrepair/service/OrderService.java | 1 - 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/github/prominence/carrepair/CarRepairApplication.java b/src/main/java/com/github/prominence/carrepair/CarRepairApplication.java index f1cefde..9ea4a9d 100644 --- a/src/main/java/com/github/prominence/carrepair/CarRepairApplication.java +++ b/src/main/java/com/github/prominence/carrepair/CarRepairApplication.java @@ -11,5 +11,4 @@ public class CarRepairApplication { SpringApplication.run(CarRepairApplication.class, args); } -} -// TODO: big data \ No newline at end of file +} \ No newline at end of file diff --git a/src/main/java/com/github/prominence/carrepair/demo/DemoDataPopulator.java b/src/main/java/com/github/prominence/carrepair/demo/DemoDataPopulator.java index 31aecfa..b3af89b 100644 --- a/src/main/java/com/github/prominence/carrepair/demo/DemoDataPopulator.java +++ b/src/main/java/com/github/prominence/carrepair/demo/DemoDataPopulator.java @@ -27,7 +27,7 @@ import java.util.stream.Stream; @Component public class DemoDataPopulator { - private static final int COUNT = 100; + private static final int DEMO_ENTRIES_COUNT = 100; private static final int DEFAULT_PAGE_SIZE = 10; private final Logger logger = LogManager.getLogger(DemoDataPopulator.class); @@ -35,32 +35,36 @@ public class DemoDataPopulator { @Bean public CommandLineRunner clientDemoData(ClientService clientService) { - List demoClientList = Stream.generate(() -> { + Stream demoClientList = Stream.generate(() -> { Client client = new Client(); client.setFirstName(faker.name().firstName()); client.setLastName(faker.name().lastName()); client.setMiddleName(faker.name().username()); client.setPhoneNo(faker.phoneNumber().phoneNumber()); return client; - }).limit(COUNT).collect(Collectors.toList()); - logger.info("[Demo Data] Populated {} clients.", demoClientList::size); + }).parallel().limit(DEMO_ENTRIES_COUNT); - return args -> demoClientList.forEach(clientService::save); + return args -> { + demoClientList.forEach(clientService::save); + logger.info("[Demo Data] Populated {} clients.", DEMO_ENTRIES_COUNT); + }; } @Bean public CommandLineRunner mechanicDemoData(MechanicService mechanicService) { - List demoMechanicList = Stream.generate(() -> { + Stream demoMechanicList = Stream.generate(() -> { Mechanic mechanic = new Mechanic(); mechanic.setFirstName(faker.name().firstName()); mechanic.setLastName(faker.name().lastName()); mechanic.setMiddleName(faker.name().username()); mechanic.setHourlyPayment(BigDecimal.valueOf(faker.number().randomDouble(3, 100, 999))); return mechanic; - }).limit(COUNT).collect(Collectors.toList()); - logger.info("[Demo Data] Populated {} mechanics.", demoMechanicList::size); + }).parallel().limit(DEMO_ENTRIES_COUNT); - return args -> demoMechanicList.forEach(mechanicService::save); + return args -> { + demoMechanicList.forEach(mechanicService::save); + logger.info("[Demo Data] Populated {} mechanics.", DEMO_ENTRIES_COUNT); + }; } @Bean @@ -71,7 +75,7 @@ public class DemoDataPopulator { if (mechanicsCount == 0 || clientsCount == 0) return args -> {}; - List demoOrderList = Stream.generate(() -> { + Stream demoOrderList = Stream.generate(() -> { Order order = new Order(); order.setOrderStatus(orderStatuses[RandomUtils.nextInt(0, 3)]); order.setDescription(faker.lorem().characters(10, 1024)); @@ -91,10 +95,12 @@ public class DemoDataPopulator { order.setMechanic(randomMechanic); return order; - }).limit(COUNT).collect(Collectors.toList()); - logger.info("[Demo Data] Populated {} orders.", demoOrderList::size); + }).parallel().limit(DEMO_ENTRIES_COUNT); - return args -> demoOrderList.forEach(orderService::save); + return args -> { + demoOrderList.forEach(orderService::save); + logger.info("[Demo Data] Populated {} orders.", DEMO_ENTRIES_COUNT); + }; } private Pageable getRandomPageable(long totalRecords) { diff --git a/src/main/java/com/github/prominence/carrepair/service/ClientService.java b/src/main/java/com/github/prominence/carrepair/service/ClientService.java index c381888..1221d7b 100644 --- a/src/main/java/com/github/prominence/carrepair/service/ClientService.java +++ b/src/main/java/com/github/prominence/carrepair/service/ClientService.java @@ -76,7 +76,7 @@ public class ClientService { } public Page convertToDtoPage(Page clientPage) { - final Page clientDtoPage = new PageImpl<> (clientMapper.clientsToClientDtoList(clientPage.getContent()), + final Page clientDtoPage = new PageImpl<>(clientMapper.clientsToClientDtoList(clientPage.getContent()), clientPage.getPageable(), clientPage.getTotalElements()); logger.trace("Dto page: {}.", () -> clientDtoPage); return clientDtoPage; diff --git a/src/main/java/com/github/prominence/carrepair/service/OrderService.java b/src/main/java/com/github/prominence/carrepair/service/OrderService.java index b381efd..3195a83 100644 --- a/src/main/java/com/github/prominence/carrepair/service/OrderService.java +++ b/src/main/java/com/github/prominence/carrepair/service/OrderService.java @@ -13,7 +13,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; import org.springframework.validation.BindingResult; -import org.springframework.validation.SmartValidator; import java.util.Optional;