use annotations of the patchfile, if javamerge_override is set.

cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/main/java/com/devonfw/cobigen/javaplugin/merger/JavaMerger.java

@@ -10,18 +10,24 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.devonfw.cobigen.api.exception.MergeException;
 import com.devonfw.cobigen.api.extension.Merger;
 import com.devonfw.cobigen.api.util.StringUtil;
 import com.devonfw.cobigen.api.util.SystemUtil;
 import com.devonfw.cobigen.javaplugin.inputreader.JavaParserUtil;
 import com.devonfw.cobigen.javaplugin.merger.libextension.ModifyableJavaClass;
+import com.thoughtworks.qdox.model.JavaAnnotation;
 import com.thoughtworks.qdox.model.JavaClass;
 import com.thoughtworks.qdox.model.JavaConstructor;
 import com.thoughtworks.qdox.model.JavaField;
 import com.thoughtworks.qdox.model.JavaInitializer;
 import com.thoughtworks.qdox.model.JavaMethod;
+import com.thoughtworks.qdox.model.impl.DefaultJavaField;
+import com.thoughtworks.qdox.model.impl.DefaultJavaMethod;
 import com.thoughtworks.qdox.parser.ParseException;
 
 /**
@@ -112,6 +118,7 @@ public String merge(File base, String patch, String targetCharset) throws MergeE
    */
   private ModifyableJavaClass merge(ModifyableJavaClass baseClass, ModifyableJavaClass patchClass) {
 
+    baseClass.setAnnotations(mergeAnnotation(baseClass.getAnnotations(), patchClass.getAnnotations()));
     mergeImports(baseClass, patchClass);
     mergeFields(baseClass, patchClass);
     mergeInnerClasses(baseClass, patchClass);
@@ -120,6 +127,24 @@ private ModifyableJavaClass merge(ModifyableJavaClass baseClass, ModifyableJavaC
     return baseClass;
   }
 
+  /**
+   * @param baseAnnotations {@link JavaClass} a List of annotations originate from the base class
+   * @param patchAnnotations {@link JavaClass} a List of annotations originate from the patch class
+   */
+  private List<JavaAnnotation> mergeAnnotation(List<JavaAnnotation> baseAnnotations,
+      List<JavaAnnotation> patchAnnotations) {
+
+    List<JavaAnnotation> bAnnotations = this.patchOverrides ? patchAnnotations : baseAnnotations;
+    List<JavaAnnotation> pAnnotations = this.patchOverrides ? baseAnnotations : patchAnnotations;
+
+    Set<String> annotationNames = bAnnotations.stream().map(a -> a.getType().getName()).collect(Collectors.toSet());
+
+    List<JavaAnnotation> annotationsToMerge = pAnnotations.stream()
+        .filter(a -> !annotationNames.contains(a.getType().getName())).collect(Collectors.toList());
+
+    return Stream.of(bAnnotations, annotationsToMerge).flatMap(a -> a.stream()).collect(Collectors.toList());
+  }
+
   /**
    * Merges all super types of the two class sources
    *
@@ -231,9 +256,11 @@ private void mergeFields(ModifyableJavaClass baseClass, ModifyableJavaClass patc
       if (baseField == null) {
         baseClass.addField(patchField);
       } else {
+        ((DefaultJavaField) baseField)
+            .setAnnotations(new ArrayList<>(mergeAnnotation(baseField.getAnnotations(), patchField.getAnnotations())));
         if (this.patchOverrides) {
           baseClass.replace(baseField, patchField);
-        } // else do not override
+        }
       }
     }
   }
@@ -288,11 +315,14 @@ private void mergeMethods(ModifyableJavaClass baseClass, ModifyableJavaClass pat
       if (baseMethod == null) {
         baseClass.addMethod(patchMethod);
       } else {
+        ((DefaultJavaMethod) baseMethod)
+            .setAnnotations(mergeAnnotation(baseMethod.getAnnotations(), patchMethod.getAnnotations()));
         if (this.patchOverrides) {
           baseClass.replace(baseMethod, patchMethod);
-        } // else do not override
+        }
       }
     }
+
   }
 
   /**

cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/java/com/devonfw/cobigen/javaplugin/unittest/merger/JavaMergerTest.java

@@ -517,4 +517,86 @@ private JavaSource getMergedSource(File baseFile, File patchFile, boolean overri
     return getFirstJavaClass(new StringReader(mergedContents)).getSource();
   }
 
+  /**
+   * Tests merging the class annotation into the baseFile
+   *
+   * @throws IOException shouldn't happen
+   * @throws MergeException shouldn't happen either
+   */
+  @Test
+  public void testMergeClassAnnotation() throws IOException, MergeException {
+
+    File baseFile = new File(testFileRootPath + "BaseFile_ClassAnnotation.java");
+    File patchFile = new File(testFileRootPath + "PatchFile_ClassAnnotation.java");
+
+    // with override
+    String mergedContents = new JavaMerger("", true).merge(baseFile,
+        FileUtils.readFileToString(patchFile, StandardCharsets.UTF_8), "UTF-8");
+
+    assertThat(mergedContents).contains("@Entity");
+    assertThat(mergedContents).contains("@javax.persistence.Table(name=\"Visitor\")");
+
+    // without override
+    mergedContents = new JavaMerger("", false).merge(baseFile,
+        FileUtils.readFileToString(patchFile, StandardCharsets.UTF_8), "UTF-8");
+
+    assertThat(mergedContents).contains("@Entity");
+    assertThat(mergedContents).contains("@javax.persistence.Table(name=\"Visits\")");
+  }
+
+  /**
+   * Tests merging a property annotation into the baseFile
+   *
+   * @throws IOException shouldn't happen
+   * @throws MergeException shouldn't happen either
+   */
+  @Test
+  public void testMergePropertyAnnotation() throws IOException, MergeException {
+
+    File baseFile = new File(testFileRootPath + "BaseFile_PropertyAnnotation.java");
+    File patchFile = new File(testFileRootPath + "PatchFile_PropertyAnnotation.java");
+
+    // with override
+    String mergedContents = new JavaMerger("", false).merge(baseFile,
+        FileUtils.readFileToString(patchFile, StandardCharsets.UTF_8), "UTF-8");
+
+    assertThat(mergedContents).contains("@Column(name=\"USER\")");
+    assertThat(mergedContents).contains("@Column(name=\"NAME\")");
+
+    // without override
+
+    mergedContents = new JavaMerger("", true).merge(baseFile,
+        FileUtils.readFileToString(patchFile, StandardCharsets.UTF_8), "UTF-8");
+
+    assertThat(mergedContents).contains("@Column(name=  \"USERNAME\")");
+    assertThat(mergedContents).contains("@Column(name=\"NAME\")");
+
+  }
+
+  /**
+   * Tests merging a Method annotation into the baseFile
+   *
+   * @throws IOException shouldn't happen
+   * @throws MergeException shouldn't happen either
+   */
+  @Test
+  public void testMergeMethodAnnotation() throws IOException, MergeException {
+
+    File baseFile = new File(testFileRootPath + "BaseFile_MethodAnnotation.java");
+    File patchFile = new File(testFileRootPath + "PatchFile_MethodAnnotation.java");
+
+    // with override
+    String mergedContents = new JavaMerger("", true).merge(baseFile,
+        FileUtils.readFileToString(patchFile, StandardCharsets.UTF_8), "UTF-8");
+
+    assertThat(mergedContents).contains("@Column(name=\"USERNAME\")");
+    assertThat(mergedContents).contains("@Column(name=\"USER\")");
+
+    // without override
+    mergedContents = new JavaMerger("", false).merge(baseFile,
+        FileUtils.readFileToString(patchFile, StandardCharsets.UTF_8), "UTF-8");
+
+    assertThat(mergedContents).contains("@Column(name=\"NAME\")");
+    assertThat(mergedContents).contains("@Column(name=\"USER\")");
+  }
 }

cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_ClassAnnotation.java

@@ -0,0 +1,14 @@
+package com.devonfw.application.jtqj.general.dataaccess.api;
+
+import com.devonfw.application.jtqj.general.common.api.Visitor;
+
+@javax.persistence.Table(name = "Visits")
+public class VisitorEntity extends ApplicationPersistenceEntity implements Visitor {
+
+    private String username;
+
+    private String name;
+
+    private static final long serialVersionUID = 1L;
+
+}

cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_MethodAnnotation.java

@@ -0,0 +1,21 @@
+package com.devonfw;
+
+/**
+ * Data access object for Visitor entities
+ */
+public class VisitorEntity extends ApplicationPersistenceEntity implements Visitor {
+
+  private String username;
+
+  private String name;
+
+  @Column(name = "NAME")
+  public String getUsername() {
+    return this.username;
+  }
+
+  public String getName() {
+    return this.Name;
+  }
+
+}

cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/BaseFile_PropertyAnnotation.java

@@ -0,0 +1,20 @@
+package com.devonfw.application.jtqj.general.dataaccess.api;
+
+import javax.persistence.Entity;
+import com.devonfw.application.jtqj.general.common.api.Visitor;
+
+/**
+ * Data access object for Visitor entities
+ */
+@Entity
+@javax.persistence.Table(name = "Visitor")
+public class VisitorEntity extends ApplicationPersistenceEntity implements Visitor {
+
+  @Column(name = "USER")
+  private String username;
+
+  private String name;
+
+  private static final long serialVersionUID = 1L;
+
+}

cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/PatchFile_ClassAnnotation.java

@@ -0,0 +1,16 @@
+package com.devonfw.application.jtqj.general.dataaccess.api;
+
+import javax.persistence.Entity;
+
+import com.devonfw.application.jtqj.general.common.api.Visitor;
+
+/**
+ * Data access object for Visitor entities
+ */
+@Entity
+@javax.persistence.Table(name = "Visitor")
+public class VisitorEntity extends ApplicationPersistenceEntity implements Visitor {
+
+    private static final long serialVersionUID = 1L;
+
+}

cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/PatchFile_MethodAnnotation.java

@@ -0,0 +1,22 @@
+package com.devonfw;
+
+/**
+ * Data access object for Visitor entities
+ */
+public class VisitorEntity extends ApplicationPersistenceEntity implements Visitor {
+
+  private String username;
+
+  private String name;
+
+  @Column(name = "USERNAME")
+  public String getUsername() {
+    return this.username;
+  }
+
+  @Column(name = "USER")
+  public String getName() {
+    return this.Name;
+  }
+
+}

cobigen-plugins/cobigen-javaplugin-parent/cobigen-javaplugin/src/test/resources/testdata/unittest/merger/PatchFile_PropertyAnnotation.java

@@ -0,0 +1,22 @@
+package com.devonfw.application.jtqj.general.dataaccess.api;
+
+import javax.persistence.Entity;
+
+import com.devonfw.application.jtqj.general.common.api.Visitor;
+
+/**
+ * Data access object for Visitor entities
+ */
+@Entity
+@javax.persistence.Table(name = "Visitor")
+public class VisitorEntity extends ApplicationPersistenceEntity implements Visitor {
+
+    private static final long serialVersionUID = 1L;
+
+    @Column(name = "USERNAME")
+    private String username;
+
+
+    @Column(name = "NAME")
+    private String name;
+}