diff --git a/pom.xml b/pom.xml
index 0c01714..28d9035 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,18 @@
+
+ com.diffplug.spotless
+ spotless-maven-plugin
+ 2.43.0
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/example/nto/controller/BookingController.java b/src/main/java/com/example/nto/controller/BookingController.java
index a4ed8b1..7ae64a7 100644
--- a/src/main/java/com/example/nto/controller/BookingController.java
+++ b/src/main/java/com/example/nto/controller/BookingController.java
@@ -3,15 +3,14 @@ package com.example.nto.controller;
import com.example.nto.controller.dto.BookingCreateDto;
import com.example.nto.controller.dto.PlaceDto;
import com.example.nto.service.BookingService;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.time.LocalDate;
-import java.util.List;
-import java.util.Map;
-
@Validated
@RestController
@RequestMapping("api")
@@ -31,5 +30,4 @@ public class BookingController {
public void create(@PathVariable String code, @RequestBody BookingCreateDto bookingCreateDto) {
bookingService.create(code, bookingCreateDto);
}
-
}
diff --git a/src/main/java/com/example/nto/controller/EmployeeController.java b/src/main/java/com/example/nto/controller/EmployeeController.java
index 7f73702..e913fe8 100644
--- a/src/main/java/com/example/nto/controller/EmployeeController.java
+++ b/src/main/java/com/example/nto/controller/EmployeeController.java
@@ -1,6 +1,5 @@
package com.example.nto.controller;
-
import com.example.nto.controller.dto.EmployeeDto;
import com.example.nto.service.EmployeeService;
import lombok.RequiredArgsConstructor;
@@ -25,5 +24,4 @@ public class EmployeeController {
public EmployeeDto getByCode(@PathVariable String code) {
return employeeService.getByCode(code);
}
-
}
diff --git a/src/main/java/com/example/nto/controller/dto/BookingCreateDto.java b/src/main/java/com/example/nto/controller/dto/BookingCreateDto.java
index e2b7ddd..9dddc4b 100644
--- a/src/main/java/com/example/nto/controller/dto/BookingCreateDto.java
+++ b/src/main/java/com/example/nto/controller/dto/BookingCreateDto.java
@@ -2,20 +2,17 @@ package com.example.nto.controller.dto;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Positive;
+import java.time.LocalDate;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import java.time.LocalDate;
-
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class BookingCreateDto {
- @NotNull
- private LocalDate date;
- @Positive
- private long placeId;
+ @NotNull private LocalDate date;
+ @Positive private long placeId;
}
diff --git a/src/main/java/com/example/nto/controller/dto/EmployeeDto.java b/src/main/java/com/example/nto/controller/dto/EmployeeDto.java
index 3c87566..0053e88 100644
--- a/src/main/java/com/example/nto/controller/dto/EmployeeDto.java
+++ b/src/main/java/com/example/nto/controller/dto/EmployeeDto.java
@@ -2,15 +2,14 @@ package com.example.nto.controller.dto;
import com.example.nto.entity.Booking;
import com.example.nto.entity.Employee;
+import java.time.LocalDate;
+import java.util.Map;
+import java.util.TreeMap;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import java.time.LocalDate;
-import java.util.Map;
-import java.util.TreeMap;
-
@Data
@Builder
@NoArgsConstructor
diff --git a/src/main/java/com/example/nto/entity/Booking.java b/src/main/java/com/example/nto/entity/Booking.java
index a208eb9..b3d3ae4 100644
--- a/src/main/java/com/example/nto/entity/Booking.java
+++ b/src/main/java/com/example/nto/entity/Booking.java
@@ -1,13 +1,12 @@
package com.example.nto.entity;
import jakarta.persistence.*;
+import java.time.LocalDate;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import java.time.LocalDate;
-
@Data
@Entity
@Builder
diff --git a/src/main/java/com/example/nto/entity/Employee.java b/src/main/java/com/example/nto/entity/Employee.java
index e854a92..f0c4411 100644
--- a/src/main/java/com/example/nto/entity/Employee.java
+++ b/src/main/java/com/example/nto/entity/Employee.java
@@ -1,13 +1,12 @@
package com.example.nto.entity;
import jakarta.persistence.*;
+import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
-import java.util.List;
-
@Data
@Entity
@Builder
diff --git a/src/main/java/com/example/nto/exception/handler/GlobalExceptionHandler.java b/src/main/java/com/example/nto/exception/handler/GlobalExceptionHandler.java
index 234a158..1e605cc 100644
--- a/src/main/java/com/example/nto/exception/handler/GlobalExceptionHandler.java
+++ b/src/main/java/com/example/nto/exception/handler/GlobalExceptionHandler.java
@@ -16,7 +16,8 @@ public class GlobalExceptionHandler {
}
@ExceptionHandler(BookingAlreadyExistsException.class)
- public ResponseEntity handleBookingAlreadyExistsException(BookingAlreadyExistsException e) {
+ public ResponseEntity handleBookingAlreadyExistsException(
+ BookingAlreadyExistsException e) {
return new ResponseEntity<>(e.getMessage(), HttpStatus.CONFLICT);
}
diff --git a/src/main/java/com/example/nto/repository/BookingRepository.java b/src/main/java/com/example/nto/repository/BookingRepository.java
index 7d4093b..d19ba94 100644
--- a/src/main/java/com/example/nto/repository/BookingRepository.java
+++ b/src/main/java/com/example/nto/repository/BookingRepository.java
@@ -3,11 +3,10 @@ package com.example.nto.repository;
import com.example.nto.entity.Booking;
import com.example.nto.entity.Employee;
import com.example.nto.entity.Place;
-import org.springframework.data.jpa.repository.JpaRepository;
-
import java.time.LocalDate;
import java.util.List;
import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
public interface BookingRepository extends JpaRepository {
List findByDateBetween(LocalDate start, LocalDate end);
diff --git a/src/main/java/com/example/nto/repository/EmployeeRepository.java b/src/main/java/com/example/nto/repository/EmployeeRepository.java
index d845a04..2ba1c6a 100644
--- a/src/main/java/com/example/nto/repository/EmployeeRepository.java
+++ b/src/main/java/com/example/nto/repository/EmployeeRepository.java
@@ -1,11 +1,10 @@
package com.example.nto.repository;
import com.example.nto.entity.Employee;
+import java.util.Optional;
import org.springframework.data.jpa.repository.EntityGraph;
import org.springframework.data.jpa.repository.JpaRepository;
-import java.util.Optional;
-
public interface EmployeeRepository extends JpaRepository {
@EntityGraph(attributePaths = {"bookingList", "bookingList.place"})
Optional findByCode(String code);
diff --git a/src/main/java/com/example/nto/repository/PlaceRepository.java b/src/main/java/com/example/nto/repository/PlaceRepository.java
index e7b84c9..fab8a18 100644
--- a/src/main/java/com/example/nto/repository/PlaceRepository.java
+++ b/src/main/java/com/example/nto/repository/PlaceRepository.java
@@ -3,5 +3,4 @@ package com.example.nto.repository;
import com.example.nto.entity.Place;
import org.springframework.data.jpa.repository.JpaRepository;
-public interface PlaceRepository extends JpaRepository {
-}
+public interface PlaceRepository extends JpaRepository {}
diff --git a/src/main/java/com/example/nto/service/BookingService.java b/src/main/java/com/example/nto/service/BookingService.java
index 64e6ac6..c980b54 100644
--- a/src/main/java/com/example/nto/service/BookingService.java
+++ b/src/main/java/com/example/nto/service/BookingService.java
@@ -3,7 +3,6 @@ package com.example.nto.service;
import com.example.nto.controller.dto.BookingCreateDto;
import com.example.nto.controller.dto.PlaceDto;
import com.example.nto.entity.Booking;
-
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
diff --git a/src/main/java/com/example/nto/service/impl/BookingServiceImpl.java b/src/main/java/com/example/nto/service/impl/BookingServiceImpl.java
index ffc4f86..8c5bccd 100644
--- a/src/main/java/com/example/nto/service/impl/BookingServiceImpl.java
+++ b/src/main/java/com/example/nto/service/impl/BookingServiceImpl.java
@@ -13,15 +13,14 @@ import com.example.nto.repository.EmployeeRepository;
import com.example.nto.repository.PlaceRepository;
import com.example.nto.service.BookingService;
import com.example.nto.service.EmployeeService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
@Service
@RequiredArgsConstructor
@@ -47,11 +46,13 @@ public class BookingServiceImpl implements BookingService {
List bookings = bookingRepository.findByDateBetween(today, end);
- Map> busyByDate = bookings.stream()
- .collect(Collectors.groupingBy(
- Booking::getDate,
- Collectors.mapping(b -> b.getPlace().getId(), Collectors.toSet())
- ));
+ Map> busyByDate =
+ bookings.stream()
+ .collect(
+ Collectors.groupingBy(
+ Booking::getDate,
+ Collectors.mapping(
+ b -> b.getPlace().getId(), Collectors.toSet())));
Map> result = new LinkedHashMap<>();
@@ -59,10 +60,11 @@ public class BookingServiceImpl implements BookingService {
LocalDate currentDate = today.plusDays(i);
Set busyPlaces = busyByDate.getOrDefault(currentDate, Collections.emptySet());
- List freePlaces = allPlaces.stream()
- .filter(place -> !busyPlaces.contains(place.getId()))
- .map(place -> new PlaceDto(place.getId(), place.getPlace()))
- .toList();
+ List freePlaces =
+ allPlaces.stream()
+ .filter(place -> !busyPlaces.contains(place.getId()))
+ .map(place -> new PlaceDto(place.getId(), place.getPlace()))
+ .toList();
result.put(currentDate, freePlaces);
}
@@ -79,26 +81,33 @@ public class BookingServiceImpl implements BookingService {
throw new IllegalArgumentException("Date is out of booking window");
}
- Employee employee = employeeRepository.findByCode(code)
- .orElseThrow(() -> new EmployeeNotFoundException("Employee with " + code + " code not found!"));
+ Employee employee =
+ employeeRepository
+ .findByCode(code)
+ .orElseThrow(
+ () ->
+ new EmployeeNotFoundException(
+ "Employee with " + code + " code not found!"));
long placeId = bookingCreateDto.getPlaceId();
- Place place = placeRepository.findById(placeId)
- .orElseThrow(() -> new PlaceNotFoundException("Place with " + placeId + " id not found!"));
+ Place place =
+ placeRepository
+ .findById(placeId)
+ .orElseThrow(
+ () ->
+ new PlaceNotFoundException(
+ "Place with " + placeId + " id not found!"));
if (bookingRepository.findByDateAndPlace(date, place).isPresent()) {
throw new BookingAlreadyExistsException("Booking already exists");
}
if (bookingRepository.findByDateAndEmployee(date, employee).isPresent()) {
- throw new BookingAlreadyExistsException("This employee already has another booking on " + date);
+ throw new BookingAlreadyExistsException(
+ "This employee already has another booking on " + date);
}
- Booking booking = Booking.builder()
- .date(date)
- .employee(employee)
- .place(place)
- .build();
+ Booking booking = Booking.builder().date(date).employee(employee).place(place).build();
return bookingRepository.save(booking);
}
diff --git a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java
index 3085dc2..fcb6882 100644
--- a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java
+++ b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java
@@ -17,8 +17,13 @@ public class EmployeeServiceImpl implements EmployeeService {
@Override
@Transactional(readOnly = true)
public EmployeeDto getByCode(String code) {
- return employeeRepository.findByCode(code).map(EmployeeDto::toDto)
- .orElseThrow(() -> new EmployeeNotFoundException("Employee with " + code + " code not found!"));
+ return employeeRepository
+ .findByCode(code)
+ .map(EmployeeDto::toDto)
+ .orElseThrow(
+ () ->
+ new EmployeeNotFoundException(
+ "Employee with " + code + " code not found!"));
}
@Override