fix checkstyle

eu-digital-green-certificates · Sep 30, 2021 · 150d57a · 150d57a
1 parent 5eed8ea
commit 150d57a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/src/main/java/eu/europa/ec/dgc/booking/controller/BookingController.java b/src/main/java/eu/europa/ec/dgc/booking/controller/BookingController.java
@@ -84,6 +84,13 @@ public BookingResponse booking(
         return converter.convert(bookingService.getBySessionId(sessionId), BookingResponse.class);
     }
 
+    /**
+     * Replace Booking Data.
+     * 
+     * @param request {@link BookingReplaceRequest}
+     * @param session {@link HttpSession}
+     * @return {@link BookingResponse}
+     */
     @Operation(summary = "Replace Booking Data", description = "Replace Booking Data")
     @ApiResponses(value = {
         @ApiResponse(responseCode = "200", description = "OK"),
@@ -92,7 +99,8 @@ public BookingResponse booking(
         @ApiResponse(responseCode = "500", description = "Internal Server Error")
     })
     @ResponseStatus(code = HttpStatus.OK)
-    @PostMapping(path = PATH_REPLACE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(path = PATH_REPLACE, 
+        consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     public BookingResponse replace(@Valid @RequestBody final BookingReplaceRequest request, final HttpSession session) {
         final String sessionId = session.getId();
         log.debug("Incoming POST request to '{}' with content '{}' and sessionId '{}'",

diff --git a/...ava/eu/europa/ec/dgc/booking/converter/BookingReplaceRequestToBookingEntityConverter.java b/...ava/eu/europa/ec/dgc/booking/converter/BookingReplaceRequestToBookingEntityConverter.java
@@ -47,32 +47,32 @@ public BookingEntity convert(BookingReplaceRequest request) {
         entity.setReference(request.getReference());
         entity.setTime(request.getTime() != null ? request.getTime() : OffsetDateTime.now());
         entity.setPassengers(this.convertPassengers(request.getPassengers()));
-        entity.setFlightInfo(this.convert(request.getFlightInfo()));
+        entity.setFlightInfo(this.convertFlightInfo(request.getFlightInfo()));
         return entity;
     }
 
-    public List<PassengerEntity> convertPassengers(List<PassengerRequest> requests) {
+    private List<PassengerEntity> convertPassengers(List<PassengerRequest> requests) {
         if (requests != null && !requests.isEmpty()) {
             return requests.stream()
-                    .map(this::convert)
+                    .map(this::convertPassenger)
                     .collect(Collectors.toList());
         }
         return new ArrayList<>();
     }
 
-    public PassengerEntity convert(PassengerRequest request) {
+    private PassengerEntity convertPassenger(PassengerRequest request) {
         final PassengerEntity entity = new PassengerEntity();
         entity.setId(request.getId() != null ? request.getId() : UUID.randomUUID());
         entity.setForename(request.getForename());
-        entity.setLastname(request.getLastname());        
+        entity.setLastname(request.getLastname());
         entity.setBirthDate(request.getBirthDate());
-        entity.setDccStatus(this.convert(request.getDccStatus()));        
+        entity.setDccStatus(this.convertDccStatus(request.getDccStatus()));
         entity.setServiceIdUsed(request.getServiceIdUsed());
         entity.setJti(request.getJti());
         return entity;
     }
 
-    public DccStatusEntity convert(final DccStatusRequest request) {        
+    private DccStatusEntity convertDccStatus(final DccStatusRequest request) {
         if (request != null) {
             return DccStatusEntity.builder()
                     .issuer(request.getIssuer())
@@ -85,16 +85,16 @@ public DccStatusEntity convert(final DccStatusRequest request) {
         return null;
     }
 
-    public List<DccStatusResultEntity> convertResults(List<ResultRequest> requests) {
+    private List<DccStatusResultEntity> convertResults(List<ResultRequest> requests) {
         if (requests != null && !requests.isEmpty()) {
             return requests.stream()
-                    .map(this::convert)
+                    .map(this::convertResult)
                     .collect(Collectors.toList());
         }
         return new ArrayList<>();
     }
 
-    public DccStatusResultEntity convert(ResultRequest request) {
+    private DccStatusResultEntity convertResult(ResultRequest request) {
         return DccStatusResultEntity.builder()
                 .identifier(request.getIdentifier())
                 .result(request.getResult())
@@ -103,7 +103,7 @@ public DccStatusResultEntity convert(ResultRequest request) {
                 .build();
     }
 
-    private FlightInfoEntity convert(BookingFlightInfoRequest request) {
+    private FlightInfoEntity convertFlightInfo(BookingFlightInfoRequest request) {
         if (request != null) {
             return FlightInfoEntity.builder()
                     .from(request.getFrom())

diff --git a/src/main/java/eu/europa/ec/dgc/booking/service/BookingService.java b/src/main/java/eu/europa/ec/dgc/booking/service/BookingService.java
@@ -127,7 +127,14 @@ public void create(String sessionId, BookingRequest bookingRequest, DevDccStatus
 
         persistence.save(sessionId, bookingEntity);
     }
-
+
+    /**
+     * Replaces or creates a {@link BookingEntity}.
+     * 
+     * @param sessionId Session ID
+     * @param request {@link BookingReplaceRequest}
+     * @return {@link BookingEntity}
+     */
     public BookingEntity replace(final String sessionId, final BookingReplaceRequest request) {
         final BookingEntity entity = this.converter.convert(request, BookingEntity.class);
         persistence.save(sessionId, entity);