fixed formatting

Signed-off-by: Jack Blower <[email protected]>

Author: Giuseppe Falco-Scampatelli

java/src/main/java/com/amido/stacks/workloads/ApplicationConfig.java

@@ -15,9 +15,7 @@
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 
-/**
- * ApplicationConfig - Configuration class for Auth0 application security.
- */
+/** ApplicationConfig - Configuration class for Auth0 application security. */
 @Configuration("MySecurityConfig")
 @EnableWebSecurity
 @Order(Ordered.HIGHEST_PRECEDENCE)
@@ -80,14 +78,18 @@ public SecurityFilterChain configure(HttpSecurity http) throws Exception {
    * @throws Exception
    */
   private SecurityFilterChain enableAuth(HttpSecurity http) throws Exception {
-    return http.authorizeHttpRequests(authConfig -> authConfig.requestMatchers(V1_MENU_ENDPOINT)
-        .authenticated()
-        .requestMatchers(V2_MENU_ENDPOINT)
-        .authenticated()
-        .requestMatchers(V1_MENU)
-        .authenticated()
-        .requestMatchers(V2_MENU)
-        .authenticated()).build();
+    return http.authorizeHttpRequests(
+            authConfig ->
+                authConfig
+                    .requestMatchers(V1_MENU_ENDPOINT)
+                    .authenticated()
+                    .requestMatchers(V2_MENU_ENDPOINT)
+                    .authenticated()
+                    .requestMatchers(V1_MENU)
+                    .authenticated()
+                    .requestMatchers(V2_MENU)
+                    .authenticated())
+        .build();
   }
 
   /**
@@ -98,6 +100,7 @@ private SecurityFilterChain enableAuth(HttpSecurity http) throws Exception {
    */
   private SecurityFilterChain permitAll(HttpSecurity http) throws Exception {
     return http.authorizeHttpRequests(authConfig -> authConfig.requestMatchers("/**").permitAll())
-        .httpBasic(Customizer.withDefaults()).build();
+        .httpBasic(Customizer.withDefaults())
+        .build();
   }
 }

java/src/main/java/com/amido/stacks/workloads/ApplicationNoSecurity.java

@@ -24,7 +24,6 @@ public class ApplicationNoSecurity {
    * e.g. The example below restricts the URLs that start with /admin/ to users that have ADMIN
    * role, and declares that any other URLs need to be successfully authenticated.
    */
-
   @Bean
   public WebSecurityCustomizer webSecurityCustomizer() {
     return web -> web.ignoring().requestMatchers("/**");

java/src/main/java/com/amido/stacks/workloads/menu/api/v1/CategoryController.java

@@ -12,8 +12,8 @@
 import com.amido.stacks.workloads.menu.service.v1.CategoryService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import java.util.UUID;
 import jakarta.validation.Valid;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

java/src/main/java/com/amido/stacks/workloads/menu/api/v1/ItemController.java

@@ -12,8 +12,8 @@
 import com.amido.stacks.workloads.menu.service.v1.ItemService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import java.util.UUID;
 import jakarta.validation.Valid;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

java/src/main/java/com/amido/stacks/workloads/menu/api/v1/MenuController.java

@@ -19,8 +19,8 @@
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import java.util.UUID;
 import jakarta.validation.Valid;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;

java/src/main/java/com/amido/stacks/workloads/menu/api/v1/dto/request/CreateMenuRequest.java

@@ -1,9 +1,9 @@
 package com.amido.stacks.workloads.menu.api.v1.dto.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.UUID;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import java.util.UUID;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

java/src/main/java/com/amido/stacks/workloads/menu/domain/Menu.java

@@ -1,11 +1,11 @@
 package com.amido.stacks.workloads.menu.domain;
 
+import jakarta.persistence.Id;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import jakarta.persistence.Id;
 
 @Data
 @AllArgsConstructor

java/src/main/java/com/amido/stacks/workloads/menu/service/v1/CategoryService.java

@@ -4,8 +4,8 @@
 import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse;
 import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateCategoryRequest;
 import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateCategoryRequest;
-import java.util.UUID;
 import jakarta.validation.Valid;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

java/src/main/java/com/amido/stacks/workloads/menu/service/v1/ItemService.java

@@ -4,8 +4,8 @@
 import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse;
 import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateItemRequest;
 import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateItemRequest;
-import java.util.UUID;
 import jakarta.validation.Valid;
+import java.util.UUID;
 import org.springframework.stereotype.Service;
 
 @Service

java/src/main/java/com/amido/stacks/workloads/menu/service/v1/MenuService.java

@@ -12,11 +12,11 @@
 import com.amido.stacks.workloads.menu.mappers.MenuMapper;
 import com.amido.stacks.workloads.menu.mappers.SearchMenuResultItemMapper;
 import com.amido.stacks.workloads.menu.service.utility.MenuHelperService;
+import jakarta.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
-import jakarta.validation.Valid;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

java/src/test/java/com/amido/stacks/workloads/menu/api/v1/CategoryControllerTest.java

@@ -44,8 +44,7 @@ public class CategoryControllerTest {
 
   public static final String DELETE_CATEGORY = "%s/v1/menu/%s/category/%s";
 
-  @LocalServerPort
-  private int port;
+  @LocalServerPort private int port;
 
   @Autowired private TestRestTemplate testRestTemplate;
 

java/src/test/java/com/amido/stacks/workloads/menu/api/v1/ItemControllerTest.java

@@ -48,14 +48,11 @@ public class ItemControllerTest {
 
   public static final String DELETE_ITEM = "%s/v1/menu/%s/category/%s/items/%s";
 
-  @LocalServerPort
-  private int port;
+  @LocalServerPort private int port;
 
-  @Autowired
-  private TestRestTemplate testRestTemplate;
+  @Autowired private TestRestTemplate testRestTemplate;
 
-  @Autowired
-  private MenuHelperService menuHelperService;
+  @Autowired private MenuHelperService menuHelperService;
 
   @Test
   void testAddItem() {

java/src/test/java/com/amido/stacks/workloads/menu/api/v1/MenuControllerTest.java

@@ -59,26 +59,19 @@ public class MenuControllerTest {
   final int DEFAULT_PAGE_NUMBER = 1;
   final int DEFAULT_PAGE_SIZE = 20;
 
-  @LocalServerPort
-  private int port;
+  @LocalServerPort private int port;
 
-  @Autowired
-  private TestRestTemplate testRestTemplate;
+  @Autowired private TestRestTemplate testRestTemplate;
 
-  @Autowired
-  private MenuMapper menuMapper;
+  @Autowired private MenuMapper menuMapper;
 
-  @Autowired
-  private CategoryMapper categoryMapper;
+  @Autowired private CategoryMapper categoryMapper;
 
-  @Autowired
-  private ItemMapper itemMapper;
+  @Autowired private ItemMapper itemMapper;
 
-  @Autowired
-  private SearchMenuResultItemMapper searchMenuResultItemMapper;
+  @Autowired private SearchMenuResultItemMapper searchMenuResultItemMapper;
 
-  @Autowired
-  private MenuHelperService menuHelperService;
+  @Autowired private MenuHelperService menuHelperService;
 
   @Test
   void testCreateNewMenu() {

java/src/test/java/com/amido/stacks/workloads/menu/api/v1/SecretsControllerTest.java

@@ -18,28 +18,26 @@
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
     classes = Application.class,
     properties = {
-        "stacks-secret-1=SEC1",
-        "stacks-secret-2=SEC2",
-        "stacks-secret-3=SEC3",
-        "stacks-secret-4=SEC4"
+      "stacks-secret-1=SEC1",
+      "stacks-secret-2=SEC2",
+      "stacks-secret-3=SEC3",
+      "stacks-secret-4=SEC4"
     })
 @TestPropertySource(
     properties = {
-        "management.port=0",
-        "aws.xray.enabled=false",
-        "aws.secretsmanager.enabled=false"
+      "management.port=0",
+      "aws.xray.enabled=false",
+      "aws.secretsmanager.enabled=false"
     })
 @Tag("Integration")
 @ActiveProfiles("test")
 class SecretsControllerTest {
 
   public static final String GET_SECRETS = "/v1/secrets";
 
-  @LocalServerPort
-  private int port;
+  @LocalServerPort private int port;
 
-  @Autowired
-  private TestRestTemplate testRestTemplate;
+  @Autowired private TestRestTemplate testRestTemplate;
 
   @Test
   void shouldReturnValidSecrets() {

java/src/test/java/com/amido/stacks/workloads/menu/api/v2/MenuControllerV2Test.java

@@ -24,8 +24,7 @@ public class MenuControllerV2Test {
 
   private final String GET_MENU_BY_ID = "%s/v2/menu/%s";
 
-  @LocalServerPort
-  private int port;
+  @LocalServerPort private int port;
 
   @Autowired private TestRestTemplate testRestTemplate;