Revert "Remove redundant @JsonIgnore annotation"

This reverts commit 3a49c0a.

Author: liampace

src/core/lombok/eclipse/handlers/HandleJacksonized.java

@@ -187,10 +187,10 @@ private void handleJacksonizedAccessors(Annotation ast, EclipseNode annotationNo
 
 		// Add @JsonProperty to all fields. It will be automatically copied to the getter/setters later.
 		for (EclipseNode eclipseNode : tdNode.down()) {
-			if (eclipseNode.getKind() != Kind.FIELD || eclipseNode.isTransient()) {
-				continue;
+			if (eclipseNode.getKind() == Kind.FIELD) {
+				if (eclipseNode.isTransient()) createJsonIgnoreForField(eclipseNode, annotationNode);
+				else createJsonPropertyForField(eclipseNode, annotationNode);
 			}
-			createJsonPropertyForField(eclipseNode, annotationNode);
 		}
 		tdNode.rebuild();
 	}
@@ -205,6 +205,15 @@ private void createJsonPropertyForField(EclipseNode fieldNode, EclipseNode annot
 		}
 	}
 
+	private void createJsonIgnoreForField(EclipseNode fieldNode, EclipseNode annotationNode) {
+		if (JacksonAnnotations.JSON_IGNORE.isAnnotating(fieldNode)) return;
+		ASTNode astNode = fieldNode.get();
+		if (astNode instanceof FieldDeclaration) {
+			FieldDeclaration fd = (FieldDeclaration)astNode;
+			((FieldDeclaration) astNode).annotations = addAnnotation(fieldNode.get(), fd.annotations, JacksonAnnotations.JSON_IGNORE.annotation);
+		}
+	}
+	
 	private String getBuilderClassName(Annotation ast, EclipseNode annotationNode, EclipseNode annotatedNode, TypeDeclaration td, AnnotationValues<Builder> builderAnnotation) {
 		String builderClassName = builderAnnotation != null ? 
 			builderAnnotation.getInstance().builderClassName() : null;

src/core/lombok/javac/handlers/HandleJacksonized.java

@@ -63,7 +63,8 @@ public class HandleJacksonized extends JavacAnnotationHandler<Jacksonized> {
 	private static enum JacksonAnnotations {
 		JSON_POJO_BUILDER("com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder"),
 		JSON_DESERIALIZE("com.fasterxml.jackson.databind.annotation.JsonDeserialize"),
-		JSON_PROPERTY("com.fasterxml.jackson.annotation.JsonProperty");
+		JSON_PROPERTY("com.fasterxml.jackson.annotation.JsonProperty"),
+		JSON_IGNORE("com.fasterxml.jackson.annotation.JsonIgnore");
 
 		private final String qualifiedName;
 		private final String[] chainedDots;
@@ -118,11 +119,12 @@ private void handleJacksonizedAccessors(JavacNode annotationNode, JavacNode anno
 		}
 
 		// Add @JsonProperty to all non-transient fields. It will be automatically copied to the getter/setters later.
+		// Add @JsonIgnore to all transient fields. It will be automatically copied to the getter/setters later.
 		for (JavacNode javacNode : tdNode.down()) {
-			if (javacNode.getKind() != Kind.FIELD || javacNode.isTransient()) {
-				continue;
+			if (javacNode.getKind() == Kind.FIELD) {
+				if (javacNode.isTransient()) createJsonIgnoreForField(javacNode, annotationNode);
+				else createJsonPropertyForField(javacNode, annotationNode);
 			}
-			createJsonPropertyForField(javacNode, annotationNode);
 		}
 	}
 
@@ -139,6 +141,19 @@ private void createJsonPropertyForField(JavacNode fieldNode, JavacNode annotatio
 		fieldDecl.mods.annotations = fieldDecl.mods.annotations.append(annotationJsonProperty);
 	}
 
+	private void createJsonIgnoreForField(JavacNode fieldNode, JavacNode annotationNode) {
+		if (JacksonAnnotations.JSON_IGNORE.isAnnotating(fieldNode)) {
+			return;
+		}
+		JavacTreeMaker maker = fieldNode.getTreeMaker();
+		
+		JCExpression jsonPropertyType = chainDots(fieldNode, JacksonAnnotations.JSON_IGNORE.chainedDots);
+		JCAnnotation annotationJsonProperty = maker.Annotation(jsonPropertyType, List.<JCExpression>nil());
+		recursiveSetGeneratedBy(annotationJsonProperty, annotationNode);
+		JCVariableDecl fieldDecl = ((JCVariableDecl)fieldNode.get());
+		fieldDecl.mods.annotations = fieldDecl.mods.annotations.append(annotationJsonProperty);
+	}
+	
 	private void handleJacksonizedBuilder(JavacNode annotationNode, JavacNode annotatedNode, JavacNode tdNode, JCClassDecl td, JavacNode builderAnnotationNode, JavacNode superBuilderAnnotationNode) {
 		if (builderAnnotationNode != null && superBuilderAnnotationNode != null) {
 			annotationNode.addError("@Jacksonized cannot process both @Builder and @SuperBuilder on the same class.");

test/transform/resource/after-delombok/JacksonizedAccessorsTransient.java

@@ -1,5 +1,7 @@
 public class JacksonizedAccessorsTransient {
+	@com.fasterxml.jackson.annotation.JsonIgnore
 	private transient int intValue;
+	@com.fasterxml.jackson.annotation.JsonIgnore
 	@java.lang.SuppressWarnings("all")
 	@lombok.Generated
 	public int intValue() {
@@ -8,6 +10,7 @@ public int intValue() {
 	/**
 	 * @return {@code this}.
 	 */
+	@com.fasterxml.jackson.annotation.JsonIgnore
 	@java.lang.SuppressWarnings("all")
 	@lombok.Generated
 	public JacksonizedAccessorsTransient intValue(final int intValue) {

test/transform/resource/after-ecj/JacksonizedAccessorsTransient.java

@@ -1,15 +1,15 @@
 public @lombok.extern.jackson.Jacksonized @lombok.experimental.Accessors(fluent = true) @lombok.Getter @lombok.Setter class JacksonizedAccessorsTransient {
-  private transient int intValue;
+  private transient @com.fasterxml.jackson.annotation.JsonIgnore int intValue;
   public JacksonizedAccessorsTransient() {
     super();
   }
-  public @java.lang.SuppressWarnings("all") @lombok.Generated int intValue() {
+  public @com.fasterxml.jackson.annotation.JsonIgnore @java.lang.SuppressWarnings("all") @lombok.Generated int intValue() {
     return this.intValue;
   }
   /**
    * @return {@code this}.
    */
-  public @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedAccessorsTransient intValue(final int intValue) {
+  public @com.fasterxml.jackson.annotation.JsonIgnore @java.lang.SuppressWarnings("all") @lombok.Generated JacksonizedAccessorsTransient intValue(final int intValue) {
     this.intValue = intValue;
     return this;
   }