Do not attempt nested PropertyHandler resolution for argument conversion

This is not actually triggered on 6.2.x but nevertheless worth aligning.
Includes fix for return type declaration in PropertyAccessor subclasses.
Includes related polishing from main commits.

See gh-36024

Author: jhoeller

spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java

@@ -489,6 +489,9 @@ private void processLocalProperty(PropertyTokenHolder tokens, PropertyValue pv)
 	@Override
 	@Nullable
 	public Class<?> getPropertyType(String propertyName) throws BeansException {
+		if (this.wrappedObject == null) {
+			return null;
+		}
 		try {
 			PropertyHandler ph = getPropertyHandler(propertyName);
 			if (ph != null) {

spring-beans/src/main/java/org/springframework/beans/BeanWrapperImpl.java

@@ -192,7 +192,7 @@ public Object convertForProperty(@Nullable Object value, String propertyName) th
 
 	@Override
 	@Nullable
-	protected BeanPropertyHandler getLocalPropertyHandler(String propertyName) {
+	protected PropertyHandler getLocalPropertyHandler(String propertyName) {
 		PropertyDescriptor pd = getCachedIntrospectionResults().getPropertyDescriptor(propertyName);
 		return (pd != null ? new BeanPropertyHandler((GenericTypeAwarePropertyDescriptor) pd) : null);
 	}

spring-beans/src/main/java/org/springframework/beans/DirectFieldAccessor.java

@@ -73,7 +73,7 @@ protected DirectFieldAccessor(Object object, String nestedPath, DirectFieldAcces
 
 	@Override
 	@Nullable
-	protected FieldPropertyHandler getLocalPropertyHandler(String propertyName) {
+	protected PropertyHandler getLocalPropertyHandler(String propertyName) {
 		FieldPropertyHandler propertyHandler = this.fieldMap.get(propertyName);
 		if (propertyHandler == null) {
 			Field field = ReflectionUtils.findField(getWrappedClass(), propertyName);

spring-context/src/main/java/org/springframework/cache/interceptor/CacheEvaluationContextFactory.java

@@ -39,10 +39,12 @@ class CacheEvaluationContextFactory {
 	@Nullable
 	private Supplier<ParameterNameDiscoverer> parameterNameDiscoverer;
 
+
 	CacheEvaluationContextFactory(StandardEvaluationContext originalContext) {
 		this.originalContext = originalContext;
 	}
 
+
 	public void setParameterNameDiscoverer(Supplier<ParameterNameDiscoverer> parameterNameDiscoverer) {
 		this.parameterNameDiscoverer = parameterNameDiscoverer;
 	}
@@ -54,6 +56,7 @@ public ParameterNameDiscoverer getParameterNameDiscoverer() {
 		return this.parameterNameDiscoverer.get();
 	}
 
+
 	/**
 	 * Creates a {@link CacheEvaluationContext} for the specified operation.
 	 * @param rootObject the {@code root} object to use for the context

spring-core/src/test/java/org/springframework/core/MethodParameterTests.java

@@ -237,7 +237,8 @@ void nestedWithTypeIndexReturnsNewInstance() throws Exception {
 		assertThat(m3.getTypeIndexForCurrentLevel()).isEqualTo(3);
 	}
 
-	public int method(String p1, long p2) {
+
+	public int method(String str, long lng) {
 		return 42;
 	}
 

spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java

@@ -636,14 +636,15 @@ public void register(T mapping, Object handler, Method method) {
 				HandlerMethod handlerMethod = createHandlerMethod(handler, method);
 				validateMethodMapping(handlerMethod, mapping);
 
-				Set<String> directPaths = AbstractHandlerMethodMapping.this.getDirectPaths(mapping);
+				Set<String> directPaths = getDirectPaths(mapping);
 				for (String path : directPaths) {
 					this.pathLookup.add(path, mapping);
 				}
 
 				String name = null;
-				if (getNamingStrategy() != null) {
-					name = getNamingStrategy().getName(handlerMethod, mapping);
+				HandlerMethodMappingNamingStrategy<T> namingStrategy = getNamingStrategy();
+				if (namingStrategy != null) {
+					name = namingStrategy.getName(handlerMethod, mapping);
 					addMappingName(name, handlerMethod);
 				}