Changes report: Set containingClass at MethodParameter. fixes #1491

Author: bnasslahsen

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/extractor/DelegatingMethodParameter.java

@@ -16,6 +16,13 @@
  *  *  *  * See the License for the specific language governing permissions and
  *  *  *  * limitations under the License.
  *  *  *
+ *  *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *  *
+ *  *  * Unless required by applicable law or agreed to in writing, software
+ *  *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  *  * See the License for the specific language governing permissions and
+ *  *  * limitations under the License.
  *  *
  *
  */
@@ -25,6 +32,7 @@
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
+import java.lang.reflect.Field;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
@@ -35,6 +43,9 @@
 import java.util.Optional;
 
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springdoc.core.converters.AdditionalModelsConverter;
 import org.springdoc.core.customizers.DelegatingMethodParameterCustomizer;
@@ -43,6 +54,7 @@
 import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
 
 /**
  * The type Delegating method parameter.
@@ -75,6 +87,11 @@ public class DelegatingMethodParameter extends MethodParameter {
 	 */
 	private boolean isNotRequired;
 
+	/**
+	 * The constant LOGGER.
+	 */
+	private static final Logger LOGGER = LoggerFactory.getLogger(DelegatingMethodParameter.class);
+
 	/**
 	 * Instantiates a new Delegating method parameter.
 	 *
@@ -241,4 +258,27 @@ public int hashCode() {
 	public boolean isParameterObject() {
 		return isParameterObject;
 	}
+
+	/**
+	 * Return a variant of this {@code MethodParameter} which refers to the
+	 * given containing class.
+	 * @param containingClass a specific containing class (potentially a
+	 * subclass of the declaring class, e.g. substituting a type variable)
+	 * A copy of spring withContainingClass, to keep compatibility with older spring versions
+	 * @see #getParameterType()
+	 */
+	public static MethodParameter changeContainingClass(MethodParameter methodParameter, @Nullable Class<?> containingClass) {
+		MethodParameter result = methodParameter.clone();
+		try {
+			Field containingClassField = FieldUtils.getDeclaredField(result.getClass(), "containingClass", true);
+			containingClassField.set(result, containingClass);
+			Field parameterTypeField = FieldUtils.getDeclaredField(result.getClass(), "parameterType", true);
+			parameterTypeField.set(result, null);
+		}
+		catch (IllegalAccessException e) {
+			LOGGER.warn(e.getMessage());
+		}
+		return result;
+	}
+
 }

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/extractor/MethodParameterPojoExtractor.java

@@ -1,6 +1,7 @@
 /*
  *
  *  *
+ *  *  * Copyright 2019-2020 the original author or authors.
  *  *  *
  *  *  *  * Copyright 2019-2022 the original author or authors.
  *  *  *  *
@@ -16,6 +17,13 @@
  *  *  *  * See the License for the specific language governing permissions and
  *  *  *  * limitations under the License.
  *  *  *
+ *  *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *  *
+ *  *  * Unless required by applicable law or agreed to in writing, software
+ *  *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  *  * See the License for the specific language governing permissions and
+ *  *  * limitations under the License.
  *  *
  *
  */
@@ -177,7 +185,8 @@ private static Stream<MethodParameter> fromSimpleClass(Class<?> paramClass, Fiel
 					.filter(d -> d.getName().equals(field.getName()))
 					.map(PropertyDescriptor::getReadMethod)
 					.filter(Objects::nonNull)
-					.map(method -> new MethodParameter(method, -1).withContainingClass(paramClass))
+					.map(method -> new MethodParameter(method, -1))
+					.map(methodParameter -> DelegatingMethodParameter.changeContainingClass(methodParameter, paramClass))
 					.map(param -> new DelegatingMethodParameter(param, fieldNamePrefix + field.getName(), finalFieldAnnotations, true, isNotRequired));
 		}
 		catch (IntrospectionException e) {