Skip to content

Commit f021aa3

Browse files
committed
Merge branch 'release/4.9.5'
2 parents 1b6b77c + 56ea01c commit f021aa3

File tree

17 files changed

+96
-85
lines changed

17 files changed

+96
-85
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>2.3.0.RC1</version>
9+
<version>2.3.0.M4</version>
1010
<relativePath/> <!-- lookup parent from repository -->
1111
</parent>
1212

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.siriusxi.ms.store</groupId>
77
<artifactId>store-build-chassis</artifactId>
88
<version>1.0-SNAPSHOT</version>
9-
<relativePath>../store-build-chassis</relativePath>
9+
<relativePath>../../store-build-chassis/pom.xml</relativePath>
1010
</parent>
1111

1212
<artifactId>store-cloud-chassis</artifactId>
@@ -36,9 +36,14 @@
3636
</exclusion>
3737
</exclusions>
3838
</dependency>
39+
<dependency>
40+
<groupId>org.junit.jupiter</groupId>
41+
<artifactId>junit-jupiter-engine</artifactId>
42+
<scope>test</scope>
43+
</dependency>
3944
<dependency>
4045
<groupId>org.junit.platform</groupId>
41-
<artifactId>junit-platform-suite-api</artifactId>
46+
<artifactId>junit-platform-runner</artifactId>
4247
<scope>test</scope>
4348
</dependency>
4449
<dependency>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>com.siriusxi.ms.store</groupId>
88
<artifactId>store-cloud-chassis</artifactId>
99
<version>1.0-SNAPSHOT</version>
10-
<relativePath>../store-cloud-chassis</relativePath>
10+
<relativePath>../../store-cloud-chassis/pom.xml</relativePath>
1111
</parent>
1212

1313
<artifactId>store-service-chassis</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.siriusxi.ms.store</groupId>
77
<artifactId>store-cloud-chassis</artifactId>
88
<version>1.0-SNAPSHOT</version>
9-
<relativePath>../store-base/store-cloud-chassis</relativePath>
9+
<relativePath>../../store-base/store-cloud-chassis/pom.xml</relativePath>
1010
</parent>
1111

1212
<groupId>com.siriusxi.cloud.infra</groupId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>com.siriusxi.ms.store</groupId>
77
<artifactId>store-cloud-chassis</artifactId>
88
<version>1.0-SNAPSHOT</version>
9-
<relativePath>../store-base/store-cloud-chassis</relativePath>
9+
<relativePath>../../store-base/store-cloud-chassis/pom.xml</relativePath>
1010
</parent>
1111

1212
<groupId>com.siriusxi.cloud.infra</groupId>

store-common/store-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<groupId>com.siriusxi.ms.store</groupId>
99
<artifactId>store-build-chassis</artifactId>
1010
<version>1.0-SNAPSHOT</version>
11-
<relativePath>../store-base/store-build-chassis</relativePath>
11+
<relativePath>../../store-base/store-build-chassis/pom.xml</relativePath>
1212
</parent>
1313

1414
<artifactId>store-api</artifactId>

store-common/store-utils/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<groupId>com.siriusxi.ms.store</groupId>
99
<artifactId>store-build-chassis</artifactId>
1010
<version>1.0-SNAPSHOT</version>
11-
<relativePath>../store-base/store-build-chassis</relativePath>
11+
<relativePath>../../store-base/store-build-chassis/pom.xml</relativePath>
1212
</parent>
1313

1414
<artifactId>store-utils</artifactId>

store-services/product-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<groupId>com.siriusxi.ms.store</groupId>
99
<artifactId>store-service-chassis</artifactId>
1010
<version>1.0-SNAPSHOT</version>
11-
<relativePath>../store-base/store-service-chassis</relativePath>
11+
<relativePath>../../store-base/store-service-chassis/pom.xml</relativePath>
1212
</parent>
1313

1414
<artifactId>product-service</artifactId>

store-services/product-service/src/test/java/com/siriusxi/ms/store/ps/ProductServiceApplicationTests.java

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ public void duplicateError() {
8080
sendCreateProductEvent(productId);
8181
fail("Expected a MessagingException here!");
8282
} catch (MessagingException me) {
83-
if (me.getCause() instanceof InvalidInputException iie) {
84-
assertEquals("Duplicate key, Product Id: " + productId, iie.getMessage());
83+
if (me.getCause() instanceof InvalidInputException iie){
84+
assertEquals("Duplicate key, Product Id: ".concat(String.valueOf(productId)), iie.getMessage());
8585
} else {
8686
fail("Expected a InvalidInputException as the root cause!");
8787
}
@@ -102,20 +102,21 @@ public void deleteProduct() {
102102

103103
@Test
104104
public void getProductInvalidParameterString() {
105-
106-
getAndVerifyProduct(BASE_URI + "/no-integer", BAD_REQUEST)
107-
.jsonPath("$.path").isEqualTo(BASE_URI + "no-integer")
105+
var uri = BASE_URI.concat("no-integer");
106+
getAndVerifyProduct(uri, BAD_REQUEST)
107+
.jsonPath("$.path").isEqualTo(uri)
108108
.jsonPath("$.message").isEqualTo("Type mismatch.");
109109
}
110110

111111
@Test
112112
public void getProductNotFound() {
113113

114114
int productIdNotFound = 13;
115+
115116
getAndVerifyProduct(productIdNotFound, NOT_FOUND)
116-
.jsonPath("$.path").isEqualTo(BASE_URI + productIdNotFound)
117+
.jsonPath("$.path").isEqualTo(BASE_URI.concat(String.valueOf(productIdNotFound)))
117118
.jsonPath("$.message")
118-
.isEqualTo("No product found for productId: " + productIdNotFound);
119+
.isEqualTo("No product found for productId: ".concat(String.valueOf(productIdNotFound)));
119120
}
120121

121122
@Test
@@ -124,13 +125,13 @@ public void getProductInvalidParameterNegativeValue() {
124125
int productIdInvalid = -1;
125126

126127
getAndVerifyProduct(productIdInvalid, UNPROCESSABLE_ENTITY)
127-
.jsonPath("$.path").isEqualTo(BASE_URI + productIdInvalid)
128-
.jsonPath("$.message").isEqualTo("Invalid productId: " + productIdInvalid);
128+
.jsonPath("$.path").isEqualTo(BASE_URI.concat(String.valueOf(productIdInvalid)))
129+
.jsonPath("$.message").isEqualTo("Invalid productId: ".concat(String.valueOf(productIdInvalid)));
129130
}
130131

131132
private WebTestClient.BodyContentSpec getAndVerifyProduct(
132133
int productId, HttpStatus expectedStatus) {
133-
return getAndVerifyProduct(BASE_URI + productId, expectedStatus);
134+
return getAndVerifyProduct(BASE_URI.concat(String.valueOf(productId)), expectedStatus);
134135
}
135136

136137
private WebTestClient.BodyContentSpec getAndVerifyProduct(
@@ -146,7 +147,10 @@ private WebTestClient.BodyContentSpec getAndVerifyProduct(
146147
}
147148

148149
private void sendCreateProductEvent(int productId) {
149-
Product product = new Product(productId, "Name " + productId, productId, "SA");
150+
var product = new Product(productId,
151+
"Name ".concat(String.valueOf(productId)),
152+
productId,
153+
"SA");
150154
Event<Integer, Product> event = new Event<>(CREATE, productId, product);
151155
input.send(new GenericMessage<>(event));
152156
}

store-services/recommendation-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<groupId>com.siriusxi.ms.store</groupId>
99
<artifactId>store-service-chassis</artifactId>
1010
<version>1.0-SNAPSHOT</version>
11-
<relativePath>../store-base/store-service-chassis</relativePath>
11+
<relativePath>../../store-base/store-service-chassis/pom.xml</relativePath>
1212
</parent>
1313

1414
<artifactId>recommendation-service</artifactId>

0 commit comments

Comments
 (0)