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

Annotate Object#equals parameter with @Nullable

Browse Source 
Closes gh-23093
This commit is contained in:
Sebastien Deleuze
2019-06-06 14:18:12 +02:00
parent 33becd8258
commit 098ac0bbb8
158 changed files with 222 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java
View File

@@ -246,7 +246,7 @@ public class SpringContextResourceAdapter implements ResourceAdapter {
@Override
public boolean equals(Object other) {
public boolean equals(@Nullable Object other) {
return (this == other || (other instanceof SpringContextResourceAdapter &&
ObjectUtils.nullSafeEquals(getContextConfigLocation(),
((SpringContextResourceAdapter) other).getContextConfigLocation())));

2
spring-tx/src/main/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSource.java
View File

@@ -190,7 +190,7 @@ public class AnnotationTransactionAttributeSource extends AbstractFallbackTransa
@Override
public boolean equals(Object other) {
public boolean equals(@Nullable Object other) {
if (this == other) {
return true;
}

2
spring-tx/src/main/java/org/springframework/transaction/annotation/Ejb3TransactionAnnotationParser.java
View File

@@ -59,7 +59,7 @@ public class Ejb3TransactionAnnotationParser implements TransactionAnnotationPar
@Override
public boolean equals(Object other) {
public boolean equals(@Nullable Object other) {
return (this == other || other instanceof Ejb3TransactionAnnotationParser);
}

2
spring-tx/src/main/java/org/springframework/transaction/annotation/JtaTransactionAnnotationParser.java
View File

@@ -81,7 +81,7 @@ public class JtaTransactionAnnotationParser implements TransactionAnnotationPars
@Override
public boolean equals(Object other) {
public boolean equals(@Nullable Object other) {
return (this == other || other instanceof JtaTransactionAnnotationParser);
}

2
spring-tx/src/main/java/org/springframework/transaction/annotation/SpringTransactionAnnotationParser.java
View File

@@ -92,7 +92,7 @@ public class SpringTransactionAnnotationParser implements TransactionAnnotationP
@Override
public boolean equals(Object other) {
public boolean equals(@Nullable Object other) {
return (this == other || other instanceof SpringTransactionAnnotationParser);
}

2
spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
View File

@@ -60,7 +60,7 @@ public class MatchAlwaysTransactionAttributeSource implements TransactionAttribu
@Override
public boolean equals(Object other) {
public boolean equals(@Nullable Object other) {
if (this == other) {
return true;
}

2
spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
View File

@@ -225,7 +225,7 @@ public class MethodMapTransactionAttributeSource
@Override
public boolean equals(Object other) {
public boolean equals(@Nullable Object other) {
if (this == other) {
return true;
}

2
spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java
View File

@@ -139,7 +139,7 @@ public class NameMatchTransactionAttributeSource implements TransactionAttribute
@Override
public boolean equals(Object other) {
public boolean equals(@Nullable Object other) {
if (this == other) {
return true;
}

3
spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java
View File

@@ -18,6 +18,7 @@ package org.springframework.transaction.interceptor;
import java.io.Serializable;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
/**
@@ -124,7 +125,7 @@ public class RollbackRuleAttribute implements Serializable{
@Override
public boolean equals(Object other) {
public boolean equals(@Nullable Object other) {
if (this == other) {
return true;
}

2
spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java
View File

@@ -48,7 +48,7 @@ abstract class TransactionAttributeSourcePointcut extends StaticMethodMatcherPoi
}
@Override
public boolean equals(Object other) {
public boolean equals(@Nullable Object other) {
if (this == other) {
return true;
}

3
spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionalOperatorImpl.java
View File

@@ -21,6 +21,7 @@ import org.apache.commons.logging.LogFactory;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.lang.Nullable;
import org.springframework.transaction.ReactiveTransaction;
import org.springframework.transaction.ReactiveTransactionManager;
import org.springframework.transaction.TransactionDefinition;
@@ -107,7 +108,7 @@ final class TransactionalOperatorImpl implements TransactionalOperator {
@Override
public boolean equals(Object other) {
public boolean equals(@Nullable Object other) {
return (this == other || (super.equals(other) && (!(other instanceof TransactionalOperatorImpl) ||
getTransactionManager() == ((TransactionalOperatorImpl) other).getTransactionManager())));
}

2
spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
View File

@@ -258,7 +258,7 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
* @see #toString()
*/
@Override
public boolean equals(Object other) {
public boolean equals(@Nullable Object other) {
return (this == other || (other instanceof TransactionDefinition && toString().equals(other.toString())));
}

2
spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java
View File

@@ -75,7 +75,7 @@ public abstract class DelegatingTransactionDefinition implements TransactionDefi
@Override
public boolean equals(Object other) {
public boolean equals(@Nullable Object other) {
return this.targetDefinition.equals(other);
}

2
spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
View File

@@ -180,7 +180,7 @@ public class TransactionTemplate extends DefaultTransactionDefinition
@Override
public boolean equals(Object other) {
public boolean equals(@Nullable Object other) {
return (this == other || (super.equals(other) && (!(other instanceof TransactionTemplate) ||
getTransactionManager() == ((TransactionTemplate) other).getTransactionManager())));
}