Merge pull request #58 from omar-nassar/master

implementing 'convert to record TODOs'

Author: mohamed-taman

store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ProductAggregate.java

@@ -1,20 +1,11 @@
 package com.siriusxi.ms.store.api.composite.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.util.List;
 
-// TODO convert it to record
-@Data
-@NoArgsConstructor(force = true)
-@AllArgsConstructor
-public class ProductAggregate {
-  private final int productId;
-  private final String name;
-  private final int weight;
-  private final List<RecommendationSummary> recommendations;
-  private final List<ReviewSummary> reviews;
-  private final ServiceAddresses serviceAddresses;
-}
+public record ProductAggregate (int productId,
+                                String name,
+                                int weight,
+                                List<RecommendationSummary> recommendations,
+                                List<ReviewSummary>reviews,
+                                ServiceAddresses serviceAddresses) {
+}

store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/RecommendationSummary.java

@@ -1,16 +1,7 @@
 package com.siriusxi.ms.store.api.composite.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-// TODO convert it to record
-@Data
-@NoArgsConstructor(force = true)
-@AllArgsConstructor
-public class RecommendationSummary {
-  private final int recommendationId;
-  private final String author;
-  private final int rate;
-  private final String content;
-}
+public record RecommendationSummary(int recommendationId,
+                                    String author,
+                                    int rate,
+                                    String content) {
+}

store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ReviewSummary.java

@@ -1,16 +1,7 @@
 package com.siriusxi.ms.store.api.composite.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-// TODO convert it to record
-@Data
-@NoArgsConstructor(force = true)
-@AllArgsConstructor
-public class ReviewSummary {
-  private final int reviewId;
-  private final String author;
-  private final String subject;
-  private final String content;
+public record ReviewSummary(int reviewId,
+                            String author,
+                            String subject,
+                            String content){
 }

store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ServiceAddresses.java

@@ -1,16 +1,7 @@
 package com.siriusxi.ms.store.api.composite.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-// TODO convert it to record
-@Data
-@NoArgsConstructor(force = true)
-@AllArgsConstructor
-public class ServiceAddresses {
-  private final String storeService;
-  private final String productService;
-  private final String reviewService;
-  private final String recommendationService;
+public record ServiceAddresses( String storeService,
+                                String productService,
+                                String reviewService,
+                                String recommendationService) {
 }

store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/StoreServiceApplication.java

@@ -1,11 +1,14 @@
 package com.siriusxi.ms.store.pcs;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import springfox.documentation.swagger2.annotations.EnableSwagger2WebFlux;
 
 @SpringBootApplication
@@ -21,4 +24,10 @@ public static void main(String[] args) {
   public WebClient.Builder loadBalancedWebClientBuilder() {
     return WebClient.builder();
   }
+
+  @Bean
+  public Jackson2ObjectMapperBuilderCustomizer jacksonCustomizer() {
+    return builder -> builder.visibility( PropertyAccessor.FIELD,
+                                          JsonAutoDetect.Visibility.ANY);
+  }
 }

store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/service/StoreServiceImpl.java

@@ -38,45 +38,45 @@ public void createProduct(ProductAggregate body) {
 
       log.debug(
           "createCompositeProduct: creates a new composite entity for productId: {}",
-          body.getProductId());
+          body.productId());
 
-      var product = new Product(body.getProductId(), body.getName(), body.getWeight(), null);
+      var product = new Product(body.productId(), body.name(), body.weight(), null);
       integration.createProduct(product);
 
-      if (body.getRecommendations() != null) {
-        body.getRecommendations()
+      if (body.recommendations() != null) {
+        body.recommendations()
             .forEach(
                 r -> {
                   var recommendation =
                       new Recommendation(
-                          body.getProductId(),
-                          r.getRecommendationId(),
-                          r.getAuthor(),
-                          r.getRate(),
-                          r.getContent(),
+                          body.productId(),
+                          r.recommendationId(),
+                          r.author(),
+                          r.rate(),
+                          r.content(),
                           null);
                   integration.createRecommendation(recommendation);
                 });
       }
 
-      if (body.getReviews() != null) {
-        body.getReviews()
+      if (body.reviews() != null) {
+        body.reviews()
             .forEach(
                 r -> {
                   Review review =
                       new Review(
-                          body.getProductId(),
-                          r.getReviewId(),
-                          r.getAuthor(),
-                          r.getSubject(),
-                          r.getContent(),
+                          body.productId(),
+                          r.reviewId(),
+                          r.author(),
+                          r.subject(),
+                          r.content(),
                           null);
                   integration.createReview(review);
                 });
       }
       log.debug(
           "createCompositeProduct: composite entities created for productId: {}",
-          body.getProductId());
+          body.productId());
 
     } catch (RuntimeException re) {
       log.warn("createCompositeProduct failed: {}", re.toString());

store-services/store-service/src/test/java/com/siriusxi/ms/store/pcs/MessagingTests.java

@@ -66,9 +66,9 @@ public void createCompositeProduct1() {
     Event<Integer, Product> expectedEvent =
         new Event<>(
             CREATE,
-            composite.getProductId(),
+            composite.productId(),
             new Product(
-                composite.getProductId(), composite.getName(), composite.getWeight(), null));
+                composite.productId(), composite.name(), composite.weight(), null));
     assertThat(queueProducts, is(receivesPayloadThat(sameEventExceptCreatedAt(expectedEvent))));
 
     // Assert none recommendations and review events
@@ -96,25 +96,25 @@ public void createCompositeProduct2() {
     Event<Integer, Product> expectedProductEvent =
         new Event<>(
             CREATE,
-            composite.getProductId(),
+            composite.productId(),
             new Product(
-                composite.getProductId(), composite.getName(), composite.getWeight(), null));
+                composite.productId(), composite.name(), composite.weight(), null));
     assertThat(queueProducts, receivesPayloadThat(sameEventExceptCreatedAt(expectedProductEvent)));
 
     // Assert one create recommendation event queued up
     assertEquals(1, queueRecommendations.size());
 
-    RecommendationSummary rec = composite.getRecommendations().get(0);
+    RecommendationSummary rec = composite.recommendations().get(0);
     Event<Integer, Recommendation> expectedRecommendationEvent =
         new Event<>(
             CREATE,
-            composite.getProductId(),
+            composite.productId(),
             new Recommendation(
-                composite.getProductId(),
-                rec.getRecommendationId(),
-                rec.getAuthor(),
-                rec.getRate(),
-                rec.getContent(),
+                composite.productId(),
+                rec.recommendationId(),
+                rec.author(),
+                rec.rate(),
+                rec.content(),
                 null));
     assertThat(
         queueRecommendations,
@@ -123,17 +123,17 @@ public void createCompositeProduct2() {
     // Assert one create review event queued up
     assertEquals(1, queueReviews.size());
 
-    ReviewSummary rev = composite.getReviews().get(0);
+    ReviewSummary rev = composite.reviews().get(0);
     Event<Integer, Review> expectedReviewEvent =
         new Event<>(
             CREATE,
-            composite.getProductId(),
+            composite.productId(),
             new Review(
-                composite.getProductId(),
-                rev.getReviewId(),
-                rev.getAuthor(),
-                rev.getSubject(),
-                rev.getContent(),
+                composite.productId(),
+                rev.reviewId(),
+                rev.author(),
+                rev.subject(),
+                rev.content(),
                 null));
 
     assertThat(queueReviews, receivesPayloadThat(sameEventExceptCreatedAt(expectedReviewEvent)));