Skip to content

Commit 188809e

Browse files
mohamed-tamanmohamed-taman
committed
Merge branch 'release/3.7'
2 parents bff4969 + 5b9d72f commit 188809e

File tree

50 files changed

+1356
-1108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1356
-1108
lines changed

‎docker-compose.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ services:
2121
- SPRING_PROFILES_ACTIVE=docker
2222
depends_on:
2323
- mysql
24+
restart: on-failure
2425

2526
store:
2627
build: store-service
@@ -35,11 +36,12 @@ services:
3536
ports:
3637
- "27017-27019:27017-27019"
3738
healthcheck:
38-
test: echo 'db.runCommand("ping").ok' | mongo mongo:27017/test --quiet 1
39+
test: echo 'db.runCommand("ping").ok' | mongo mongodb:27017/test --quiet 1
3940
interval: 10s
4041
timeout: 10s
4142
retries: 5
4243
start_period: 40s
44+
restart: always
4345

4446
# $ mysql -uroot -h127.0.0.1 -p
4547
mysql:
@@ -51,8 +53,10 @@ services:
5153
- MYSQL_DATABASE=review-db
5254
- MYSQL_USER=user
5355
- MYSQL_PASSWORD=pwd
56+
- MYSQL_ROOT_HOST=%
5457
healthcheck:
5558
test: ["CMD", "mysqladmin" ,"ping", "-uuser", "-ppwd", "-h", "localhost"]
5659
interval: 10s
5760
timeout: 5s
5861
retries: 10
62+
restart: always

‎product-service/pom.xml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>com.siriusxi.ms.store</groupId>
9-
<artifactId>store-service-chassis</artifactId>
10-
<version>1.0-SNAPSHOT</version>
11-
<relativePath>../store-service-chassis</relativePath>
12-
</parent>
13-
14-
<artifactId>product-service</artifactId>
15-
<name>Product Service</name>
16-
<version>1.0-SNAPSHOT</version>
17-
<description>Product Service Spring Boot based project</description>
18-
<packaging>jar</packaging>
7+
<parent>
8+
<groupId>com.siriusxi.ms.store</groupId>
9+
<artifactId>store-service-chassis</artifactId>
10+
<version>1.0-SNAPSHOT</version>
11+
<relativePath>../store-service-chassis</relativePath>
12+
</parent>
1913

20-
<dependencies>
21-
<!-- Start - Data technology layer -->
22-
<dependency>
23-
<groupId>org.springframework.boot</groupId>
24-
<artifactId>spring-boot-starter-data-mongodb</artifactId>
25-
</dependency>
26-
<!-- End - Data technology layer -->
14+
<artifactId>product-service</artifactId>
15+
<name>Product Service</name>
16+
<version>1.0-SNAPSHOT</version>
17+
<description>Product Service Spring Boot based project</description>
18+
<packaging>jar</packaging>
2719

28-
<!-- Start - Data technology test layer -->
29-
<dependency>
30-
<groupId>de.flapdoodle.embed</groupId>
31-
<artifactId>de.flapdoodle.embed.mongo</artifactId>
32-
<scope>test</scope>
33-
</dependency>
34-
<!-- End - Data technology test layer -->
35-
</dependencies>
20+
<dependencies>
21+
<!-- Start - Data technology layer -->
22+
<dependency>
23+
<groupId>org.springframework.boot</groupId>
24+
<artifactId>spring-boot-starter-data-mongodb</artifactId>
25+
</dependency>
26+
<!-- End - Data technology layer -->
27+
28+
<!-- Start - Data technology test layer -->
29+
<dependency>
30+
<groupId>de.flapdoodle.embed</groupId>
31+
<artifactId>de.flapdoodle.embed.mongo</artifactId>
32+
<scope>test</scope>
33+
</dependency>
34+
<!-- End - Data technology test layer -->
35+
</dependencies>
3636
</project>

‎product-service/src/main/java/com/siriusxi/ms/store/ps/ProductServiceApplication.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
@Log4j2
1212
public class ProductServiceApplication {
1313

14-
public static void main(String[] args) {
15-
ConfigurableApplicationContext ctx = SpringApplication.run(ProductServiceApplication.class, args);
16-
17-
String mongodDbHost = ctx.getEnvironment().getProperty("spring.data.mongodb.host");
18-
String mongodDbPort = ctx.getEnvironment().getProperty("spring.data.mongodb.port");
19-
log.info("Connected to MongoDb: " + mongodDbHost + ":" + mongodDbPort);
20-
}
14+
public static void main(String[] args) {
15+
ConfigurableApplicationContext ctx =
16+
SpringApplication.run(ProductServiceApplication.class, args);
2117

18+
String mongodDbHost = ctx.getEnvironment().getProperty("spring.data.mongodb.host");
19+
String mongodDbPort = ctx.getEnvironment().getProperty("spring.data.mongodb.port");
20+
log.info("Connected to MongoDb: " + mongodDbHost + ":" + mongodDbPort);
21+
}
2222
}

‎product-service/src/main/java/com/siriusxi/ms/store/ps/persistence/ProductEntity.java

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,24 @@
77
import org.springframework.data.mongodb.core.index.Indexed;
88
import org.springframework.data.mongodb.core.mapping.Document;
99

10-
@Document(collection="products")
10+
@Document(collection = "products")
1111
@Data
1212
@NoArgsConstructor
1313
public class ProductEntity {
14-
@Id
15-
private String id;
14+
@Id private String id;
1615

17-
@Version
18-
private Integer version;
16+
@Version private Integer version;
1917

20-
@Indexed(unique = true)
21-
private int productId;
18+
@Indexed(unique = true)
19+
private int productId;
2220

23-
private String name;
21+
private String name;
2422

25-
private int weight;
23+
private int weight;
2624

27-
public ProductEntity(int productId, String name, int weight) {
28-
this.productId = productId;
29-
this.name = name;
30-
this.weight = weight;
31-
}
25+
public ProductEntity(int productId, String name, int weight) {
26+
this.productId = productId;
27+
this.name = name;
28+
this.weight = weight;
29+
}
3230
}

‎product-service/src/main/java/com/siriusxi/ms/store/ps/persistence/ProductRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
@Repository
99
public interface ProductRepository extends PagingAndSortingRepository<ProductEntity, String> {
1010

11-
Optional<ProductEntity> findByProductId(int productId);
11+
Optional<ProductEntity> findByProductId(int productId);
1212
}

‎product-service/src/main/java/com/siriusxi/ms/store/ps/service/ProductMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@Mapper(componentModel = "spring")
1010
public interface ProductMapper {
1111

12-
ProductMapper INSTANCE = Mappers.getMapper( ProductMapper.class);
12+
ProductMapper INSTANCE = Mappers.getMapper(ProductMapper.class);
1313

1414
@Mapping(target = "serviceAddress", ignore = true)
1515
Product entityToApi(ProductEntity entity);

‎product-service/src/main/resources/application.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spring:
77
port: 27017
88
database: product-db
99
auto-index-creation: true
10-
10+
1111
server:
1212
port: 9081
1313

‎product-service/src/test/java/com/siriusxi/ms/store/ps/MapperTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package com.siriusxi.ms.store.ps;
22

33
import com.siriusxi.ms.store.api.core.product.dto.Product;
4-
import com.siriusxi.ms.store.ps.service.ProductMapper;
54
import com.siriusxi.ms.store.ps.persistence.ProductEntity;
5+
import com.siriusxi.ms.store.ps.service.ProductMapper;
66
import org.junit.jupiter.api.Test;
77

88
import static org.junit.jupiter.api.Assertions.*;
99

1010
public class MapperTests {
1111

12-
private final ProductMapper mapper = ProductMapper.INSTANCE;
12+
private final ProductMapper mapper = ProductMapper.INSTANCE;
1313

1414
@Test
1515
public void mapperTests() {

‎recommendation-service/pom.xml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>com.siriusxi.ms.store</groupId>
9-
<artifactId>store-service-chassis</artifactId>
10-
<version>1.0-SNAPSHOT</version>
11-
<relativePath>../store-service-chassis</relativePath>
12-
</parent>
13-
14-
<artifactId>recommendation-service</artifactId>
15-
<name>Recommendation Service</name>
16-
<version>1.0-SNAPSHOT</version>
17-
<description>Recommendation Service Spring Boot based project</description>
18-
<packaging>jar</packaging>
7+
<parent>
8+
<groupId>com.siriusxi.ms.store</groupId>
9+
<artifactId>store-service-chassis</artifactId>
10+
<version>1.0-SNAPSHOT</version>
11+
<relativePath>../store-service-chassis</relativePath>
12+
</parent>
1913

20-
<dependencies>
21-
<!-- Start - Data technology layer -->
22-
<dependency>
23-
<groupId>org.springframework.boot</groupId>
24-
<artifactId>spring-boot-starter-data-mongodb</artifactId>
25-
</dependency>
26-
<!-- End - Data technology layer -->
14+
<artifactId>recommendation-service</artifactId>
15+
<name>Recommendation Service</name>
16+
<version>1.0-SNAPSHOT</version>
17+
<description>Recommendation Service Spring Boot based project</description>
18+
<packaging>jar</packaging>
2719

28-
<!-- Start - Data technology test layer -->
29-
<dependency>
30-
<groupId>de.flapdoodle.embed</groupId>
31-
<artifactId>de.flapdoodle.embed.mongo</artifactId>
32-
<scope>test</scope>
33-
</dependency>
34-
<!-- End - Data technology test layer -->
35-
</dependencies>
20+
<dependencies>
21+
<!-- Start - Data technology layer -->
22+
<dependency>
23+
<groupId>org.springframework.boot</groupId>
24+
<artifactId>spring-boot-starter-data-mongodb</artifactId>
25+
</dependency>
26+
<!-- End - Data technology layer -->
27+
28+
<!-- Start - Data technology test layer -->
29+
<dependency>
30+
<groupId>de.flapdoodle.embed</groupId>
31+
<artifactId>de.flapdoodle.embed.mongo</artifactId>
32+
<scope>test</scope>
33+
</dependency>
34+
<!-- End - Data technology test layer -->
35+
</dependencies>
3636
</project>

‎recommendation-service/src/main/java/com/siriusxi/ms/store/rs/RecommendationServiceApplication.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
@Log4j2
1212
public class RecommendationServiceApplication {
1313

14-
public static void main(String[] args) {
15-
ConfigurableApplicationContext ctx = SpringApplication.run(RecommendationServiceApplication.class, args);
16-
17-
String mongodDbHost = ctx.getEnvironment().getProperty("spring.data.mongodb.host");
18-
String mongodDbPort = ctx.getEnvironment().getProperty("spring.data.mongodb.port");
19-
log.info("Connected to MongoDb: " + mongodDbHost + ":" + mongodDbPort);
20-
}
14+
public static void main(String[] args) {
15+
ConfigurableApplicationContext ctx =
16+
SpringApplication.run(RecommendationServiceApplication.class, args);
2117

18+
String mongodDbHost = ctx.getEnvironment().getProperty("spring.data.mongodb.host");
19+
String mongodDbPort = ctx.getEnvironment().getProperty("spring.data.mongodb.port");
20+
log.info("Connected to MongoDb: " + mongodDbHost + ":" + mongodDbPort);
21+
}
2222
}

‎recommendation-service/src/main/java/com/siriusxi/ms/store/rs/persistence/RecommendationEntity.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
@NoArgsConstructor
1717
public class RecommendationEntity {
1818

19-
@Id
20-
private String id;
19+
@Id private String id;
2120

22-
@Version
23-
private Integer version;
21+
@Version private Integer version;
2422

2523
private int productId;
2624
private int recommendationId;
@@ -36,5 +34,4 @@ public RecommendationEntity(
3634
this.rating = rating;
3735
this.content = content;
3836
}
39-
4037
}

‎recommendation-service/src/main/java/com/siriusxi/ms/store/rs/persistence/RecommendationRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77

88
@Repository
99
public interface RecommendationRepository extends CrudRepository<RecommendationEntity, String> {
10-
List<RecommendationEntity> findByProductId(int productId);
11-
}
10+
List<RecommendationEntity> findByProductId(int productId);
11+
}

‎recommendation-service/src/test/java/com/siriusxi/ms/store/rs/MapperTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.siriusxi.ms.store.rs;
22

33
import com.siriusxi.ms.store.api.core.recommendation.dto.Recommendation;
4-
import com.siriusxi.ms.store.rs.service.RecommendationMapper;
54
import com.siriusxi.ms.store.rs.persistence.RecommendationEntity;
5+
import com.siriusxi.ms.store.rs.service.RecommendationMapper;
66
import org.junit.jupiter.api.Test;
77

88
import java.util.Collections;

0 commit comments

Comments
 (0)