ignore some annotations when copying to generated constructor method

stCarolas · Nov 6, 2023 · 205dd26 · 205dd26
1 parent 73c47e3
commit 205dd26
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/annotations/src/main/java/io/github/stcarolas/enrichedbeans/annotations/Enrich.java b/annotations/src/main/java/io/github/stcarolas/enrichedbeans/annotations/Enrich.java
@@ -5,6 +5,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.FIELD})
+@Target({ElementType.FIELD, ElementType.METHOD})
 @Retention(RetentionPolicy.SOURCE)
 public @interface Enrich {}
diff --git a/...d-inject/src/main/java/io/github/stcarolas/enrichedbeans/assistedinject/AssistedBean.java b/...d-inject/src/main/java/io/github/stcarolas/enrichedbeans/assistedinject/AssistedBean.java
@@ -115,7 +115,14 @@ protected String factoryMethodName() {
   }
 
   protected Seq<Variable> notInjectedFields() {
-    return fields().reject(shouldBeInjected(assistAllInjectedFields()));
+    // TODO filter static fields and inited fields
+    return fields()
+      .reject(shouldBeInjected(assistAllInjectedFields()))
+      .map(field -> field.removeAnnotation("com.fasterxml.jackson.annotation", "JsonIgnore"))
+      .map(field -> field.removeAnnotation("org.springframework.data.annotation","Id"))
+      .map(field -> field.removeAnnotation("org.springframework.data.annotation","Transient"))
+    ;
+
   }
 
   protected Seq<Variable> injectedFields() {
@@ -142,7 +149,11 @@ protected Seq<Variable> injectedFields() {
           Enrich.class.getPackageName(),
           Enrich.class.getSimpleName()
         )
-      );
+      )
+      .map(field -> field.removeAnnotation("com.fasterxml.jackson.annotation", "JsonIgnore"))
+      .map(field -> field.removeAnnotation("org.springframework.data.annotation","Id"))
+      .map(field -> field.removeAnnotation("org.springframework.data.annotation","Transient"))
+    ;
   }
 
   private Predicate<Variable> shouldBeInjected(boolean detectNamedFields) {

diff --git a/.../src/main/java/io/github/stcarolas/enrichedbeans/assistedinject/AssistingFactoryBean.java b/.../src/main/java/io/github/stcarolas/enrichedbeans/assistedinject/AssistingFactoryBean.java
@@ -24,6 +24,7 @@ public abstract class AssistingFactoryBean extends GeneratedBean implements With
 
   abstract Modifier visibility();
 
+  // todo почему он не тут?
   abstract Method factoryMethod();
 
   abstract Constructor constructor();