Merge branch 'release/4.9'

mohamed-taman · May 5, 2020 · b744d61 · b744d61
2 parents f021aa3 + c9a1675
commit b744d61
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 24 deletions.
diff --git a/store-base/store-build-chassis/pom.xml b/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>
 

diff --git a/.../infra/gateway/EdgeServerApplication.java → ...iusxi/cloud/infra/gateway/EdgeServer.java b/.../infra/gateway/EdgeServerApplication.java → ...iusxi/cloud/infra/gateway/EdgeServer.java
@@ -7,7 +7,7 @@
 import org.springframework.web.reactive.function.client.WebClient;
 
 @SpringBootApplication
-public class EdgeServerApplication {
+public class EdgeServer {
 
 	@Bean
 	@LoadBalanced
@@ -16,7 +16,7 @@ public WebClient.Builder loadBalancedWebClientBuilder() {
 	}
 
 	public static void main(String[] args) {
-		SpringApplication.run(EdgeServerApplication.class, args);
+		SpringApplication.run(EdgeServer.class, args);
 	}
 
 }
diff --git a/store-cloud-infra/edge-server/src/main/resources/application.yml b/store-cloud-infra/edge-server/src/main/resources/application.yml
@@ -35,6 +35,11 @@ spring:
           predicates:
             - Path=/eureka/**
 
+server:
+  error:
+    include-message: always
+    include-binding-errors: always
+
 eureka:
   instance:
     hostname: localhost

diff --git a/...a/gateway/EdgeServerApplicationTests.java → .../cloud/infra/gateway/EdgeServerTests.java b/...a/gateway/EdgeServerApplicationTests.java → .../cloud/infra/gateway/EdgeServerTests.java
@@ -9,7 +9,7 @@
 @SpringBootTest(
     webEnvironment = RANDOM_PORT,
     properties = {"eureka.client.enabled: false"})
-class EdgeServerApplicationTests {
+class EdgeServerTests {
 
   @Test
   void contextLoads() {

diff --git a/store-cloud-infra/eureka-server/src/main/resources/application.yml b/store-cloud-infra/eureka-server/src/main/resources/application.yml
@@ -5,7 +5,12 @@ spring:
   # It is recommended switching to BlockingLoadBalancerClient instead.
   cloud.loadbalancer.ribbon.enabled: false
 
-server.port: 8761
+server:
+  port: 8761
+  ## Should be included to show message, if not error message will be empty
+  error:
+    include-message: always
+    include-binding-errors: always
 
 logging.level:
     com.netflix:

diff --git a/store-services/product-service/src/main/resources/application.yml b/store-services/product-service/src/main/resources/application.yml
@@ -45,6 +45,9 @@ spring:
 
 server:
   port: 9081
+  error:
+    include-message: always
+    include-binding-errors: always
 
 logging.level:
     web: DEBUG

diff --git a/store-services/recommendation-service/src/main/resources/application.yml b/store-services/recommendation-service/src/main/resources/application.yml
@@ -44,6 +44,9 @@ spring:
 
 server:
   port: 9082
+  error:
+    include-message: always
+    include-binding-errors: always
 
 logging.level:
     web: DEBUG

diff --git a/store-services/review-service/src/main/resources/application.yaml b/store-services/review-service/src/main/resources/application.yaml
@@ -5,8 +5,8 @@ spring:
     open-in-view: false
     database: MYSQL
     properties.hibernate.dialect: org.hibernate.dialect.MySQL8Dialect
-      # Strongly recommend to set this property to "none" or with flyway  to "validate" in a
-      # production environment!
+    # Strongly recommend to set this property to "none" or with flyway  to "validate" in a
+    # production environment!
     hibernate.ddl-auto: none
   datasource:
     ## You often do not need to specify the driver-class-name,
@@ -41,13 +41,13 @@ spring:
       defaultBinder: rabbit
       default.contentType: application/json
       bindings.input:
-          destination: reviews
-          group: reviewsGroup
-          consumer:
-            maxAttempts: 3
-            backOffInitialInterval: 500
-            backOffMaxInterval: 1000
-            backOffMultiplier: 2.0
+        destination: reviews
+        group: reviewsGroup
+        consumer:
+          maxAttempts: 3
+          backOffInitialInterval: 500
+          backOffMaxInterval: 1000
+          backOffMultiplier: 2.0
       rabbit.bindings.input.consumer:
         autoBindDlq: true
         republishToDlq: true
@@ -66,16 +66,20 @@ app:
     rabbitmq.host: 127.0.0.1
     kafka.broker: 127.0.0.1
 
-server.port: 9083
+server:
+  port: 9083
+  error:
+    include-message: always
+    include-binding-errors: always
 
 logging.level:
-    web: DEBUG
-    root: INFO
-    com.siriusxi.ms.store: DEBUG
-    org:
-      hibernate:
-        SQL: DEBUG
-        type.descriptor.sql.BasicBinder: TRACE
+  web: DEBUG
+  root: INFO
+  com.siriusxi.ms.store: DEBUG
+  org:
+    hibernate:
+      SQL: DEBUG
+      type.descriptor.sql.BasicBinder: TRACE
 
 management:
   info.git:
@@ -108,7 +112,8 @@ spring:
   datasource:
     url: "jdbc:mysql://${app.database.host}/${app.database.schema}"
 
-server.port: 8080
+server:
+  port: 8080
 
 eureka:
   instance:

diff --git a/store-services/store-service/src/main/resources/application.yml b/store-services/store-service/src/main/resources/application.yml
@@ -1,5 +1,9 @@
 # Server configs
-server.port: 9080
+server:
+  port: 9080
+  error:
+    include-message: always
+    include-binding-errors: always
 
 spring:
   application.name: store