Merge pull request #85 from rishiraj88/develop

Make update methods of Product Service transactional.

Author: rishiraj88

V1java/order/pom.xml

@@ -11,11 +11,11 @@
     </parent>
     <groupId>om</groupId>
     <artifactId>order</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
     <name>order</name>
     <description>order module for order management APIs</description>
     <properties>
-        <java.version>21</java.version>
+        <java.version>24</java.version>
         <spring-cloud.version>2023.0.1</spring-cloud.version>
         <spring-boot.repackage.skip>true</spring-boot.repackage.skip>
     </properties>

V1java/order/src/main/java/om/order/clients/InventoryClient.java

@@ -10,8 +10,9 @@
  * @GetExchange("/api/v1/inventory") from Spring 6 is used here, which is an alias to @HttpExchange(method = "GET")
  */
 public interface InventoryClient {
-    @GetExchange("/api/v1/inventory")
+
     @CircuitBreaker(name = "inventory", fallbackMethod = "fallbackMethod") //The name "inventory matches the circuit breaker name in application.properties"
+
     @Retry(name = "inventory")
     public abstract boolean isItemInStock(@RequestParam String skuCode, @RequestParam Integer quantityForQuery);
 

V1java/order/src/main/java/om/order/config/Constants.java

@@ -1,7 +1,6 @@
 package om.order.config;
 
 public abstract class Constants {
-
-    public static final String NEW_ORDER_PLACED_MSG = "An order has been created and placed.";
-    public static final String ORDER_PLACED_QUEUE_NAME = "order-placed";
+    public static final String NEW_ORDER_PLACED__MSG = "An order has been created and placed.";
+    public static final String ORDER_PLACED__QUEUE_NAME = "order-placed";
 }

V1java/order/src/main/java/om/order/config/OpenApiSpecsConfig.java

@@ -7,7 +7,7 @@
 import org.springframework.context.annotation.Configuration;
 
 /**
- * Documentation of the API of Order module (microservice) using OpenAPI Specifications (OAS)
+ * Documentation of the API of Order module (microservice) using OpenAPI Specification (OAS)
  */
 @Configuration
 public class OpenApiSpecsConfig {
@@ -23,6 +23,6 @@ public OpenAPI OrderOasApi() {
                 > Inventory
 
                 Order microservice is for creating, listing, modifying and removing orders and order details. Its API has the base URI as "/api/v1/orders".
-                """).version("v1.0.0").contact(new Contact().name("Rishi Raj").url("https://bio.link/rishiraj49de")));
+                """).version("v1.0.0").contact(new Contact().name("Rishi Raj").url("https://www.linkedin.com/in/rishirajopenminds/")));
     }
 }

V1java/order/src/main/java/om/order/config/RestClientConfig.java

@@ -20,8 +20,9 @@ public class RestClientConfig {
 
     @Bean
     public InventoryClient inventoryClient(){
-        // * RestClient from Spring 6 is used here for synchronous client with fluent API.
-        // for non-blocking, reactive client, WebClient may be used.
+
+        /** RestClient from Spring 6 is used here for synchronous client with fluent API.
+         for non-blocking, reactive client, WebClient may be used. */
         RestClient restClient = RestClient.builder()
                 .baseUrl(inventoryConnectUrl)
                 .requestFactory(getClientRequestFactory())
@@ -37,6 +38,5 @@ private ClientHttpRequestFactory getClientRequestFactory() {
                 .withConnectTimeout(Duration.ofSeconds(3))
                 .withReadTimeout(Duration.ofSeconds(3));
                 return ClientHttpRequestFactories.get(httpRequestFactorySettings);
-
     }
 }

V1java/order/src/main/java/om/order/controller/OrderController.java

@@ -1,8 +1,6 @@
 package om.order.controller;
 
 import jakarta.validation.Valid;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import om.order.config.Constants;
 import om.order.dto.OrderReq;
 import om.order.dto.OrderResp;
@@ -21,20 +19,20 @@
 
 //@RequiredArgsConstructor
 @RestController// @Slf4j
-//@RequestMapping(value = "/api/orders",headers = "Accept-Version=v1") // A different scheme of API versioning
+//@RequestMapping(value = "/api/orders",headers = "Accept-Version=v1") // A different scheme of API versioning, available to choose
 @RequestMapping(value = "/api/v1/orders")
 public class OrderController {
     private final OrderService orderService;
-public OrderController(OrderService orderService) {this.orderService = orderService;}
+    public OrderController(OrderService orderService) {this.orderService = orderService;}
 
-    // @ResponseStatus(HttpStatus.CREATED): the modern way to write Controller Endpoints.
-    // Older way is depicted in ResponseEntity<List<ProductResp>> ProductController.getAllProducts() endpoint.
+    /** @ResponseStatus(HttpStatus.CREATED): the modern way to write Controller Endpoints.
+    Older way is depicted in ResponseEntity<List<ProductResp>> ProductController.getAllProducts() endpoint.*/
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED) // 201
     public String createOrder(@Valid @RequestBody OrderReq orderReq) {
         orderService.createOrder(orderReq);
         //log.debug(Constants.NEW_ORDER_PLACED_MSG);
-        return Constants.NEW_ORDER_PLACED_MSG;
+        return Constants.NEW_ORDER_PLACED__MSG;
     }
 
     // getOrders()

V1java/order/src/main/java/om/order/dao/OrderRepo.java

@@ -3,5 +3,4 @@
 import om.order.entity.Order;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface OrderRepo extends JpaRepository<Order,Long> {
-}
+public interface OrderRepo extends JpaRepository<Order,Long> {}

V1java/order/src/main/java/om/order/dto/OrderReq.java

@@ -2,6 +2,4 @@
 
 import java.math.BigDecimal;
 
-public record OrderReq(String id, String orderNumber, String itemSkuCode,
-                       BigDecimal pricePerItemUnit,Integer quantity,UserDetails userDetails) {
-}
+public record OrderReq(String id, String orderNumber, String itemSkuCode,                       BigDecimal pricePerItemUnit,Integer quantity,UserDetails userDetails) {}

V1java/order/src/main/java/om/order/dto/OrderResp.java

@@ -2,6 +2,4 @@
 
 import java.math.BigDecimal;
 
-public record OrderResp(String id, String orderNumber, String itemSkuCode,
-                        BigDecimal pricePerItemUnit, Integer quantity, UserDetails userDetails) {
-}
+public record OrderResp(String id, String orderNumber, String itemSkuCode,                        BigDecimal pricePerItemUnit, Integer quantity, UserDetails userDetails) {}

V1java/order/src/main/java/om/order/dto/UserDetails.java

@@ -1,3 +1,3 @@
 package om.order.dto;
-public record UserDetails(String emailAddress, String name) {}
 
+public record UserDetails(String emailAddress, String name) {}