Honour @JsonIgnore on Panache entities

Fixes: quarkusio#10339

extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheEntityEnhancer.java

@@ -12,6 +12,7 @@
 import org.jboss.jandex.AnnotationValue;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
+import org.jboss.jandex.FieldInfo;
 import org.jboss.jandex.IndexView;
 import org.jboss.jandex.MethodInfo;
 import org.objectweb.asm.AnnotationVisitor;
@@ -48,6 +49,8 @@ public abstract class PanacheEntityEnhancer<MetamodelType extends MetamodelInfo<
     private static final String JSON_PROPERTY_BINARY_NAME = "com/fasterxml/jackson/annotation/JsonProperty";
     private static final String JSON_PROPERTY_SIGNATURE = "L" + JSON_PROPERTY_BINARY_NAME + ";";
 
+    private static final DotName JSON_IGNORE_DOT_NAME = DotName.createSimple("com.fasterxml.jackson.annotation.JsonIgnore");
+
     protected MetamodelType modelInfo;
     protected final ClassInfo panacheEntityBaseClassInfo;
     protected final IndexView indexView;
@@ -242,7 +245,7 @@ protected void generateAccessors() {
                     }
                     // Add an explicit Jackson annotation so that the entire property is not ignored due to having @XmlTransient
                     // on the field
-                    if (!field.hasAnnotation(JSON_PROPERTY_SIGNATURE)) {
+                    if (shouldAddJsonProperty(field)) {
                         mv.visitAnnotation(JSON_PROPERTY_SIGNATURE, true);
                     }
                     mv.visitEnd();
@@ -287,6 +290,22 @@ protected void generateAccessors() {
             }
         }
 
+        private boolean shouldAddJsonProperty(EntityField entityField) {
+            if (isAnnotatedWithJsonIgnore(entityField)) {
+                return false;
+            }
+            return !entityField.hasAnnotation(JSON_PROPERTY_SIGNATURE);
+        }
+
+        private boolean isAnnotatedWithJsonIgnore(EntityField entityField) {
+            FieldInfo field = entityInfo.field(entityField.name);
+            if (field != null) {
+                return field.hasAnnotation(JSON_IGNORE_DOT_NAME);
+            }
+
+            return false;
+        }
+
         protected abstract void generateAccessorSetField(MethodVisitor mv, EntityField field);
 
         protected abstract void generateAccessorGetField(MethodVisitor mv, EntityField field);

integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Book.java

@@ -0,0 +1,30 @@
+package io.quarkus.it.panache;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
+
+@Entity
+public class Book extends PanacheEntityBase {
+
+    @Id
+    @GeneratedValue
+    public Integer id;
+
+    public String name;
+
+    @JsonIgnore
+    public String author;
+
+    public Book(String name, String author) {
+        this.name = name;
+        this.author = author;
+    }
+
+    public Book() {
+    }
+}

integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BookDao.java

@@ -0,0 +1,9 @@
+package io.quarkus.it.panache;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
+
+@ApplicationScoped
+public class BookDao implements PanacheRepositoryBase<Book, Integer> {
+}

integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BookResource.java

@@ -0,0 +1,27 @@
+package io.quarkus.it.panache;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.transaction.Transactional;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+@Path("/book")
+public class BookResource {
+
+    @Inject
+    BookDao bookDao;
+
+    @Transactional
+    @GET
+    @Path("/{name}/{author}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public List<Book> addAndListAll(@PathParam("name") String name, @PathParam("author") String author) {
+        bookDao.persist(new Book(name, author));
+        return bookDao.listAll();
+    }
+}

integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/JacksonTest.java

@@ -0,0 +1,21 @@
+package io.quarkus.it.panache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
+
+@QuarkusTest
+public class JacksonTest {
+
+    @Test
+    public void testJsonIgnoreHonoured() {
+        List<Book> books = RestAssured.when().get("/book/Berlin/Beevor").then().extract().body().jsonPath().getList(".",
+                Book.class);
+        assertThat(books).hasSize(1).filteredOn(book -> book.author != null).isEmpty();
+    }
+}