feat : apply best practices (#829)

rajadilipkolli · Aug 31, 2024 · 3bcc0fe · 3bcc0fe
1 parent ea329f0
commit 3bcc0fe
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 13 deletions.
diff --git a/catalog-service/pom.xml b/catalog-service/pom.xml
@@ -235,6 +235,12 @@
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

diff --git a/order-service/src/test/java/com/example/orderservice/util/TestData.java b/order-service/src/test/java/com/example/orderservice/util/TestData.java
@@ -48,7 +48,7 @@ public static Order getOrder() {
     }
 
     public static OrderRequest getOrderRequest(Order order) {
-        OrderItem orderItem = order.getItems().get(0);
+        OrderItem orderItem = order.getItems().getFirst();
         OrderItem orderItem1 = order.getItems().get(1);
         return new OrderRequest(
                 order.getCustomerId(),

diff --git a/order-service/src/test/java/com/example/orderservice/web/controllers/OrderControllerIT.java b/order-service/src/test/java/com/example/orderservice/web/controllers/OrderControllerIT.java
@@ -347,7 +347,7 @@ void shouldDeleteOrder() throws Exception {
 
     @Test
     void shouldFindOrdersByCustomersId() throws Exception {
-        OrderItem orderItem = orderList.getFirst().getItems().get(0);
+        OrderItem orderItem = orderList.getFirst().getItems().getFirst();
         mockMvc.perform(
                         get("/api/orders/customer/{id}", orderList.getFirst().getCustomerId())
                                 .queryParam("page", "0")

diff --git a/pom.xml b/pom.xml
@@ -12,6 +12,7 @@
 	<name>spring-boot-microservices-series-v2</name>
 
 	<properties>
+        <maven.compiler.release>21</maven.compiler.release>
 		<sonar.organization>rajadilipkolli</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
 	</properties>

diff --git a/...bapp/src/main/java/com/example/retailstore/webapp/web/controller/InventoryController.java b/...bapp/src/main/java/com/example/retailstore/webapp/web/controller/InventoryController.java
@@ -25,14 +25,14 @@ public InventoryController(InventoryServiceClient inventoryServiceClient) {
     }
 
     @GetMapping("/inventory")
-    String showInventoriesPage(@RequestParam(name = "page", defaultValue = "0") int page, Model model) {
+    String showInventoriesPage(@RequestParam(defaultValue = "0") int page, Model model) {
         model.addAttribute("pageNo", page);
         return "inventory";
     }
 
     @GetMapping("/api/inventory")
     @ResponseBody
-    PagedResult<InventoryResponse> inventories(@RequestParam(name = "page", defaultValue = "0") int page, Model model) {
+    PagedResult<InventoryResponse> inventories(@RequestParam(defaultValue = "0") int page, Model model) {
         log.info("Fetching inventories for page: {}", page);
         return inventoryServiceClient.getInventories(page);
     }

diff --git a/...webapp/src/main/java/com/example/retailstore/webapp/web/controller/ProductController.java b/...webapp/src/main/java/com/example/retailstore/webapp/web/controller/ProductController.java
@@ -30,7 +30,7 @@ String index() {
     }
 
     @GetMapping("/products")
-    String showProductsPage(@RequestParam(name = "page", defaultValue = "0") int page, Model model) {
+    String showProductsPage(@RequestParam(defaultValue = "0") int page, Model model) {
         model.addAttribute("pageNo", page);
         return "products";
     }
@@ -43,7 +43,7 @@ ProductResponse createProduct(@RequestBody ProductRequest productRequest) {
 
     @GetMapping("/api/products")
     @ResponseBody
-    PagedResult<ProductResponse> products(@RequestParam(name = "page", defaultValue = "0") int page, Model model) {
+    PagedResult<ProductResponse> products(@RequestParam(defaultValue = "0") int page, Model model) {
         log.info("Fetching products for page: {}", page);
         return catalogService.getProducts(page);
     }

diff --git a/retail-store-webapp/src/main/resources/application.properties b/retail-store-webapp/src/main/resources/application.properties
@@ -20,7 +20,8 @@ REALM_URL=${OAUTH2_SERVER_URL}/realms/retailstore
 spring.security.oauth2.client.registration.retailstore-webapp.client-id=retailstore-webapp
 spring.security.oauth2.client.registration.retailstore-webapp.client-secret=P1sibsIrELBhmvK18BOzw1bUl96DcP2z
 spring.security.oauth2.client.registration.retailstore-webapp.authorization-grant-type=authorization_code
-spring.security.oauth2.client.registration.retailstore-webapp.scope=openid, profile
+spring.security.oauth2.client.registration.retailstore-webapp.scope=openid, profile
+spring.threads.virtual.enabled=true
 spring.security.oauth2.client.registration.retailstore-webapp.redirect-uri={baseUrl}/login/oauth2/code/retailstore-webapp
 
 spring.security.oauth2.client.provider.retailstore-webapp.issuer-uri=${REALM_URL}

diff --git a/service-registry/pom.xml b/service-registry/pom.xml
@@ -60,12 +60,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-testcontainers</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-            </exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>