Skip to content

Commit add5fc3

Browse files
mohamed-tamanmohamed-taman
committed
Sonarlint recommendations fixes and code refactoring.
1 parent 19245a9 commit add5fc3

File tree

11 files changed

+92
-89
lines changed

11 files changed

+92
-89
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public static void main(String[] args) {
1515
ConfigurableApplicationContext ctx =
1616
SpringApplication.run(ProductServiceApplication.class, args);
1717

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);
18+
var mongoDbHost = ctx.getEnvironment().getProperty("spring.data.mongodb.host");
19+
var mongoDbPort = ctx.getEnvironment().getProperty("spring.data.mongodb.port");
20+
log.info("Connected to MongoDb: " + mongoDbHost + ":" + mongoDbPort);
2121
}
2222
}

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import static org.junit.jupiter.api.Assertions.*;
2222
import static org.springframework.data.domain.Sort.Direction.ASC;
2323

24-
// FIXME to fix all optional class check with isPresent()
2524
@DataMongoTest
2625
public class PersistenceTests {
2726

@@ -42,10 +41,10 @@ public void setupDb() {
4241
@Test
4342
public void create() {
4443

45-
ProductEntity newEntity = new ProductEntity(2, "n", 2);
44+
var newEntity = new ProductEntity(2, "n", 2);
4645
repository.save(newEntity);
4746

48-
ProductEntity foundEntity = repository.findById(newEntity.getId()).get();
47+
var foundEntity = repository.findById(newEntity.getId()).orElse(new ProductEntity());
4948
assertEqualsProduct(newEntity, foundEntity);
5049

5150
assertEquals(2, repository.count());
@@ -56,7 +55,7 @@ public void update() {
5655
savedEntity.setName("n2");
5756
repository.save(savedEntity);
5857

59-
ProductEntity foundEntity = repository.findById(savedEntity.getId()).get();
58+
var foundEntity = repository.findById(savedEntity.getId()).orElse(new ProductEntity());
6059
assertEquals(1, (long) foundEntity.getVersion());
6160
assertEquals("n2", foundEntity.getName());
6261
}
@@ -90,26 +89,27 @@ public void duplicateError() {
9089
public void optimisticLockError() {
9190

9291
// Store the saved entity in two separate entity objects
93-
ProductEntity entity1 = repository.findById(savedEntity.getId()).get();
94-
ProductEntity entity2 = repository.findById(savedEntity.getId()).get();
92+
ProductEntity entity1 = repository.findById(savedEntity.getId()).orElse(new ProductEntity()),
93+
entity2 = repository.findById(savedEntity.getId()).orElse(new ProductEntity());
9594

9695
// Update the entity using the first entity object
9796
entity1.setName("n1");
9897
repository.save(entity1);
9998

100-
// Update the entity using the second entity object.
101-
// This should fail since the second entity now holds a old version number, i.e. a Optimistic
102-
// Lock Error
99+
/*
100+
Update the entity using the second entity object.
101+
This should fail since the second entity now holds a old version number,
102+
i.e. a Optimistic Lock Error.
103+
*/
103104
try {
104105
entity2.setName("n2");
105106
repository.save(entity2);
106107

107108
fail("Expected an OptimisticLockingFailureException");
108-
} catch (OptimisticLockingFailureException ignored) {
109-
}
109+
} catch (OptimisticLockingFailureException ignored) { }
110110

111111
// Get the updated entity from the database and verify its new sate
112-
ProductEntity updatedEntity = repository.findById(savedEntity.getId()).get();
112+
var updatedEntity = repository.findById(savedEntity.getId()).orElse(new ProductEntity());
113113
assertEquals(1, (int) updatedEntity.getVersion());
114114
assertEquals("n1", updatedEntity.getName());
115115
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public static void main(String[] args) {
1515
ConfigurableApplicationContext ctx =
1616
SpringApplication.run(RecommendationServiceApplication.class, args);
1717

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);
18+
String mongoDbHost = ctx.getEnvironment().getProperty("spring.data.mongodb.host");
19+
String mongoDbPort = ctx.getEnvironment().getProperty("spring.data.mongodb.port");
20+
log.info("Connected to MongoDb: " + mongoDbHost + ":" + mongoDbPort);
2121
}
2222
}

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

+13-13
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import static org.hamcrest.Matchers.hasSize;
1717
import static org.junit.jupiter.api.Assertions.*;
1818

19-
// FIXME to fix all optional class check with isPresent()
2019
@DataMongoTest
2120
public class PersistenceTests {
2221

@@ -37,10 +36,10 @@ public void setupDb() {
3736
@Test
3837
public void create() {
3938

40-
RecommendationEntity newEntity = new RecommendationEntity(1, 3, "a", 3, "c");
39+
var newEntity = new RecommendationEntity(1, 3, "a", 3, "c");
4140
repository.save(newEntity);
4241

43-
RecommendationEntity foundEntity = repository.findById(newEntity.getId()).get();
42+
var foundEntity = repository.findById(newEntity.getId()).orElse(new RecommendationEntity());
4443
assertEqualsRecommendation(newEntity, foundEntity);
4544

4645
assertEquals(2, repository.count());
@@ -75,26 +74,26 @@ public void duplicateError() {
7574

7675
Assertions.assertThrows(
7776
DuplicateKeyException.class,
78-
() -> {
79-
RecommendationEntity entity = new RecommendationEntity(1, 2, "a", 3, "c");
80-
repository.save(entity);
81-
});
77+
() -> repository.save(new RecommendationEntity(1, 2, "a", 3, "c")));
8278
}
8379

8480
@Test
8581
public void optimisticLockError() {
8682

8783
// Store the saved entity in two separate entity objects
88-
RecommendationEntity entity1 = repository.findById(savedEntity.getId()).get();
89-
RecommendationEntity entity2 = repository.findById(savedEntity.getId()).get();
84+
RecommendationEntity
85+
entity1 = repository.findById(savedEntity.getId()).orElse(new RecommendationEntity()),
86+
entity2 = repository.findById(savedEntity.getId()).orElse(new RecommendationEntity());
9087

9188
// Update the entity using the first entity object
9289
entity1.setAuthor("a1");
9390
repository.save(entity1);
9491

95-
// Update the entity using the second entity object.
96-
// This should fail since the second entity now holds a old version number, i.e. a Optimistic
97-
// Lock Error
92+
/*
93+
Update the entity using the second entity object.
94+
This should fail since the second entity now holds a old version number,
95+
i.e. a Optimistic Lock Error.
96+
*/
9897
try {
9998
entity2.setAuthor("a2");
10099
repository.save(entity2);
@@ -104,7 +103,8 @@ public void optimisticLockError() {
104103
}
105104

106105
// Get the updated entity from the database and verify its new sate
107-
RecommendationEntity updatedEntity = repository.findById(savedEntity.getId()).get();
106+
var updatedEntity = repository.findById(savedEntity.getId()).orElse(new RecommendationEntity());
107+
108108
assertEquals(1, (int) updatedEntity.getVersion());
109109
assertEquals("a1", updatedEntity.getAuthor());
110110
}

‎review-service/src/test/java/com/siriusxi/ms/store/revs/PersistenceTests.java

+18-28
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class PersistenceTests {
3434
public void setupDb() {
3535
repository.deleteAll();
3636

37-
ReviewEntity entity = new ReviewEntity(1, 2, "amazon", "s", "c");
37+
var entity = new ReviewEntity(1, 2, "amazon", "s", "c");
3838
savedEntity = repository.save(entity);
3939

4040
assertEquals(entity, savedEntity);
@@ -43,26 +43,23 @@ public void setupDb() {
4343
@Test
4444
public void create() {
4545

46-
ReviewEntity newEntity = new ReviewEntity(1, 3, "amazon 1", "s", "c");
46+
var newEntity = new ReviewEntity(1, 3, "amazon 1", "s", "c");
4747
repository.save(newEntity);
4848

4949
Optional<ReviewEntity> entity = repository.findById(newEntity.getId());
50-
ReviewEntity foundEntity = new ReviewEntity();
51-
if(entity.isPresent()) foundEntity = entity.get();
5250

53-
assertEquals(newEntity, foundEntity);
51+
assertEquals(newEntity, entity.orElse(new ReviewEntity()));
5452

5553
assertEquals(2, repository.count());
5654
}
5755

5856
@Test
5957
public void update() {
58+
6059
savedEntity.setAuthor("amazon 2");
6160
repository.save(savedEntity);
6261

63-
Optional<ReviewEntity> entity = repository.findById(savedEntity.getId());
64-
ReviewEntity foundEntity = new ReviewEntity();
65-
if(entity.isPresent()) foundEntity = entity.get();
62+
var foundEntity = repository.findById(savedEntity.getId()).orElse(new ReviewEntity());
6663

6764
assertEquals(1, (long) foundEntity.getVersion());
6865
assertEquals("amazon 2", foundEntity.getAuthor());
@@ -71,6 +68,7 @@ public void update() {
7168
@Test
7269
public void delete() {
7370
repository.delete(savedEntity);
71+
7472
assertFalse(repository.existsById(savedEntity.getId()));
7573
}
7674

@@ -86,34 +84,28 @@ public void getByProductId() {
8684
public void duplicateError() {
8785

8886
Assertions.assertThrows(
89-
DataIntegrityViolationException.class,
90-
() -> {
91-
ReviewEntity entity = new ReviewEntity(1, 2, "amazon 1", "s", "c");
92-
repository.save(entity);
93-
});
87+
DataIntegrityViolationException.class,
88+
() -> repository.save(new ReviewEntity(
89+
1, 2, "amazon 1",
90+
"s", "c")));
9491
}
9592

9693
@Test
9794
public void optimisticLockError() {
9895

99-
ReviewEntity entity1 = new ReviewEntity(),
100-
entity2 = new ReviewEntity();
101-
10296
// Store the saved entity in two separate entity objects
103-
Optional<ReviewEntity> result = repository.findById(savedEntity.getId());
104-
if (result.isPresent()) entity1 = result.get();
105-
106-
Optional<ReviewEntity> result2 = repository.findById(savedEntity.getId());
107-
if (result2.isPresent()) entity2 = result2.get();
108-
97+
ReviewEntity entity1 = repository.findById(savedEntity.getId()).orElse(new ReviewEntity()),
98+
entity2 = repository.findById(savedEntity.getId()).orElse(new ReviewEntity());
10999

110100
// Update the entity using the first entity object
111101
entity1.setAuthor("amazon 1");
112102
repository.save(entity1);
113103

114-
// Update the entity using the second entity object.
115-
// This should fail since the second entity now holds a old version number, i.e. a Optimistic
116-
// Lock Error
104+
/*
105+
Update the entity using the second entity object.
106+
This should fail since the second entity now holds a old version number,
107+
i.e. a Optimistic Lock Error
108+
*/
117109
try {
118110
entity2.setAuthor("amazon 2");
119111
repository.save(entity2);
@@ -123,9 +115,7 @@ public void optimisticLockError() {
123115
}
124116

125117
// Get the updated entity from the database and verify its new sate
126-
Optional<ReviewEntity> foundEntity = repository.findById(savedEntity.getId());
127-
ReviewEntity updatedEntity = new ReviewEntity();
128-
if(foundEntity.isPresent()) updatedEntity = foundEntity.get();
118+
var updatedEntity = repository.findById(savedEntity.getId()).orElse(new ReviewEntity());
129119

130120
assertEquals(1, updatedEntity.getVersion());
131121
assertEquals("amazon 1", updatedEntity.getAuthor());

‎store-service/src/main/java/com/siriusxi/ms/store/pcs/api/StoreController.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
@RestController
1212
@Log4j2
1313
public class StoreController implements StoreEndpoint {
14-
/** Store service business logic interface. */
14+
15+
/**
16+
* Store service business logic interface.
17+
*/
1518
private final StoreService storeService;
1619

1720
@Autowired

0 commit comments

Comments
 (0)