Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate code to Java 17 style.

Browse Source 
Use var instead of explicit local types where applicable. Use pattern variable instead instanceof and cast. Prefer loops and nullable types over Stream and Optional. Convert classes to records where applicable.

See #2465
This commit is contained in:
Mark Paluch
2021-10-05 15:21:12 +02:00
committed by Jens Schauder
parent d4036ec0a9
commit c735b58607
463 changed files with 3670 additions and 4014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/springframework/data/transaction/ChainedTransactionManager.java
View File

@@ -21,10 +21,10 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.lang.Nullable;
import org.springframework.transaction.CannotCreateTransactionException;
import org.springframework.transaction.HeuristicCompletionException;
@@ -107,7 +107,7 @@ public class ChainedTransactionManager implements PlatformTransactionManager {
*/
public MultiTransactionStatus getTransaction(@Nullable TransactionDefinition definition) throws TransactionException {
MultiTransactionStatus mts = new MultiTransactionStatus(transactionManagers.get(0));
var mts = new MultiTransactionStatus(transactionManagers.get(0));
if (definition == null) {
return mts;
@@ -120,15 +120,15 @@ public class ChainedTransactionManager implements PlatformTransactionManager {
try {
for (PlatformTransactionManager transactionManager : transactionManagers) {
for (var transactionManager : transactionManagers) {
mts.registerTransactionManager(definition, transactionManager);
}
} catch (Exception ex) {
Map<PlatformTransactionManager, TransactionStatus> transactionStatuses = mts.getTransactionStatuses();
var transactionStatuses = mts.getTransactionStatuses();
for (PlatformTransactionManager transactionManager : transactionManagers) {
for (var transactionManager : transactionManagers) {
try {
if (transactionStatuses.get(transactionManager) != null) {
transactionManager.rollback(transactionStatuses.get(transactionManager));
@@ -154,13 +154,13 @@ public class ChainedTransactionManager implements PlatformTransactionManager {
*/
public void commit(TransactionStatus status) throws TransactionException {
MultiTransactionStatus multiTransactionStatus = (MultiTransactionStatus) status;
var multiTransactionStatus = (MultiTransactionStatus) status;
boolean commit = true;
var commit = true;
Exception commitException = null;
PlatformTransactionManager commitExceptionTransactionManager = null;
for (PlatformTransactionManager transactionManager : reverse(transactionManagers)) {
for (var transactionManager : reverse(transactionManagers)) {
if (commit) {
@@ -189,8 +189,8 @@ public class ChainedTransactionManager implements PlatformTransactionManager {
}
if (commitException != null) {
boolean firstTransactionManagerFailed = commitExceptionTransactionManager == getLastTransactionManager();
int transactionState = firstTransactionManagerFailed ? HeuristicCompletionException.STATE_ROLLED_BACK
var firstTransactionManagerFailed = commitExceptionTransactionManager == getLastTransactionManager();
var transactionState = firstTransactionManagerFailed ? HeuristicCompletionException.STATE_ROLLED_BACK
: HeuristicCompletionException.STATE_MIXED;
throw new HeuristicCompletionException(transactionState, commitException);
}
@@ -205,9 +205,9 @@ public class ChainedTransactionManager implements PlatformTransactionManager {
Exception rollbackException = null;
PlatformTransactionManager rollbackExceptionTransactionManager = null;
MultiTransactionStatus multiTransactionStatus = (MultiTransactionStatus) status;
var multiTransactionStatus = (MultiTransactionStatus) status;
for (PlatformTransactionManager transactionManager : reverse(transactionManagers)) {
for (var transactionManager : reverse(transactionManagers)) {
try {
multiTransactionStatus.rollback(transactionManager);
} catch (Exception ex) {

18
src/main/java/org/springframework/data/transaction/MultiTransactionStatus.java
View File

@@ -70,7 +70,7 @@ class MultiTransactionStatus implements TransactionStatus {
}
public void commit(PlatformTransactionManager transactionManager) {
TransactionStatus transactionStatus = getTransactionStatus(transactionManager);
var transactionStatus = getTransactionStatus(transactionManager);
transactionManager.commit(transactionStatus);
}
@@ -120,7 +120,7 @@ class MultiTransactionStatus implements TransactionStatus {
* @see org.springframework.transaction.TransactionStatus#setRollbackOnly()
*/
public void setRollbackOnly() {
for (TransactionStatus ts : transactionStatuses.values()) {
for (var ts : transactionStatuses.values()) {
ts.setRollbackOnly();
}
}
@@ -131,9 +131,9 @@ class MultiTransactionStatus implements TransactionStatus {
*/
public Object createSavepoint() throws TransactionException {
SavePoints savePoints = new SavePoints();
var savePoints = new SavePoints();
for (TransactionStatus transactionStatus : transactionStatuses.values()) {
for (var transactionStatus : transactionStatuses.values()) {
savePoints.save(transactionStatus);
}
return savePoints;
@@ -144,7 +144,7 @@ class MultiTransactionStatus implements TransactionStatus {
* @see org.springframework.transaction.SavepointManager#rollbackToSavepoint(java.lang.Object)
*/
public void rollbackToSavepoint(Object savepoint) throws TransactionException {
SavePoints savePoints = (SavePoints) savepoint;
var savePoints = (SavePoints) savepoint;
savePoints.rollback();
}
@@ -161,7 +161,7 @@ class MultiTransactionStatus implements TransactionStatus {
* @see org.springframework.transaction.TransactionStatus#flush()
*/
public void flush() {
for (TransactionStatus transactionStatus : transactionStatuses.values()) {
for (var transactionStatus : transactionStatuses.values()) {
transactionStatus.flush();
}
}
@@ -185,12 +185,12 @@ class MultiTransactionStatus implements TransactionStatus {
}
private void save(TransactionStatus transactionStatus) {
Object savepoint = transactionStatus.createSavepoint();
var savepoint = transactionStatus.createSavepoint();
addSavePoint(transactionStatus, savepoint);
}
public void rollback() {
for (TransactionStatus transactionStatus : savepoints.keySet()) {
for (var transactionStatus : savepoints.keySet()) {
transactionStatus.rollbackToSavepoint(savepointFor(transactionStatus));
}
}
@@ -200,7 +200,7 @@ class MultiTransactionStatus implements TransactionStatus {
}
public void release() {
for (TransactionStatus transactionStatus : savepoints.keySet()) {
for (var transactionStatus : savepoints.keySet()) {
transactionStatus.releaseSavepoint(savepointFor(transactionStatus));
}
}