From a5a6ef8f4b63b2a4aa18f618dc95693adc204e31 Mon Sep 17 00:00:00 2001
From: evanchooly <jlee@antwerkz.com>
Date: Wed, 22 Jan 2025 23:07:46 -0500
Subject: [PATCH] use the Impl class don't access fields directly

---
 .../java/dev/morphia/test/lifecycle/TestLifecycles.java     | 6 ++++--
 core/src/test/java/dev/morphia/test/mapping/TestMapper.java | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/src/test/java/dev/morphia/test/lifecycle/TestLifecycles.java b/core/src/test/java/dev/morphia/test/lifecycle/TestLifecycles.java
index d964ed08e50..d1d3721d871 100644
--- a/core/src/test/java/dev/morphia/test/lifecycle/TestLifecycles.java
+++ b/core/src/test/java/dev/morphia/test/lifecycle/TestLifecycles.java
@@ -14,6 +14,7 @@
 import com.mongodb.lang.Nullable;
 
 import dev.morphia.Datastore;
+import dev.morphia.DatastoreImpl;
 import dev.morphia.EntityInterceptor;
 import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Id;
@@ -273,8 +274,9 @@ public boolean hasAnnotation(Class<? extends Annotation> type) {
 
         @Override
         public void prePersist(@NotNull Object ent, @NotNull Document document, @NotNull Datastore datastore) {
-            final List<PropertyModel> fieldsToTest = datastore.getMapper().getEntityModel(ent.getClass())
-                    .getProperties(NonNull.class);
+            DatastoreImpl ds = (DatastoreImpl) datastore;
+            final List<PropertyModel> fieldsToTest = ds.getMapper().getEntityModel(ent.getClass())
+                                                               .getProperties(NonNull.class);
             for (PropertyModel mf : fieldsToTest) {
                 if (mf.getValue(ent) == null) {
                     throw new NonNullValidationException(mf);
diff --git a/core/src/test/java/dev/morphia/test/mapping/TestMapper.java b/core/src/test/java/dev/morphia/test/mapping/TestMapper.java
index a14dcd3644e..7e55d1438dd 100644
--- a/core/src/test/java/dev/morphia/test/mapping/TestMapper.java
+++ b/core/src/test/java/dev/morphia/test/mapping/TestMapper.java
@@ -39,7 +39,7 @@ private static void assertModelNotSame(EntityModel originalEntity, EntityModel c
         } else {
             assertNotSame(originalEntity.superClass, clonedEntity.superClass);
         }
-        originalEntity.subtypes.forEach(subtype -> {
+        originalEntity.getSubtypes().forEach(subtype -> {
             assertNotSame(subtype, findSubtype(clonedEntity, subtype));
         });
         originalEntity.getProperties().forEach(propertyModel -> {
@@ -49,7 +49,7 @@ private static void assertModelNotSame(EntityModel originalEntity, EntityModel c
     }
 
     private static EntityModel findSubtype(EntityModel clonedEntity, EntityModel subtype) {
-        return clonedEntity.subtypes.stream()
+        return clonedEntity.getSubtypes().stream()
                 .filter(clone -> clone.getType().equals(subtype.getType()))
                 .findFirst()
                 .orElseThrow(() -> new MappingException(