Merge branch 'SentryMan-main' into main

Author: rbygrave

blackbox-test/src/main/java/org/example/customer/IgnoreField2.java

@@ -0,0 +1,41 @@
+package org.example.customer;
+
+import io.avaje.jsonb.Json;
+
+import java.time.Instant;
+
+@Json
+public class IgnoreField2 {
+
+  @Json.Ignore
+  private String middleName;
+  private Instant time;
+  private int num;
+
+  public String getMiddleName() {
+    return middleName;
+  }
+
+  public IgnoreField2 setMiddleName(String middleName) {
+    this.middleName = middleName;
+    return this;
+  }
+
+  public Instant getTime() {
+    return time;
+  }
+
+  public IgnoreField2 setTime(Instant time) {
+    this.time = time;
+    return this;
+  }
+
+  public int getNum() {
+    return num;
+  }
+
+  public IgnoreField2 setNum(int num) {
+    this.num = num;
+    return this;
+  }
+}

jsonb-generator/src/main/java/io/avaje/jsonb/generator/BeanReader.java

@@ -172,7 +172,7 @@ void writeConstructor(Append writer) {
     }
     Set<String> uniqueTypes = new HashSet<>();
     for (FieldReader allField : allFields) {
-      if (allField.include() || !allField.isRaw()) {
+      if (allField.include() && !allField.isRaw()) {
         if (uniqueTypes.add(allField.adapterShortType())) {
           allField.writeConstructor(writer);
         }