Add more deep test for "test class property is not exposed"

Author: altro3

openapi/src/main/java/io/micronaut/openapi/visitor/SchemaDefinitionUtils.java

@@ -52,6 +52,7 @@
 import io.micronaut.inject.ast.GenericPlaceholderElement;
 import io.micronaut.inject.ast.MemberElement;
 import io.micronaut.inject.ast.PropertyElement;
+import io.micronaut.inject.ast.PropertyElementQuery;
 import io.micronaut.inject.ast.TypedElement;
 import io.micronaut.inject.ast.WildcardElement;
 import io.micronaut.inject.visitor.VisitorContext;
@@ -1485,9 +1486,19 @@ private static void populateSchemaProperties(OpenAPI openAPI, VisitorContext con
         if (classElement != null && !ClassUtils.isJavaLangType(classElement.getName())) {
             List<PropertyElement> beanProperties;
             try {
-                beanProperties = classElement.getBeanProperties().stream()
-                        .filter(p -> !"groovy.lang.MetaClass".equals(p.getType().getName()))
-                        .toList();
+                beanProperties = classElement.getBeanProperties(
+                        PropertyElementQuery.of(classElement)
+                            .excludedAnnotations(Set.of(
+                                Hidden.class.getName(),
+                                JsonIgnore.class.getName()
+                            ))
+                    ).stream()
+                    .filter(p ->
+                        !"groovy.lang.MetaClass".equals(p.getType().getName())
+                            && !"java.lang.Class".equals(p.getType().getName())
+                            && !getAnnotationMetadata(p).booleanValue(io.swagger.v3.oas.annotations.media.Schema.class, PROP_HIDDEN).orElse(false)
+                    )
+                    .toList();
             } catch (Exception e) {
                 warn("Error with getting properties for class " + classElement.getName() + ": " + e + "\n" + Utils.printStackTrace(e), context, classElement);
                 // Workaround for https://github.com/micronaut-projects/micronaut-openapi/issues/313
@@ -2298,12 +2309,7 @@ private static void processPropertyElements(OpenAPI openAPI, VisitorContext cont
         }
 
         for (TypedElement publicField : publicFields) {
-            boolean isHidden = getAnnotationMetadata(publicField).booleanValue(io.swagger.v3.oas.annotations.media.Schema.class, PROP_HIDDEN).orElse(false);
-            var jsonAnySetterAnn = getAnnotation(publicField, JsonAnySetter.class);
-            if (isAnnotationPresent(publicField, JsonIgnore.class)
-                    || isAnnotationPresent(publicField, Hidden.class)
-                    || (jsonAnySetterAnn != null && jsonAnySetterAnn.booleanValue("enabled").orElse(true))
-                    || isHidden) {
+            if (isHiddenElement(publicField)) {
                 continue;
             }
 
@@ -2353,6 +2359,17 @@ private static void processPropertyElements(OpenAPI openAPI, VisitorContext cont
         }
     }
 
+    private static boolean isHiddenElement(TypedElement elementType) {
+        boolean isHidden = getAnnotationMetadata(elementType)
+            .booleanValue(io.swagger.v3.oas.annotations.media.Schema.class, PROP_HIDDEN).orElse(false);
+        var jsonAnySetterAnn = getAnnotation(elementType, JsonAnySetter.class);
+        return elementType.getType().isAssignable(Class.class)
+            || isAnnotationPresent(elementType, JsonIgnore.class)
+            || isAnnotationPresent(elementType, Hidden.class)
+            || (jsonAnySetterAnn != null && jsonAnySetterAnn.booleanValue("enabled").orElse(true))
+            || isHidden;
+    }
+
     private static boolean allowedByJsonView(TypedElement publicField, String[] classLvlJsonViewClasses, ClassElement jsonViewClassEl, VisitorContext context) {
         String[] fieldJsonViewClasses = getAnnotationMetadata(publicField).stringValues(JsonView.class);
         if (ArrayUtils.isEmpty(fieldJsonViewClasses)) {

openapi/src/test/groovy/io/micronaut/openapi/visitor/OpenApiClassPropertySpec.groovy

@@ -4,26 +4,21 @@ import io.micronaut.openapi.AbstractOpenApiTypeElementSpec
 import io.swagger.v3.oas.models.OpenAPI
 
 class OpenApiClassPropertySpec extends AbstractOpenApiTypeElementSpec {
+
     void "test class property is not exposed"() {
 
         when:
         buildBeanDefinition("test.MyBean", '''
 package test;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.micronaut.core.annotation.Introspected;
 import io.micronaut.http.HttpResponse;
-import io.micronaut.http.MediaType;
-import io.micronaut.http.annotation.*;
-
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
 import io.swagger.v3.oas.annotations.Hidden;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.enums.ParameterIn;
-import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotBlank;
 
 @Controller
 class PersonController {
@@ -56,6 +51,29 @@ class Person {
     public Class<?> getPersonClass() {
         return personClass;
     }
+
+    public Class<?> getTestProp() {
+        return personClass;
+    }
+
+    public String getNotHiddenProp() {
+        return "";
+    }
+
+    @Hidden
+    public String getHiddenProp2() {
+        return "";
+    }
+
+    @JsonIgnore
+    public String getHiddenProp3() {
+        return "";
+    }
+
+    @Schema(hidden = true)
+    public String getHiddenProp4() {
+        return "";
+    }
 }
 
 @jakarta.inject.Singleton
@@ -70,8 +88,9 @@ public class MyBean {}
         openAPI.components.schemas["Person"].type == "object"
 
         openAPI.components.schemas["Person"].properties
-        openAPI.components.schemas["Person"].properties.size() == 1
+        openAPI.components.schemas["Person"].properties.size() == 2
 
         openAPI.components.schemas["Person"].properties["name"]
+        openAPI.components.schemas["Person"].properties["notHiddenProp"]
     }
 }