fix: include extended interfaces in springdoc parameters (#284)

Author: gibbz00

src/main/java/net/kaczmarzyk/spring/data/jpa/swagger/springdoc/SpecificationArgResolverSpringdocOperationCustomizer.java

@@ -112,18 +112,25 @@ private List<String> extractRequiredParametersFromHandlerMethod(HandlerMethod ha
 	}
 
 	private List<Annotation> extractAnnotationsFromMethodParameter(MethodParameter methodParameter) {
-
 		List<Annotation> annotations = new ArrayList<>(
 			asList(methodParameter.getParameterAnnotations()));
 
-		if (methodParameter.getParameterType() != Specification.class) {
-			List<Annotation> innerParameterAnnotations = asList(methodParameter.getParameterType().getAnnotations());
-			annotations.addAll(innerParameterAnnotations);
-		}
+    extractAnnotationsRecursive(annotations, methodParameter.getParameterType());
 
 		return annotations;
 	}
 
+  private void extractAnnotationsRecursive(List<Annotation> buffer, Class<?> clazz) {
+    if (clazz != Specification.class) {
+      List<Annotation> innerParameterAnnotations = asList(clazz.getAnnotations());
+      buffer.addAll(innerParameterAnnotations);
+
+      for (Class<?> extendedInterface : clazz.getInterfaces()) {
+        extractAnnotationsRecursive(buffer, extendedInterface);
+      }
+    }
+  }
+
 	private List<Parameter> createParametersFromSpecs(List<Spec> specs, List<String> requiredParams, List<String> requiredHeaders) {
 		List<Parameter> parameters = specs.stream()
 			.map(spec -> {

src/test/java/net/kaczmarzyk/spring/data/jpa/swagger/springdoc/SpecificationArgResolverSpringdocOperationCustomizerTest.java

@@ -281,6 +281,31 @@ public void shouldCorrectlyReadParametersFromCustomFilterWithAnnotations() throw
 			.withQueryParameterName("annotatedFilterSecondParam");
 	}
 
+	@Test
+	public void shouldCorrectlyReadParametersFromExtendedCustomFilterWithAnnotations() throws NoSuchMethodException {
+		// given
+		HandlerMethod handlerMethod = handlerMethodForControllerMethodAndParameterType("customExtendedFilterWithAnnotationsTestMethod", ExtendedTestFilterWithAnnotations.class);
+		Operation operation = new Operation();
+
+		// when
+		Operation customizedOperation = springdocOperationCustomizer.customize(operation, handlerMethod);
+
+		// then
+		assertThatOperation(customizedOperation)
+			.hasParametersCount(4)
+			.containsParameterAtIndex(0)
+			.withQueryParameterName("annotatedFilterThirdParam")
+			.and()
+			.containsParameterAtIndex(1)
+			.withQueryParameterName("annotatedFilterFourthParam")
+      .and()
+			.containsParameterAtIndex(2)
+      .withQueryParameterName("annotatedFilterFirstParam")
+      .and()
+      .containsParameterAtIndex(3)
+      .withQueryParameterName("annotatedFilterSecondParam");
+	}
+
 	@Test
 	public void shouldCorrectlyReadParametersFromCustomFilterWithoutAnnotations() throws NoSuchMethodException {
 		// given
@@ -489,6 +514,11 @@ public void customFilterWithAnnotationsTestMethod(TestFilterWithAnnotations filt
 
 		}
 
+		@RequestMapping(value = "/custom-extended-filter-with-annotations")
+		public void customExtendedFilterWithAnnotationsTestMethod(ExtendedTestFilterWithAnnotations filter) {
+
+		}
+
 		@RequestMapping(value = "/custom-filter-without-annotations")
 		public void customFilterWithoutAnnotationsTestMethod(
 			@Or({
@@ -560,8 +590,15 @@ private interface TestFilterWithAnnotations extends Specification<Object> {
 
 	}
 
-	private interface TestFilterWithoutAnnotations extends Specification<Object> {
+	@Or({
+		@Spec(path = "", params = "annotatedFilterThirdParam", spec = Like.class),
+		@Spec(path = "", params = "annotatedFilterFourthParam", spec = Like.class),
+	})
+	private interface ExtendedTestFilterWithAnnotations extends TestFilterWithAnnotations {
 
 	}
 
+	private interface TestFilterWithoutAnnotations extends Specification<Object> {
+
+	}
 }