WIP

MorphiaOrg · Aug 20, 2024 · 6b596e5 · 6b596e5
1 parent 8eb6b32
commit 6b596e5
Show file tree

Hide file tree

Showing 14 changed files with 156 additions and 194 deletions.
diff --git a/core/src/main/java/dev/morphia/mapping/codec/pojo/critter/CritterEntityModel.java b/core/src/main/java/dev/morphia/mapping/codec/pojo/critter/CritterEntityModel.java
@@ -1,23 +1,132 @@
 package dev.morphia.mapping.codec.pojo.critter;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Set;
+
 import dev.morphia.annotations.Entity;
 import dev.morphia.mapping.Mapper;
+import dev.morphia.mapping.codec.MorphiaInstanceCreator;
 import dev.morphia.mapping.codec.pojo.EntityModel;
+import dev.morphia.mapping.codec.pojo.PropertyModel;
+import dev.morphia.mapping.codec.pojo.TypeData;
 
+/**
+ * 0
+ * 
+ * @hidden
+ * @morphia.internal
+ */
+@SuppressWarnings("NullableProblems")
 public abstract class CritterEntityModel extends EntityModel {
-    private Entity entityAnnotation;
+    protected final Mapper mapper;
+    protected Entity entityAnnotation;
 
     public CritterEntityModel(Mapper mapper, Class<?> type) {
-        super(mapper, type);
+        super(type);
+        this.mapper = mapper;
+    }
+
+    @Override
+    public abstract Set<Class<?>> classHierarchy();
+
+    @Override
+    public final void discriminator(String discriminator) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final EntityModel discriminatorKey(String discriminatorKey) {
+        throw new UnsupportedOperationException();
     }
 
     @Override
-    public Entity getEntityAnnotation() {
-        if (entityAnnotation == null) {
-            entityAnnotation = entityAnnotation();
-        }
-        return entityAnnotation;
+    public final EntityModel discriminatorEnabled(boolean discriminatorEnabled) {
+        throw new UnsupportedOperationException();
     }
 
-    protected abstract Entity entityAnnotation();
+    @Override
+    public abstract String collectionName();
+
+    @Override
+    public final EntityModel collectionName(String collectionName) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public abstract List<PropertyModel> getShardKeys();
+
+    @Override
+    public abstract String discriminator();
+
+    @Override
+    public abstract String discriminatorKey();
+
+    @Override
+    public abstract Entity getEntityAnnotation();
+
+    @Override
+    public abstract PropertyModel getIdProperty();
+
+    @Override
+    public final void setIdProperty(PropertyModel model) {
+
+    }
+
+    @Override
+    public abstract MorphiaInstanceCreator getInstanceCreator();
+
+    @Override
+    public abstract List<PropertyModel> getProperties(Class<? extends Annotation> type);
+
+    @Override
+    public abstract List<PropertyModel> getProperties();
+
+    @Override
+    public final PropertyModel getProperty(String name) {
+        return super.getProperty(name);
+    }
+
+    @Override
+    public abstract EntityModel getSubtype(Class<?> type);
+
+    @Override
+    public abstract Set<EntityModel> getSubtypes();
+
+    @Override
+    public abstract void addSubtype(EntityModel subtype);
+
+    @Override
+    public abstract EntityModel getSuperClass();
+
+    @Override
+    public abstract Class<?> getType();
+
+    @Override
+    public final void setType(Class<?> type) {
+    }
+
+    @Override
+    public abstract TypeData<?> getTypeData(Class<?> type, TypeData<?> suggested, Type genericType);
+
+    @Override
+    public abstract PropertyModel getVersionProperty();
+
+    @Override
+    public final void setVersionProperty(PropertyModel model) {
+
+    }
+
+    @Override
+    public abstract boolean hasLifecycle(Class<? extends Annotation> type);
+
+    @Override
+    public abstract boolean isAbstract();
+
+    @Override
+    public abstract boolean isInterface();
+
+    @Override
+    public abstract boolean useDiscriminator();
 }
diff --git a/critter/core/src/main/kotlin/dev/morphia/critter/CritterEntityModel.java b/critter/core/src/main/kotlin/dev/morphia/critter/CritterEntityModel.java
diff --git a/critter/core/src/main/kotlin/dev/morphia/critter/parser/CritterAsmGenerator.kt b/critter/core/src/main/kotlin/dev/morphia/critter/parser/CritterAsmGenerator.kt
@@ -1,10 +1,10 @@
 package dev.morphia.critter.parser
 
-import dev.morphia.critter.CritterEntityModel
 import dev.morphia.critter.parser.asm.CritterEntityModelGenerator
 import dev.morphia.critter.parser.java.CritterClassLoader
 import dev.morphia.critter.parser.java.CritterParser.critterClassLoader
 import dev.morphia.mapping.Mapper
+import dev.morphia.mapping.codec.pojo.critter.CritterEntityModel
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.tree.ClassNode
 

diff --git a/critter/core/src/main/kotlin/dev/morphia/critter/parser/CritterGizmoGenerator.kt b/critter/core/src/main/kotlin/dev/morphia/critter/parser/CritterGizmoGenerator.kt
@@ -1,10 +1,10 @@
 package dev.morphia.critter.parser
 
-import dev.morphia.critter.CritterEntityModel
 import dev.morphia.critter.parser.gizmo.GizmoEntityModelGenerator
 import dev.morphia.critter.parser.java.CritterClassLoader
 import dev.morphia.critter.parser.java.CritterParser.critterClassLoader
 import dev.morphia.mapping.Mapper
+import dev.morphia.mapping.codec.pojo.critter.CritterEntityModel
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.tree.ClassNode
 

diff --git a/critter/core/src/main/kotlin/dev/morphia/critter/parser/asm/CritterEntityModelGenerator.kt b/critter/core/src/main/kotlin/dev/morphia/critter/parser/asm/CritterEntityModelGenerator.kt
@@ -2,7 +2,7 @@ package dev.morphia.critter.parser.asm
 
 import dev.morphia.annotations.Entity
 import dev.morphia.critter.Critter.Companion.critterPackage
-import dev.morphia.critter.CritterEntityModel
+import dev.morphia.mapping.codec.pojo.critter.CritterEntityModel
 import java.lang.reflect.InvocationHandler
 import java.lang.reflect.Method
 import java.lang.reflect.Modifier

diff --git a/critter/core/src/main/kotlin/dev/morphia/critter/parser/gizmo/GizmoPropertyModelGenerator.kt b/critter/core/src/main/kotlin/dev/morphia/critter/parser/gizmo/GizmoPropertyModelGenerator.kt
@@ -49,13 +49,16 @@ class GizmoPropertyModelGenerator : BaseGizmoGenerator {
     private fun ctor() {
         val constructor = creator.getConstructorCreator(EntityModel::class.java)
         constructor.invokeSpecialMethod(
-            MethodDescriptor.ofConstructor(PropertyModel::class.java, EntityModel::class.java),
-            constructor.`this`,
+            MethodDescriptor.ofConstructor(
+                CritterPropertyModel::class.java,
+                EntityModel::class.java
+            ),
+            constructor.getThis(),
             constructor.getMethodParam(0)
         )
         constructor.setParameterNames(arrayOf("model"))
 
-        registerAnnotations(constructor)
+        //        registerAnnotations(constructor)
 
         constructor.close()
     }

diff --git a/critter/core/src/main/kotlin/dev/morphia/critter/parser/ksp/EntityModelGenerator.kt b/critter/core/src/main/kotlin/dev/morphia/critter/parser/ksp/EntityModelGenerator.kt
@@ -9,11 +9,11 @@ import com.squareup.javapoet.TypeSpec
 import dev.morphia.annotations.internal.AnnotationKspFactory.entityAnnotation
 import dev.morphia.annotations.internal.AnnotationKspFactory.entityCodeGen
 import dev.morphia.config.MorphiaConfig
-import dev.morphia.critter.CritterEntityModel
 import dev.morphia.critter.parser.ksp.extensions.allAnnotations
 import dev.morphia.critter.parser.ksp.extensions.name
 import dev.morphia.critter.parser.ksp.extensions.toTypeName
 import dev.morphia.mapping.Mapper
+import dev.morphia.mapping.codec.pojo.critter.CritterEntityModel
 import javax.lang.model.element.Modifier.PUBLIC
 
 class EntityModelGenerator(source: KSClassDeclaration, val config: MorphiaConfig) :
@@ -37,10 +37,12 @@ class EntityModelGenerator(source: KSClassDeclaration, val config: MorphiaConfig
             "collectionName",
             orDefault(entityAnnotation.value, config.collectionNaming().apply(source.name()))
         )
-        stringMethod(
-            "discriminator",
-            config.discriminator().apply(fqcn, entityAnnotation.discriminator)
-        )
+        /*
+                stringMethod(
+                    "discriminator",
+                    config.discriminator().apply(fqcn, entityAnnotation.discriminator)
+                )
+        */
         stringMethod(
             "discriminatorKey",
             orDefault(entityAnnotation.discriminatorKey, config.discriminatorKey())

diff --git a/critter/core/src/test/java/dev/morphia/critter/sources/ExampleEntityModelTemplate.java b/critter/core/src/test/java/dev/morphia/critter/sources/ExampleEntityModelTemplate.java
@@ -7,12 +7,12 @@
 
 import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.internal.EntityBuilder;
-import dev.morphia.critter.CritterEntityModel;
 import dev.morphia.mapping.Mapper;
 import dev.morphia.mapping.codec.MorphiaInstanceCreator;
 import dev.morphia.mapping.codec.pojo.EntityModel;
 import dev.morphia.mapping.codec.pojo.PropertyModel;
 import dev.morphia.mapping.codec.pojo.TypeData;
+import dev.morphia.mapping.codec.pojo.critter.CritterEntityModel;
 import dev.morphia.mapping.conventions.MorphiaDefaultsConvention;
 
 public class ExampleEntityModelTemplate extends CritterEntityModel {
@@ -41,7 +41,7 @@ public List<PropertyModel> getShardKeys() {
 
     @Override
     public String discriminator() {
-        return mapper.getConfig().discriminator().apply(Example.class.getName(), ".");
+        return mapper.getConfig().discriminator().apply(Example.class, ".");
     }
 
     @Override