Refine null-safety in the spring-aop module

See gh-34154

Author: sdeleuze

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

@@ -570,22 +570,22 @@ else if (this.joinPointStaticPartArgumentIndex != -1) {
 				for (PointcutParameter parameter : parameterBindings) {
 					String name = parameter.getName();
 					Integer index = this.argumentBindings.get(name);
-					Assert.notNull(index, "Index must not be null");
+					Assert.state(index != null, "Index must not be null");
 					adviceInvocationArgs[index] = parameter.getBinding();
 					numBound++;
 				}
 			}
 			// binding from returning clause
 			if (this.returningName != null) {
 				Integer index = this.argumentBindings.get(this.returningName);
-				Assert.notNull(index, "Index must not be null");
+				Assert.state(index != null, "Index must not be null");
 				adviceInvocationArgs[index] = returnValue;
 				numBound++;
 			}
 			// binding from thrown exception
 			if (this.throwingName != null) {
 				Integer index = this.argumentBindings.get(this.throwingName);
-				Assert.notNull(index, "Index must not be null");
+				Assert.state(index != null, "Index must not be null");
 				adviceInvocationArgs[index] = ex;
 				numBound++;
 			}

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

@@ -157,7 +157,7 @@ public List<Advisor> buildAspectJAdvisors() {
 			}
 			else {
 				MetadataAwareAspectInstanceFactory factory = this.aspectFactoryCache.get(aspectName);
-				Assert.notNull(factory, "Factory must not be null");
+				Assert.state(factory != null, "Factory must not be null");
 				advisors.addAll(this.advisorFactory.getAdvisors(factory));
 			}
 		}