adjust identation and imports

Author: Ivan Franchin

order-api/src/main/java/com/mycompany/orderapi/config/CorsConfig.java

@@ -1,15 +1,15 @@
 package com.mycompany.orderapi.config;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
 
+import java.util.Collections;
+import java.util.List;
+
 @Configuration
 public class CorsConfig {
 

order-api/src/main/java/com/mycompany/orderapi/mapper/OrderMapper.java

@@ -3,7 +3,6 @@
 import com.mycompany.orderapi.model.Order;
 import com.mycompany.orderapi.rest.dto.CreateOrderRequest;
 import com.mycompany.orderapi.rest.dto.OrderDto;
-
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.springframework.context.annotation.Configuration;
@@ -12,8 +11,8 @@
 @Mapper(componentModel = "spring")
 public interface OrderMapper {
 
-  Order toOrder(CreateOrderRequest createOrderRequest);
+    Order toOrder(CreateOrderRequest createOrderRequest);
 
-  @Mapping(target = "createdAt", dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
-  OrderDto toOrderDto(Order order);
+    @Mapping(target = "createdAt", dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+    OrderDto toOrderDto(Order order);
 }

order-api/src/main/java/com/mycompany/orderapi/mapper/UserMapper.java

@@ -2,13 +2,12 @@
 
 import com.mycompany.orderapi.model.User;
 import com.mycompany.orderapi.rest.dto.UserDto;
-
 import org.mapstruct.Mapper;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 @Mapper(componentModel = "spring")
 public interface UserMapper {
 
-  UserDto toUserDto(User user);
+    UserDto toUserDto(User user);
 }

order-api/src/main/java/com/mycompany/orderapi/model/Order.java

@@ -1,7 +1,7 @@
 package com.mycompany.orderapi.model;
+
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import java.time.ZonedDateTime;
 
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -10,6 +10,7 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.PrePersist;
 import javax.persistence.Table;
+import java.time.ZonedDateTime;
 
 @Data
 @NoArgsConstructor

order-api/src/main/java/com/mycompany/orderapi/repository/OrderRepository.java

@@ -1,15 +1,15 @@
 package com.mycompany.orderapi.repository;
 
-import java.util.List;
-
 import com.mycompany.orderapi.model.Order;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface OrderRepository extends JpaRepository<Order, String> {
 
-  List<Order> findAllByOrderByCreatedAtDesc();
+    List<Order> findAllByOrderByCreatedAtDesc();
 
-  List<Order> findByIdContainingOrDescriptionContainingOrderByCreatedAt(String id, String description);
+    List<Order> findByIdContainingOrDescriptionContainingOrderByCreatedAt(String id, String description);
 }

order-api/src/main/java/com/mycompany/orderapi/rest/OrderController.java

@@ -39,7 +39,7 @@ public class OrderController {
     private final OrderService orderService;
     private final OrderMapper orderMapper;
 
-    @Operation(security = { @SecurityRequirement(name = BEARER_KEY_SECURITY_SCHEME) })
+    @Operation(security = {@SecurityRequirement(name = BEARER_KEY_SECURITY_SCHEME)})
     @GetMapping
     public List<OrderDto> getOrders(@RequestParam(value = "text", required = false) String text) {
         List<Order> orders = (text == null) ? orderService.getOrders() : orderService.getOrdersContainingText(text);
@@ -48,19 +48,19 @@ public List<OrderDto> getOrders(@RequestParam(value = "text", required = false)
                 .collect(Collectors.toList());
     }
 
-    @Operation(security = { @SecurityRequirement(name = BEARER_KEY_SECURITY_SCHEME) })
+    @Operation(security = {@SecurityRequirement(name = BEARER_KEY_SECURITY_SCHEME)})
     @ResponseStatus(HttpStatus.CREATED)
     @PostMapping
     public OrderDto createOrder(@AuthenticationPrincipal CustomUserDetails currentUser,
-            @Valid @RequestBody CreateOrderRequest createOrderRequest) {
+                                @Valid @RequestBody CreateOrderRequest createOrderRequest) {
         User user = userService.validateAndGetUserByUsername(currentUser.getUsername());
         Order order = orderMapper.toOrder(createOrderRequest);
         order.setId(UUID.randomUUID().toString());
         order.setUser(user);
         return orderMapper.toOrderDto(orderService.saveOrder(order));
     }
 
-    @Operation(security = { @SecurityRequirement(name = BEARER_KEY_SECURITY_SCHEME) })
+    @Operation(security = {@SecurityRequirement(name = BEARER_KEY_SECURITY_SCHEME)})
     @DeleteMapping("/{id}")
     public OrderDto deleteOrders(@PathVariable UUID id) {
         Order order = orderService.validateAndGetOrder(id.toString());

order-api/src/main/java/com/mycompany/orderapi/rest/UserController.java

@@ -28,27 +28,27 @@ public class UserController {
     private final UserService userService;
     private final UserMapper userMapper;
 
-    @Operation(security = { @SecurityRequirement(name = BEARER_KEY_SECURITY_SCHEME) })
+    @Operation(security = {@SecurityRequirement(name = BEARER_KEY_SECURITY_SCHEME)})
     @GetMapping("/me")
     public UserDto getCurrentUser(@AuthenticationPrincipal CustomUserDetails currentUser) {
         return userMapper.toUserDto(userService.validateAndGetUserByUsername(currentUser.getUsername()));
     }
 
-    @Operation(security = { @SecurityRequirement(name = BEARER_KEY_SECURITY_SCHEME) })
+    @Operation(security = {@SecurityRequirement(name = BEARER_KEY_SECURITY_SCHEME)})
     @GetMapping
     public List<UserDto> getUsers() {
         return userService.getUsers().stream()
                 .map(userMapper::toUserDto)
                 .collect(Collectors.toList());
     }
 
-    @Operation(security = { @SecurityRequirement(name = BEARER_KEY_SECURITY_SCHEME) })
+    @Operation(security = {@SecurityRequirement(name = BEARER_KEY_SECURITY_SCHEME)})
     @GetMapping("/{username}")
     public UserDto getUser(@PathVariable String username) {
         return userMapper.toUserDto(userService.validateAndGetUserByUsername(username));
     }
 
-    @Operation(security = { @SecurityRequirement(name = BEARER_KEY_SECURITY_SCHEME) })
+    @Operation(security = {@SecurityRequirement(name = BEARER_KEY_SECURITY_SCHEME)})
     @DeleteMapping("/{username}")
     public UserDto deleteUser(@PathVariable String username) {
         User user = userService.validateAndGetUserByUsername(username);

order-api/src/main/java/com/mycompany/orderapi/rest/dto/CreateOrderRequest.java

@@ -1,11 +1,10 @@
 package com.mycompany.orderapi.rest.dto;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-
 @Data
 public class CreateOrderRequest {
 

order-api/src/main/java/com/mycompany/orderapi/rest/dto/LoginRequest.java

@@ -1,10 +1,10 @@
 package com.mycompany.orderapi.rest.dto;
 
-import javax.validation.constraints.NotBlank;
-
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 @Data
 public class LoginRequest {
 

order-api/src/main/java/com/mycompany/orderapi/rest/dto/OrderDto.java

@@ -1,19 +1,19 @@
 package com.mycompany.orderapi.rest.dto;
 
-import java.time.ZonedDateTime;
-
 import lombok.Data;
 
+import java.time.ZonedDateTime;
+
 @Data
 public class OrderDto {
-  
-  private String id;
-  private String description;
-  private UserDto user;
-  private ZonedDateTime createdAt;
 
-  @Data
-  public static final class UserDto {
-    private String username;
-  }
+    private String id;
+    private String description;
+    private UserDto user;
+    private ZonedDateTime createdAt;
+
+    @Data
+    public static final class UserDto {
+        private String username;
+    }
 }

order-api/src/main/java/com/mycompany/orderapi/rest/dto/SignUpRequest.java

@@ -1,11 +1,11 @@
 package com.mycompany.orderapi.rest.dto;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+
 @Data
 public class SignUpRequest {
 

order-api/src/main/java/com/mycompany/orderapi/rest/dto/UserDto.java

@@ -1,24 +1,24 @@
 package com.mycompany.orderapi.rest.dto;
 
+import lombok.Data;
+
 import java.time.ZonedDateTime;
 import java.util.List;
 
-import lombok.Data;
-
 @Data
 public class UserDto {
-  
-  private Long id;
-  private String username;
-  private String name;
-  private String email;
-  private String role;
-  private List<OrderDto> orders;
 
-  @Data
-  public static final class OrderDto {
-    private String id;
-    private String description;
-    private ZonedDateTime createdAt;
-  }
+    private Long id;
+    private String username;
+    private String name;
+    private String email;
+    private String role;
+    private List<OrderDto> orders;
+
+    @Data
+    public static final class OrderDto {
+        private String id;
+        private String description;
+        private ZonedDateTime createdAt;
+    }
 }

order-api/src/main/java/com/mycompany/orderapi/runner/DatabaseInitializer.java

@@ -1,18 +1,16 @@
 package com.mycompany.orderapi.runner;
 
-import java.util.Arrays;
-import java.util.List;
-
 import com.mycompany.orderapi.model.User;
 import com.mycompany.orderapi.security.WebSecurityConfig;
 import com.mycompany.orderapi.service.UserService;
-
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
-import lombok.extern.slf4j.Slf4j;
+import java.util.Arrays;
+import java.util.List;
 
 @Slf4j
 @RequiredArgsConstructor

order-api/src/main/java/com/mycompany/orderapi/security/TokenAuthenticationFilter.java

@@ -39,7 +39,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
                         SecurityContextHolder.getContext().setAuthentication(authentication);
                     });
         } catch (Exception e) {
-            log.error("Cannot set user authentication: {}", e);
+            log.error("Cannot set user authentication", e);
         }
         chain.doFilter(request, response);
     }