cache EntityType excludeFromIndexes annotation

spotify · Jul 6, 2020 · b6b5c61 · b6b5c61
1 parent c46aad4
commit b6b5c61
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/datastore/src/main/scala/magnolify/datastore/EntityType.scala b/datastore/src/main/scala/magnolify/datastore/EntityType.scala
@@ -65,6 +65,14 @@ object EntityField {
   type Typeclass[T] = EntityField[T]
 
   def combine[T](caseClass: CaseClass[Typeclass, T]): Record[T] = new Record[T] {
+    private val excludeFromIndexes: Array[Boolean] = {
+      val a = new Array[Boolean](caseClass.parameters.length)
+      caseClass.parameters.foreach { p =>
+        a(p.index) = getExcludeFromIndexes(p.annotations, s"${caseClass.typeName.full}#${p.label}")
+      }
+      a
+    }
+
     override def fromEntity(v: Entity)(cm: CaseMapper): T =
       caseClass.construct { p =>
         val f = v.getPropertiesOrDefault(cm.map(p.label), null)
@@ -81,7 +89,7 @@ object EntityField {
         if (vb != null) {
           eb.putProperties(
             cm.map(p.label),
-            vb.setExcludeFromIndexes(getExcludeFromIndexes(p.annotations, cm.map(p.label)))
+            vb.setExcludeFromIndexes(excludeFromIndexes(p.index))
               .build()
           )
         }

diff --git a/datastore/src/test/scala/magnolify/datastore/test/EntityTypeSpec.scala b/datastore/src/test/scala/magnolify/datastore/test/EntityTypeSpec.scala
@@ -133,7 +133,7 @@ object EntityTypeSpec extends MagnolifySpec("EntityType") {
     expectException[IllegalArgumentException](
       EntityType[DoubleEntityIndex].apply(DoubleEntityIndex(0))
     ).getMessage ==
-      "requirement failed: More than one excludeFromIndexes annotation: i"
+      "requirement failed: More than one excludeFromIndexes annotation: magnolify.datastore.test.DoubleEntityIndex#i"
   )
 
   {