From b29a61df4096bd49a1eb9432e742970e44a6bfd9 Mon Sep 17 00:00:00 2001 From: Vadim Karantayer Date: Fri, 3 Sep 2021 10:40:54 -0400 Subject: [PATCH] update TestUtil to test Embeddable classes, not just Entity classes --- .../src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java index f878494e559..3b1ed6553fd 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java @@ -35,6 +35,7 @@ import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.InstantType; import javax.persistence.Column; +import javax.persistence.Embeddable; import javax.persistence.Embedded; import javax.persistence.EmbeddedId; import javax.persistence.Entity; @@ -106,7 +107,8 @@ public class TestUtil { for (ClassInfo classInfo : classes) { Class clazz = Class.forName(classInfo.getName()); Entity entity = clazz.getAnnotation(Entity.class); - if (entity == null) { + Embeddable embeddable = clazz.getAnnotation(Embeddable.class); + if (entity == null && embeddable == null) { continue; }