Skip to content

Commit f20a444

Browse files
AB-xdevAB-xdev
committed
Fix even more PMD problems
1 parent 4dd8bc5 commit f20a444

7 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/transactions/TransactionsConcurrencyTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ <T extends Account> void saveConcurrently(
112112
{
113113
Assertions.assertEquals(
114114
BigDecimal.TEN,
115-
repository.findById(account.getId()).get().getBalance());
115+
repository.findById(account.getId()).orElseThrow().getBalance());
116116
}
117117
new TransactionTemplate(transactionManager).execute(
118118
status ->
@@ -123,7 +123,7 @@ <T extends Account> void saveConcurrently(
123123
});
124124
Assertions.assertEquals(
125125
BigDecimal.valueOf(9),
126-
repository.findById(account.getId()).get().getBalance());
126+
repository.findById(account.getId()).orElseThrow().getBalance());
127127
latch.countDown();
128128
}
129129
)
@@ -159,7 +159,7 @@ void testSaveConcurrentlyChangesOnSameAccount(
159159
new TransactionTemplate(transactionManager).execute(
160160
status ->
161161
{
162-
final AccountNoVersion loadedAccount = repository.findById(1).get();
162+
final AccountNoVersion loadedAccount = repository.findById(1).orElseThrow();
163163
loadedAccount.setBalance(loadedAccount.getBalance().add(BigDecimal.ONE));
164164
repository.save(loadedAccount);
165165
return null;
@@ -196,7 +196,7 @@ <T extends Account> void testSaveConcurrentlyChangesOnSameAccountMassRollback(
196196
status ->
197197
{
198198
final T loadedAccount =
199-
repository.findById(1).get();
199+
repository.findById(1).orElseThrow();
200200
loadedAccount.setBalance(loadedAccount.getBalance().add(BigDecimal.ONE));
201201
repository.save(loadedAccount);
202202
throw new RuntimeException("Random exception");
@@ -208,6 +208,6 @@ <T extends Account> void testSaveConcurrentlyChangesOnSameAccountMassRollback(
208208
);
209209

210210
assertTrue(latch.await(5, TimeUnit.SECONDS));
211-
Assertions.assertEquals(BigDecimal.TEN, repository.findById(1).get().getBalance());
211+
Assertions.assertEquals(BigDecimal.TEN, repository.findById(1).orElseThrow().getBalance());
212212
}
213213
}

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/transactions/TransactionsTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ void accountTransactionWorking(@Autowired final PlatformTransactionManager trans
8080

8181
Assertions.assertEquals(
8282
BigDecimal.valueOf(9),
83-
this.accountRepository.findById(this.account1.getId()).get().getBalance());
83+
this.accountRepository.findById(this.account1.getId()).orElseThrow().getBalance());
8484
Assertions.assertEquals(
8585
BigDecimal.ONE,
86-
this.accountRepository.findById(this.account2.getId()).get().getBalance());
86+
this.accountRepository.findById(this.account2.getId()).orElseThrow().getBalance());
8787
}
8888

8989
/**
@@ -107,7 +107,7 @@ void accountTransactionChangeAfterSave(@Autowired final PlatformTransactionManag
107107

108108
Assertions.assertEquals(
109109
BigDecimal.valueOf(8),
110-
this.accountRepository.findById(this.account1.getId()).get().getBalance());
110+
this.accountRepository.findById(this.account1.getId()).orElseThrow().getBalance());
111111
}
112112

113113
@Test
@@ -129,10 +129,10 @@ void accountAndCounterTransactionSequential(@Autowired final PlatformTransaction
129129

130130
Assertions.assertEquals(
131131
9,
132-
this.counterRepository.findById(this.counter1.getId()).get().getCount());
132+
this.counterRepository.findById(this.counter1.getId()).orElseThrow().getCount());
133133
Assertions.assertEquals(
134134
1,
135-
this.counterRepository.findById(this.counter2.getId()).get().getCount());
135+
this.counterRepository.findById(this.counter2.getId()).orElseThrow().getCount());
136136
}
137137

138138
/**
@@ -178,16 +178,16 @@ void accountAndCounterTransactionSameTransaction(@Autowired final PlatformTransa
178178

179179
Assertions.assertEquals(
180180
BigDecimal.valueOf(9),
181-
this.accountRepository.findById(this.account1.getId()).get().getBalance());
181+
this.accountRepository.findById(this.account1.getId()).orElseThrow().getBalance());
182182
Assertions.assertEquals(
183183
BigDecimal.ONE,
184-
this.accountRepository.findById(this.account2.getId()).get().getBalance());
184+
this.accountRepository.findById(this.account2.getId()).orElseThrow().getBalance());
185185
Assertions.assertEquals(
186186
9,
187-
this.counterRepository.findById(this.counter1.getId()).get().getCount());
187+
this.counterRepository.findById(this.counter1.getId()).orElseThrow().getCount());
188188
Assertions.assertEquals(
189189
1,
190-
this.counterRepository.findById(this.counter2.getId()).get().getCount());
190+
this.counterRepository.findById(this.counter2.getId()).orElseThrow().getCount());
191191
}
192192

193193
@Test
@@ -206,10 +206,10 @@ void accountTransactionUnexpectedError(@Autowired final PlatformTransactionManag
206206

207207
Assertions.assertEquals(
208208
BigDecimal.TEN,
209-
this.accountRepository.findById(this.account1.getId()).get().getBalance());
209+
this.accountRepository.findById(this.account1.getId()).orElseThrow().getBalance());
210210
Assertions.assertEquals(
211211
BigDecimal.ZERO,
212-
this.accountRepository.findById(this.account2.getId()).get().getBalance());
212+
this.accountRepository.findById(this.account2.getId()).orElseThrow().getBalance());
213213
}
214214

215215
/**

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/version/VersionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,8 @@ void findById(@Autowired final VersionedEntityWithIdRepository repository)
300300
this.configuration,
301301
() -> {
302302
Assertions.assertTrue(repository.findById(existingId).isPresent());
303-
Assertions.assertEquals(1, repository.findById(existingId).get().getVersion());
304-
Assertions.assertEquals(existingId, repository.findById(existingId).get().getId());
303+
Assertions.assertEquals(1, repository.findById(existingId).orElseThrow().getVersion());
304+
Assertions.assertEquals(existingId, repository.findById(existingId).orElseThrow().getId());
305305
}
306306
);
307307
}

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/tests/ConcurrencyTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void testChangeConcurrently() throws InterruptedException
116116
customer ->
117117
service.execute(() ->
118118
{
119-
final Customer existingCustomer = this.repository.findByFirstName(CUSTOMER_NO + 1).get();
119+
final Customer existingCustomer = this.repository.findByFirstName(CUSTOMER_NO + 1).orElseThrow();
120120
existingCustomer.setLastName("something");
121121
this.repository.save(existingCustomer);
122122
latch.countDown();
@@ -126,7 +126,7 @@ void testChangeConcurrently() throws InterruptedException
126126

127127
assertTrue(latch.await(5, TimeUnit.SECONDS));
128128

129-
final Customer customer = this.repository.findByFirstName(CUSTOMER_NO + 1).get();
129+
final Customer customer = this.repository.findByFirstName(CUSTOMER_NO + 1).orElseThrow();
130130
assertTrue(Strings.isNotEmpty(customer.getFirstName()));
131131
}
132132

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/tests/HashSetTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void testSaveAndResaveFindAll()
6868
this.repository.save(initial);
6969

7070
final CustomerWithHashSet resolved =
71-
TestUtil.iterableToList(this.repository.findAll()).stream().findFirst().get();
71+
TestUtil.iterableToList(this.repository.findAll()).stream().findFirst().orElseThrow();
7272
resolved.getValues().add("Test2");
7373
this.repository.save(resolved);
7474

@@ -129,7 +129,7 @@ void testSaveAndResetAndFindAllNonFinal()
129129
this.nonFinalRepository.save(initial);
130130

131131
final CustomerWithNonFinalHashSet resolved =
132-
TestUtil.iterableToList(this.nonFinalRepository.findAll()).stream().findFirst().get();
132+
TestUtil.iterableToList(this.nonFinalRepository.findAll()).stream().findFirst().orElseThrow();
133133
resolved.setValues(Set.of("Test", "Test2"));
134134
this.nonFinalRepository.save(resolved);
135135

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/tests/InheritanceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ void testChangeChildFindParent()
237237
this.childCustomerRepository.save(customer1);
238238
// Change customer
239239
final ChildCustomer foundCustomer =
240-
TestUtil.iterableToList(this.childCustomerRepository.findAll()).stream().findFirst().get();
240+
TestUtil.iterableToList(this.childCustomerRepository.findAll()).stream().findFirst().orElseThrow();
241241
foundCustomer.setFirstName(TestData.FIRST_NAME_ALTERNATIVE);
242242
this.childCustomerRepository.save(foundCustomer);
243243

‎spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/repository/root/EntityDataTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ void idGetterFirstNullThenReturningIdSameObject()
113113
Assertions.assertEquals(2, testData.getEntities().size());
114114

115115
testData.setIdGetter(this.idGetter);
116-
final Person foundPerson = testData.getEntities().stream().findFirst().get();
116+
final Person foundPerson = testData.getEntities().stream().findFirst().orElseThrow();
117117
testData.ensureEntityAndReturnObjectsToStore(foundPerson);
118118
Assertions.assertEquals(2, testData.getEntitiesById().size());
119119
Assertions.assertEquals(2, testData.getEntities().size());
@@ -130,7 +130,7 @@ void idGetterFirstReturnNullThenReturningIdSameObject()
130130
Assertions.assertEquals(2, testData.getEntities().size());
131131

132132
testData.setIdGetter(this.idGetter);
133-
final Person foundPerson = testData.getEntities().stream().findFirst().get();
133+
final Person foundPerson = testData.getEntities().stream().findFirst().orElseThrow();
134134
testData.ensureEntityAndReturnObjectsToStore(foundPerson);
135135
Assertions.assertEquals(2, testData.getEntitiesById().size());
136136
Assertions.assertEquals(2, testData.getEntities().size());

0 commit comments

Comments
 (0)