Merge branch 'release/4.9'

Author: mohamed-taman

store-base/store-build-chassis/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.0.M4</version>
+        <version>2.3.0.RC1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 

store-base/store-cloud-chassis/pom.xml

@@ -47,6 +47,13 @@
 			<scope>test</scope>
 		</dependency>
 		<!-- End - Testing dependencies -->
+		<!-- Start - High-performance caching library for Java used	by new Spring Cloud
+		LoadBalancer -->
+		<dependency>
+			<groupId>com.github.ben-manes.caffeine</groupId>
+			<artifactId>caffeine</artifactId>
+		</dependency>
+		<!-- End - High-performance caching library for Java caffeine -->
 	</dependencies>
 
 	<build>

store-cloud-infra/edge-server/src/main/java/com/siriusxi/cloud/infra/gateway/config/GatewayConfiguration.java

@@ -13,6 +13,7 @@
 
 import java.util.Map;
 
+// TODO add swagger API
 @Configuration
 @Log4j2
 public class GatewayConfiguration {
@@ -26,30 +27,30 @@ public GatewayConfiguration(WebClient.Builder webClientBuilder) {
     this.webClientBuilder = webClientBuilder;
   }
 
-    /**
-     * This method is to check all the services health status, and Gateway service health will be
-     * only in up health state if and only if all of the core services and dependencies are up
-     * and running.
-     *
-     * @return ReactiveHealthContributor information about all the core microservices.
-     */
-    @Bean(name = "Core Microservices")
-    ReactiveHealthContributor coreServices() {
+  /**
+   * This method is to check all the services health status, and Gateway service health will be only
+   * in up health state if and only if all of the core services and dependencies are up and running.
+   *
+   * @return ReactiveHealthContributor information about all the core microservices.
+   */
+  @Bean(name = "Core Microservices")
+  ReactiveHealthContributor coreServices() {
 
-        ReactiveHealthIndicator productHealthIndicator = () -> getServicesHealth("http://product");
-        ReactiveHealthIndicator recommendationHealthIndicator = () -> getServicesHealth("http://recommendation");
-        ReactiveHealthIndicator reviewHealthIndicator = () -> getServicesHealth("http://review");
-        ReactiveHealthIndicator storeHealthIndicator = () -> getServicesHealth("http://store");
+    ReactiveHealthIndicator productHealthIndicator = () -> getServicesHealth("http://product");
+    ReactiveHealthIndicator recommendationHealthIndicator =
+        () -> getServicesHealth("http://recommendation");
+    ReactiveHealthIndicator reviewHealthIndicator = () -> getServicesHealth("http://review");
+    ReactiveHealthIndicator storeHealthIndicator = () -> getServicesHealth("http://store");
 
-        Map<String, ReactiveHealthContributor> allIndicators =
-                Map.of(
-                        "Product Service", productHealthIndicator,
-                        "Recommendation Service", recommendationHealthIndicator,
-                        "Review Service", reviewHealthIndicator,
-                        "Store Service",storeHealthIndicator);
+    Map<String, ReactiveHealthContributor> allIndicators =
+        Map.of(
+            "Product Service", productHealthIndicator,
+            "Recommendation Service", recommendationHealthIndicator,
+            "Review Service", reviewHealthIndicator,
+            "Store Service", storeHealthIndicator);
 
-        return CompositeReactiveHealthContributor.fromMap(allIndicators);
-    }
+    return CompositeReactiveHealthContributor.fromMap(allIndicators);
+  }
 
   private Mono<Health> getServicesHealth(String url) {
     url += "/actuator/health";

store-cloud-infra/edge-server/src/main/resources/application.yml

@@ -6,43 +6,44 @@ spring:
   cloud:
     loadbalancer.ribbon.enabled: false
     # Route definitions of the system
-    gateway.routes:
-      - id: store-products
-        # lb:// is used to direct Spring Cloud Gateway to use the client-side load balancer
-        # to look up the destination in the discovery service.
-        uri: lb://store
-        predicates:
-          - Path=/store/**
+    gateway:
+      discovery.locator.enabled: true
+      routes:
+        - id: store-products
+          # lb:// is used to direct Spring Cloud Gateway to use the client-side load balancer
+          # to look up the destination in the discovery service.
+          uri: lb://store
+          predicates:
+            - Path=/store/**
 
-      - id: eureka-api
-        uri: http://${app.eureka-server}:8761
-        predicates:
-          - Path=/eureka/api/{segment}
-        filters:
-          - SetPath=/eureka/{segment}
+        - id: eureka-api
+          uri: http://${eureka.instance.hostname}:8761
+          predicates:
+            - Path=/eureka/api/{segment}
+          filters:
+            - SetPath=/eureka/{segment}
 
-      - id: eureka-web-start
-        uri: http://${app.eureka-server}:8761
-        predicates:
-          - Path=/eureka/web
-        filters:
-          - SetPath=/
+        - id: eureka-web-start
+          uri: http://${eureka.instance.hostname}:8761
+          predicates:
+            - Path=/eureka/web
+          filters:
+            - SetPath=/
 
-      - id: eureka-web-other
-        uri: http://${app.eureka-server}:8761
-        predicates:
-          - Path=/eureka/**
-
-app.eureka-server: localhost
+        - id: eureka-web-other
+          uri: http://${eureka.instance.hostname}:8761
+          predicates:
+            - Path=/eureka/**
 
 eureka:
   instance:
+    hostname: localhost
     lease-renewal-interval-in-seconds: 5
     lease-expiration-duration-in-seconds: 5
     prefer-ip-address: true
   client:
     healthcheck.enabled: true
-    service-Url.defaultZone: http://${app.eureka-server}:8761/eureka/
+    service-Url.defaultZone: http://${eureka.instance.hostname}:8761/eureka/
     initial-instance-info-replication-interval-seconds: 5
     registry-fetch-interval-seconds: 5
 
@@ -67,6 +68,5 @@ spring.profiles: docker
 
 eureka:
   instance:
-    prefer-ip-address: false
-
-app.eureka-server: eureka
+    hostname: eureka
+    prefer-ip-address: false

store-cloud-infra/edge-server/src/test/java/com/siriusxi/cloud/infra/gateway/EdgeServerApplicationTests.java

@@ -9,7 +9,6 @@
 @SpringBootTest(
     webEnvironment = RANDOM_PORT,
     properties = {"eureka.client.enabled: false"})
-// TODO add test cases https://spring.io/guides/gs/gateway/
 class EdgeServerApplicationTests {
 
   @Test

store-cloud-infra/eureka-server/pom.xml

@@ -23,12 +23,5 @@
 			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
 		</dependency>
 		<!-- End - Spring cloud Eureka service discovery server -->
-		<!-- Start - High-performance caching library for Java used	by new Spring Cloud
-		LoadBalancer -->
-		<dependency>
-			<groupId>com.github.ben-manes.caffeine</groupId>
-			<artifactId>caffeine</artifactId>
-		</dependency>
-		<!-- End - High-performance caching library for Java caffeine -->
 	</dependencies>
 </project>

store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/service/ProductServiceImpl.java

@@ -82,7 +82,7 @@ public void deleteProduct(int productId) {
             .block();
   }
 
-  // TODO Cloud be added to utilities class to be used by all core services implementations.
+  // TODO could be added to a utility class to be used by all core services implementations.
   private void isValidProductId(int productId) {
     if (productId < 1) throw new InvalidInputException("Invalid productId: " + productId);
   }