Skip to content

Commit 73cf07e

Browse files
committed
Fix overridden methods nullability
Issue: SPR-15869
1 parent 6b6c1d3 commit 73cf07e

File tree

488 files changed

+1016
-34
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

488 files changed

+1016
-34
lines changed

spring-aop/src/main/java/org/springframework/aop/TargetSource.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public interface TargetSource extends TargetClassAware {
4242
* @return the type of targets returned by this {@link TargetSource}
4343
*/
4444
@Override
45+
@Nullable
4546
Class<?> getTargetClass();
4647

4748
/**

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ public void setThrowingName(@Nullable String throwingName) {
222222
* @return the parameter names
223223
*/
224224
@Override
225+
@Nullable
225226
public String[] getParameterNames(Method method) {
226227
this.argumentTypes = method.getParameterTypes();
227228
this.numberOfRemainingUnboundArguments = this.argumentTypes.length;
@@ -310,6 +311,7 @@ public String[] getParameterNames(Method method) {
310311
* {@link #setRaiseExceptions(boolean) raiseExceptions} has been set to {@code true}
311312
*/
312313
@Override
314+
@Nullable
313315
public String[] getParameterNames(Constructor<?> ctor) {
314316
if (this.raiseExceptions) {
315317
throw new UnsupportedOperationException("An advice method can never be a constructor");

spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import org.springframework.aop.framework.AopConfigException;
2222
import org.springframework.core.Ordered;
23+
import org.springframework.lang.Nullable;
2324
import org.springframework.util.Assert;
2425
import org.springframework.util.ReflectionUtils;
2526

@@ -76,6 +77,7 @@ public final Object getAspectInstance() {
7677
}
7778

7879
@Override
80+
@Nullable
7981
public ClassLoader getAspectClassLoader() {
8082
return this.aspectClass.getClassLoader();
8183
}

spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.Serializable;
2020

2121
import org.springframework.core.Ordered;
22+
import org.springframework.lang.Nullable;
2223
import org.springframework.util.Assert;
2324

2425
/**
@@ -53,6 +54,7 @@ public final Object getAspectInstance() {
5354
}
5455

5556
@Override
57+
@Nullable
5658
public ClassLoader getAspectClassLoader() {
5759
return this.aspectInstance.getClass().getClassLoader();
5860
}

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ public String toString() {
261261
private static class AspectJAnnotationParameterNameDiscoverer implements ParameterNameDiscoverer {
262262

263263
@Override
264+
@Nullable
264265
public String[] getParameterNames(Method method) {
265266
if (method.getParameterCount() == 0) {
266267
return new String[0];
@@ -283,6 +284,7 @@ public String[] getParameterNames(Method method) {
283284
}
284285

285286
@Override
287+
@Nullable
286288
public String[] getParameterNames(Constructor<?> ctor) {
287289
throw new UnsupportedOperationException("Spring AOP cannot handle constructor advice");
288290
}

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ public Object getAspectInstance() {
9191
}
9292

9393
@Override
94+
@Nullable
9495
public ClassLoader getAspectClassLoader() {
9596
return (this.beanFactory instanceof ConfigurableBeanFactory ?
9697
((ConfigurableBeanFactory) this.beanFactory).getBeanClassLoader() :
@@ -103,6 +104,7 @@ public AspectMetadata getAspectMetadata() {
103104
}
104105

105106
@Override
107+
@Nullable
106108
public Object getAspectCreationMutex() {
107109
if (this.beanFactory.isSingleton(this.name)) {
108110
// Rely on singleton semantics provided by the factory -> no local lock.

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/LazySingletonAspectInstanceFactoryDecorator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public boolean isMaterialized() {
7474
}
7575

7676
@Override
77+
@Nullable
7778
public ClassLoader getAspectClassLoader() {
7879
return this.maaif.getAspectClassLoader();
7980
}
@@ -84,6 +85,7 @@ public AspectMetadata getAspectMetadata() {
8485
}
8586

8687
@Override
88+
@Nullable
8789
public Object getAspectCreationMutex() {
8890
return this.maaif.getAspectCreationMutex();
8991
}

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactory.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ private Advisor getDeclareParentsAdvisor(Field introductionField) {
184184

185185

186186
@Override
187+
@Nullable
187188
public Advisor getAdvisor(Method candidateAdviceMethod, MetadataAwareAspectInstanceFactory aspectInstanceFactory,
188189
int declarationOrderInAspect, String aspectName) {
189190

@@ -218,6 +219,7 @@ private AspectJExpressionPointcut getPointcut(Method candidateAdviceMethod, Clas
218219

219220

220221
@Override
222+
@Nullable
221223
public Advice getAdvice(Method candidateAdviceMethod, AspectJExpressionPointcut expressionPointcut,
222224
MetadataAwareAspectInstanceFactory aspectInstanceFactory, int declarationOrder, String aspectName) {
223225

spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ public BeanReference[] getBeanReferences() {
110110
}
111111

112112
@Override
113+
@Nullable
113114
public Object getSource() {
114115
return this.advisorDefinition.getSource();
115116
}

spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.springframework.beans.factory.support.ManagedList;
2626
import org.springframework.beans.factory.xml.BeanDefinitionParser;
2727
import org.springframework.beans.factory.xml.ParserContext;
28+
import org.springframework.lang.Nullable;
2829

2930
/**
3031
* {@link BeanDefinitionParser} for the {@code aspectj-autoproxy} tag,
@@ -38,6 +39,7 @@
3839
class AspectJAutoProxyBeanDefinitionParser implements BeanDefinitionParser {
3940

4041
@Override
42+
@Nullable
4143
public BeanDefinition parse(Element element, ParserContext parserContext) {
4244
AopNamespaceUtils.registerAspectJAnnotationAutoProxyCreatorIfNecessary(parserContext, element);
4345
extendBeanDefinition(element, parserContext);

0 commit comments

Comments
 (0)