Skip to content

Commit 596d7b4

Browse files
Fixed for Checkstyle
1 parent 0fa0cd3 commit 596d7b4

6 files changed

Lines changed: 31 additions & 10 deletions

File tree

spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/complex/ComplexConfiguration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ public ComplexConfiguration(
3131
*/
3232
@Bean
3333
@Override
34-
public PlatformTransactionManager transactionManager(final ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers)
34+
public PlatformTransactionManager transactionManager(
35+
final ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers
36+
)
3537
{
3638
return super.transactionManager(transactionManagerCustomizers);
3739
}

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/EclipseStoreRepositoryFactoryBean.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ private EclipseStoreClientConfiguration createConfiguration()
109109
try
110110
{
111111
if(this.configurationClass != null
112-
&& this.beanFactory.getBean(this.configurationClass) instanceof final EclipseStoreClientConfiguration eclipseStoreConfiguration)
112+
&& this.beanFactory.getBean(this.configurationClass)
113+
instanceof final EclipseStoreClientConfiguration eclipseStoreConfiguration
114+
)
113115
{
114116
return eclipseStoreConfiguration;
115117
}

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,13 @@ public TransactionsAnnotationTest(final AccountRepository repository)
4444
@Test
4545
void accountTransaction_UnexpectedError_Annotation()
4646
{
47-
try
48-
{
47+
Assertions.assertThrows(RuntimeException.class, () -> {
4948
final Account account1 = new Account(1, BigDecimal.TEN);
5049
final Account account2 = new Account(2, BigDecimal.ZERO);
5150
this.repository.saveAll(List.of(account1, account2));
5251

5352
throw new RuntimeException("Unexpected error");
54-
}
55-
catch(final RuntimeException e)
56-
{
57-
}
53+
});
5854
Assertions.assertEquals(0, TestUtil.iterableToList(this.repository.findAll()).size());
5955
}
6056
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ public TransactionsConcurrencyTest(final AccountRepository accountRepository)
5050
}
5151

5252
@Test
53-
void testSaveConcurrently_PreviouslyNonExistingAccounts(@Autowired final PlatformTransactionManager transactionManager)
53+
void testSaveConcurrently_PreviouslyNonExistingAccounts(
54+
@Autowired final PlatformTransactionManager transactionManager
55+
)
5456
throws InterruptedException
5557
{
5658
final List<Account> testAccounts =

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.springframework.transaction.TransactionSystemException;
2828
import org.springframework.transaction.support.TransactionTemplate;
2929

30+
import software.xdev.spring.data.eclipse.store.helper.TestUtil;
3031
import software.xdev.spring.data.eclipse.store.integration.isolated.IsolatedTestAnnotations;
3132

3233

@@ -245,4 +246,20 @@ void findStoredEntityWithinTransaction(@Autowired final PlatformTransactionManag
245246
}
246247
);
247248
}
249+
250+
/**
251+
* Opposite test to {@link TransactionsAnnotationTest#accountTransaction_UnexpectedError_Annotation()}.
252+
*/
253+
@Test
254+
void accountNoTransaction_UnexpectedError()
255+
{
256+
Assertions.assertThrows(RuntimeException.class, () -> {
257+
final Account account1 = new Account(1, BigDecimal.TEN);
258+
final Account account2 = new Account(2, BigDecimal.ZERO);
259+
this.accountRepository.saveAll(List.of(account1, account2));
260+
261+
throw new RuntimeException("Unexpected error");
262+
});
263+
Assertions.assertEquals(4, TestUtil.iterableToList(this.accountRepository.findAll()).size());
264+
}
248265
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ protected TransactionsTestConfiguration(
4242

4343
@Bean
4444
@Override
45-
public PlatformTransactionManager transactionManager(final ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers)
45+
public PlatformTransactionManager transactionManager(
46+
final ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers
47+
)
4648
{
4749
return super.transactionManager(transactionManagerCustomizers);
4850
}

0 commit comments

Comments
 (0)