Feign clients that uses SpringMVCContract appears in OpenApi like controllers exposed if spring-boot-starter-actuator is in classpath. Fixes #1230.

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java

@@ -99,6 +99,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.method.HandlerMethod;
 
 import static org.springdoc.core.Constants.ACTUATOR_DEFAULT_GROUP;
@@ -676,6 +677,20 @@ protected boolean isAdditionalRestController(Class<?> rawClass) {
 		return ADDITIONAL_REST_CONTROLLERS.stream().anyMatch(clazz -> clazz.isAssignableFrom(rawClass));
 	}
 
+	/**
+	 * Contains response body boolean.
+	 *
+	 * @param handlerMethod the handler method
+	 * @return the boolean
+	 */
+	public static boolean containsResponseBody(HandlerMethod handlerMethod) {
+		ResponseBody responseBodyAnnotation = AnnotationUtils.findAnnotation(handlerMethod.getBeanType(), ResponseBody.class);
+		if (responseBodyAnnotation == null)
+			responseBodyAnnotation = AnnotationUtils.findAnnotation(handlerMethod.getMethod(), ResponseBody.class);
+		return responseBodyAnnotation!=null;
+	}
+
+
 	/**
 	 * Is hidden rest controllers boolean.
 	 *

springdoc-openapi-common/src/main/java/org/springdoc/core/ActuatorProvider.java

@@ -36,6 +36,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationListener;
 import org.springframework.util.AntPathMatcher;
+import org.springframework.web.method.HandlerMethod;
 
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 
@@ -132,12 +133,13 @@ public static Tag getTag() {
 	 * Is rest controller boolean.
 	 *
 	 * @param operationPath the operation path
-	 * @param controllerClass the controller class
+	 * @param handlerMethod the handler method
 	 * @return the boolean
 	 */
-	public boolean isRestController(String operationPath, Class<?> controllerClass) {
+	public boolean isRestController(String operationPath, HandlerMethod handlerMethod) {
 		return operationPath.startsWith(AntPathMatcher.DEFAULT_PATH_SEPARATOR)
-				&&  !AbstractOpenApiResource.isHiddenRestControllers(controllerClass);
+				&&  !AbstractOpenApiResource.isHiddenRestControllers(handlerMethod.getBeanType())
+				&& AbstractOpenApiResource.containsResponseBody(handlerMethod);
 	}
 
 	/**

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/webmvc/api/OpenApiResource.java

@@ -52,11 +52,9 @@
 
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.core.annotation.AnnotatedElementUtils;
-import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.MimeType;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition;
@@ -251,7 +249,7 @@ protected void calculatePath(Map<String, Object> restControllers, Map<RequestMap
 					String[] produces = requestMappingInfo.getProducesCondition().getProducibleMediaTypes().stream().map(MimeType::toString).toArray(String[]::new);
 					String[] consumes = requestMappingInfo.getConsumesCondition().getConsumableMediaTypes().stream().map(MimeType::toString).toArray(String[]::new);
 					String[] headers = requestMappingInfo.getHeadersCondition().getExpressions().stream().map(Object::toString).toArray(String[]::new);
-					if (((isShowActuator() && optionalActuatorProvider.get().isRestController(operationPath, handlerMethod.getBeanType()))
+					if (((isShowActuator() && optionalActuatorProvider.get().isRestController(operationPath, handlerMethod))
 							|| isRestController(restControllers, handlerMethod, operationPath))
 							&& isFilterCondition(handlerMethod, operationPath, produces, consumes, headers)) {
 						Set<RequestMethod> requestMethods = requestMappingInfo.getMethodsCondition().getMethods();
@@ -308,11 +306,8 @@ protected boolean isRestController(Map<String, Object> restControllers, HandlerM
 		boolean hasOperationAnnotation = AnnotatedElementUtils.hasAnnotation(handlerMethod.getMethod(), Operation.class);
 		if (hasOperationAnnotation)
 			return true;
-		ResponseBody responseBodyAnnotation = AnnotationUtils.findAnnotation(handlerMethod.getBeanType(), ResponseBody.class);
-		if (responseBodyAnnotation == null)
-			responseBodyAnnotation = AnnotationUtils.findAnnotation(handlerMethod.getMethod(), ResponseBody.class);
 
-		return (responseBodyAnnotation != null && restControllers.containsKey(handlerMethod.getBean().toString()) || isAdditionalRestController(handlerMethod.getBeanType()))
+		return (containsResponseBody(handlerMethod) & restControllers.containsKey(handlerMethod.getBean().toString()) || isAdditionalRestController(handlerMethod.getBeanType()))
 				&& operationPath.startsWith(DEFAULT_PATH_SEPARATOR)
 				&& (springDocConfigProperties.isModelAndViewAllowed() || !ModelAndView.class.isAssignableFrom(handlerMethod.getMethod().getReturnType()));
 	}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app68/api/user/UserClient.java

@@ -0,0 +1,19 @@
+package test.org.springdoc.api.app68.api.user;
+
+import test.org.springdoc.api.app68.model.User;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping(value= "/users", consumes = "application/json")
+@Controller
+public class UserClient {
+
+	@GetMapping("/{id}")
+	public User findById(@PathVariable Integer id)
+	{
+		return null;
+	}
+}