Fix bean-meta annotation support

Author: dwijnand

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -1021,6 +1021,8 @@ class Definitions {
   @tu lazy val UncheckedVarianceAnnot: ClassSymbol = requiredClass("scala.annotation.unchecked.uncheckedVariance")
   @tu lazy val VolatileAnnot: ClassSymbol = requiredClass("scala.volatile")
   @tu lazy val WithPureFunsAnnot: ClassSymbol = requiredClass("scala.annotation.internal.WithPureFuns")
+  @tu lazy val BeanGetterMetaAnnot: ClassSymbol = requiredClass("scala.annotation.meta.beanGetter")
+  @tu lazy val BeanSetterMetaAnnot: ClassSymbol = requiredClass("scala.annotation.meta.beanSetter")
   @tu lazy val FieldMetaAnnot: ClassSymbol = requiredClass("scala.annotation.meta.field")
   @tu lazy val GetterMetaAnnot: ClassSymbol = requiredClass("scala.annotation.meta.getter")
   @tu lazy val ParamMetaAnnot: ClassSymbol = requiredClass("scala.annotation.meta.param")

compiler/src/dotty/tools/dotc/transform/BeanProperties.scala

@@ -34,7 +34,10 @@ class BeanProperties(thisPhase: DenotTransformer):
         info = MethodType(Nil, valDef.denot.info),
         coord = annot.tree.span
       ).enteredAfter(thisPhase).asTerm
-      meth.addAnnotations(valDef.symbol.annotations)
+      val annots = valDef.symbol.annotations.filter { a =>
+        a.hasOneOfMetaAnnotation(defn.BeanGetterMetaAnnot) | !a.hasOneOfMetaAnnotation(defn.BeanSetterMetaAnnot)
+      }
+      meth.addAnnotations(annots)
       val body: Tree = ref(valDef.symbol)
       DefDef(meth, body)
 
@@ -48,9 +51,11 @@ class BeanProperties(thisPhase: DenotTransformer):
           info = MethodType(valDef.name :: Nil, valDef.denot.info :: Nil, defn.UnitType),
           coord = annot.tree.span
         ).enteredAfter(thisPhase).asTerm
-        meth.addAnnotations(valDef.symbol.annotations)
-        def body(params: List[List[Tree]]): Tree = Assign(ref(valDef.symbol), params.head.head)
-        DefDef(meth, body)
+        val annots = valDef.symbol.annotations.filter { a =>
+          a.hasOneOfMetaAnnotation(defn.BeanSetterMetaAnnot) | !a.hasOneOfMetaAnnotation(defn.BeanGetterMetaAnnot)
+        }
+        meth.addAnnotations(annots)
+        DefDef(meth, (params: List[List[Tree]]) => Assign(ref(valDef.symbol), params.head.head))
       }
 
     def prefixedName(prefix: String, valName: Name) =

tests/run/i15318.check

@@ -0,0 +1,8 @@
+inspecting field value
+@JsonProperty(value="REAL_VALUE")
+inspecting method getValue
+@JsonProperty(value="REAL_VALUE")
+inspecting method setValue
+inspecting method value
+inspecting method value_$eq
+inspecting constructor TestBeanProperty

tests/run/i15318/JsonProperty.java

@@ -0,0 +1,7 @@
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface JsonProperty {
+    String value() default "";
+}

tests/run/i15318/Test.scala

@@ -0,0 +1,25 @@
+object Test:
+  def main(args: Array[String]): Unit =
+    val clasz = classOf[TestBeanProperty]
+
+    for (m <- clasz.getDeclaredFields.sortBy(_.getName)) {
+      m.setAccessible(true)
+      println(s"inspecting field ${m.getName}")
+      for a <- m.getAnnotations().sortBy(_.toString) do
+        println(a)
+    }
+
+    for (m <- clasz.getDeclaredMethods.sortBy(_.getName)) {
+      m.setAccessible(true)
+      println(s"inspecting method ${m.getName}")
+      for a <- m.getAnnotations().sortBy(_.toString) do
+        println(a)
+    }
+
+    for c <- clasz.getDeclaredConstructors.sortBy(_.getName) do
+      c.setAccessible(true)
+      println(s"inspecting constructor ${c.getName}")
+      for p <- c.getParameters.sortBy(_.getName) do
+        println(s"inspecting param ${p.getName}")
+        for a <- p.getAnnotations.sortBy(_.toString) do
+          println(s"annotation $a")

tests/run/i15318/TestBeanProperty.scala

@@ -0,0 +1,10 @@
+import scala.annotation.meta.beanGetter
+import scala.beans.BeanProperty
+
+class TestBeanProperty {
+
+  @(JsonProperty @beanGetter)(value = "REAL_VALUE")
+  @BeanProperty
+  var value: String = _
+
+}