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

Reintroduce explicit local variable types.

Browse Source 
We now reinstate local variable types instead of var as general var usage removes contextual detail that cannot be omitted generally.

See #2465
This commit is contained in:
Mark Paluch
2022-03-28 08:55:29 +02:00
parent c85c4ef2ed
commit 0e5e869cbf
249 changed files with 1662 additions and 1507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ 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;
@@ -103,7 +104,7 @@ public class ChainedTransactionManager implements PlatformTransactionManager {
public MultiTransactionStatus getTransaction(@Nullable TransactionDefinition definition) throws TransactionException {
var mts = new MultiTransactionStatus(transactionManagers.get(0));
MultiTransactionStatus mts = new MultiTransactionStatus(transactionManagers.get(0));
if (definition == null) {
return mts;
@@ -116,15 +117,15 @@ public class ChainedTransactionManager implements PlatformTransactionManager {
try {
for (var transactionManager : transactionManagers) {
for (PlatformTransactionManager transactionManager : transactionManagers) {
mts.registerTransactionManager(definition, transactionManager);
}
} catch (Exception ex) {
var transactionStatuses = mts.getTransactionStatuses();
Map<PlatformTransactionManager, TransactionStatus> transactionStatuses = mts.getTransactionStatuses();
for (var transactionManager : transactionManagers) {
for (PlatformTransactionManager transactionManager : transactionManagers) {
try {
if (transactionStatuses.get(transactionManager) != null) {
transactionManager.rollback(transactionStatuses.get(transactionManager));
@@ -146,13 +147,13 @@ public class ChainedTransactionManager implements PlatformTransactionManager {
public void commit(TransactionStatus status) throws TransactionException {
var multiTransactionStatus = (MultiTransactionStatus) status;
MultiTransactionStatus multiTransactionStatus = (MultiTransactionStatus) status;
var commit = true;
boolean commit = true;
Exception commitException = null;
PlatformTransactionManager commitExceptionTransactionManager = null;
for (var transactionManager : reverse(transactionManagers)) {
for (PlatformTransactionManager transactionManager : reverse(transactionManagers)) {
if (commit) {
@@ -181,8 +182,8 @@ public class ChainedTransactionManager implements PlatformTransactionManager {
}
if (commitException != null) {
var firstTransactionManagerFailed = commitExceptionTransactionManager == getLastTransactionManager();
var transactionState = firstTransactionManagerFailed ? HeuristicCompletionException.STATE_ROLLED_BACK
boolean firstTransactionManagerFailed = commitExceptionTransactionManager == getLastTransactionManager();
int transactionState = firstTransactionManagerFailed ? HeuristicCompletionException.STATE_ROLLED_BACK
: HeuristicCompletionException.STATE_MIXED;
throw new HeuristicCompletionException(transactionState, commitException);
}
@@ -193,9 +194,9 @@ public class ChainedTransactionManager implements PlatformTransactionManager {
Exception rollbackException = null;
PlatformTransactionManager rollbackExceptionTransactionManager = null;
var multiTransactionStatus = (MultiTransactionStatus) status;
MultiTransactionStatus multiTransactionStatus = (MultiTransactionStatus) status;
for (var transactionManager : reverse(transactionManagers)) {
for (PlatformTransactionManager 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) {
var transactionStatus = getTransactionStatus(transactionManager);
TransactionStatus transactionStatus = getTransactionStatus(transactionManager);
transactionManager.commit(transactionStatus);
}
@@ -100,23 +100,23 @@ class MultiTransactionStatus implements TransactionStatus {
}
public void setRollbackOnly() {
for (var ts : transactionStatuses.values()) {
for (TransactionStatus ts : transactionStatuses.values()) {
ts.setRollbackOnly();
}
}
public Object createSavepoint() throws TransactionException {
var savePoints = new SavePoints();
SavePoints savePoints = new SavePoints();
for (var transactionStatus : transactionStatuses.values()) {
for (TransactionStatus transactionStatus : transactionStatuses.values()) {
savePoints.save(transactionStatus);
}
return savePoints;
}
public void rollbackToSavepoint(Object savepoint) throws TransactionException {
var savePoints = (SavePoints) savepoint;
SavePoints savePoints = (SavePoints) savepoint;
savePoints.rollback();
}
@@ -125,7 +125,7 @@ class MultiTransactionStatus implements TransactionStatus {
}
public void flush() {
for (var transactionStatus : transactionStatuses.values()) {
for (TransactionStatus transactionStatus : transactionStatuses.values()) {
transactionStatus.flush();
}
}
@@ -149,12 +149,12 @@ class MultiTransactionStatus implements TransactionStatus {
}
private void save(TransactionStatus transactionStatus) {
var savepoint = transactionStatus.createSavepoint();
Object savepoint = transactionStatus.createSavepoint();
addSavePoint(transactionStatus, savepoint);
}
public void rollback() {
for (var transactionStatus : savepoints.keySet()) {
for (TransactionStatus transactionStatus : savepoints.keySet()) {
transactionStatus.rollbackToSavepoint(savepointFor(transactionStatus));
}
}
@@ -164,7 +164,7 @@ class MultiTransactionStatus implements TransactionStatus {
}
public void release() {
for (var transactionStatus : savepoints.keySet()) {
for (TransactionStatus transactionStatus : savepoints.keySet()) {
transactionStatus.releaseSavepoint(savepointFor(transactionStatus));
}
}