use 'value' for class value in Clazz annotation instead of 'clazz'

src/main/java/jef/model/EntityInitializer.java

@@ -18,7 +18,7 @@ class EntityInitializer {
             if (clazzAnnotation == null) {
                 throw new ModelException("DbSet " + ctxfield.getName() + " is missing the " + Clazz.class.getSimpleName() + " annotation");
             }
-            var dbsetClazz = (Class<? extends SerializableObject>) clazzAnnotation.clazz();
+            var dbSetClazz = (Class<? extends SerializableObject>) clazzAnnotation.value();
             initEntity(mb, dbsetClazz, ctxfield.getName());
         }
     }
@@ -39,7 +39,7 @@ class EntityInitializer {
                 if (clazzAnnotation.length == 0) {
                     throw new ModelException("Field " + f.getClass().getSimpleName() + "::" + f.getName() + " is missing the " + Clazz.class.getSimpleName() + " annotation");
                 }
-                var fClazz = clazzAnnotation[0].clazz();
+                var fClazz = clazzAnnotation[0].value();
                 var foundCollection = entity.getFields().stream()
                         .filter(e -> Collection.class.isAssignableFrom(e.getType())
                                 && e.isModelField()

src/main/java/jef/model/ForeignKeyInitializer.java

@@ -31,10 +31,10 @@ class ForeignKeyInitializer {
                 if (clazzAnnotation == null) {
                     throw new ModelException("Collection " + entity.getType().getSimpleName() + "." + f.getName() + " is missing the " + Clazz.class.getSimpleName() + " annotation");
                 }
-                var otherEntity = mb.getEntity((Class<? extends SerializableObject>) clazzAnnotation.clazz());
+                var otherEntity = mb.getEntity((Class<? extends SerializableObject>) clazzAnnotation.value());
                 if (otherEntity == null) {
-                    EntityInitializer.initEntity(mb, (Class<? extends SerializableObject>) clazzAnnotation.clazz(), f.getName());
+                    EntityInitializer.initEntity(mb, (Class<? extends SerializableObject>) clazzAnnotation.value(), f.getName());
-                    otherEntity = mb.getEntity((Class<? extends SerializableObject>) clazzAnnotation.clazz());
+                    otherEntity = mb.getEntity((Class<? extends SerializableObject>) clazzAnnotation.value());
                     PrimaryKeyInitializer.initPrimaryKeys(mb, otherEntity);
                 }
                 var primary = entity.getPrimaryKey();
@@ -49,7 +49,7 @@ class ForeignKeyInitializer {
                                 var otherEntityListField = otherEntityF.getFields().stream()
                                         .filter(oef -> Collection.class.isAssignableFrom(oef.getType())
                                                 && oef.getField().getAnnotationsByType(Clazz.class).length > 0
-                                                && oef.getField().getAnnotationsByType(Clazz.class)[0].clazz() == entity.getType()).findFirst();
+                                                && oef.getField().getAnnotationsByType(Clazz.class)[0].value() == entity.getType()).findFirst();
                                 if (otherEntityListField.isPresent()) {
                                     throw new ModelException("N to N relations need to explicitly defined via a mapping model ("
                                             + otherEntityF.getType().getSimpleName() + "::" + otherEntityListField.get().getType().getName() + " and "
@@ -103,7 +103,7 @@ class ForeignKeyInitializer {
                             var entityListField = entity.getFields().stream()
                                     .filter(oef -> Collection.class.isAssignableFrom(oef.getType())
                                             && oef.getField().getAnnotationsByType(Clazz.class).length > 0
-                                            && oef.getField().getAnnotationsByType(Clazz.class)[0].clazz() == otherEntityF.getType()).toList();
+                                            && oef.getField().getAnnotationsByType(Clazz.class)[0].value() == otherEntityF.getType()).toList();
 //                            if (entityListField.size() == 1) {
 //                                return new FieldSearchResult(entityListField.get(0), true);
 //                            }

src/main/java/jef/model/annotations/Clazz.java

@@ -10,5 +10,5 @@ import java.lang.annotation.Target;
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Clazz {
-    Class<?> clazz();
+    Class<?> value();
 }

src/test/java/jef/model/DbContextSimpleTest.java

@@ -36,7 +36,7 @@ class DbContextSimpleTest {
 
     public static class Ctx extends DbContext {
 
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 

src/test/java/jef/model/EntityInitializerMultiple1To1RelationTest.java

@@ -58,9 +58,9 @@ class EntityInitializerMultiple1To1RelationTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects2;
     }
 

src/test/java/jef/model/EntityInitializerMultiple1ToNRelationTest.java

@@ -21,9 +21,9 @@ class EntityInitializerMultiple1ToNRelationTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects2;
     }
 
@@ -31,9 +31,9 @@ class EntityInitializerMultiple1ToNRelationTest {
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i2 = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private List<TestClass> mapping;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private Set<TestClass> mapping2;
     }
 

src/test/java/jef/model/ForeignKeyInitializerNToNRelationTest.java

@@ -69,11 +69,11 @@ class ForeignKeyInitializerNToNRelationTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects2;
-        @Clazz(clazz = Mapping.class)
+        @Clazz(Mapping.class)
         private DbSet<Mapping> rels;
     }
 
@@ -81,7 +81,7 @@ class ForeignKeyInitializerNToNRelationTest {
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i2 = 1;
-        @Clazz(clazz = Mapping.class)
+        @Clazz(Mapping.class)
         private List<Mapping> mapping;
     }
 
@@ -93,15 +93,15 @@ class ForeignKeyInitializerNToNRelationTest {
         public double d;
         public float f;
         public long l;
-        @Clazz(clazz = Mapping.class)
+        @Clazz(Mapping.class)
         private List<Mapping> mapping;
     }
 
     @Getter
     public static class Mapping extends SerializableObject {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private TestClass2 object2;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private TestClass object;
     }
 }

src/test/java/jef/model/ForeignKeyInitializerNestedList2LayerTest.java

@@ -73,14 +73,14 @@ class ForeignKeyInitializerNestedList2LayerTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass3.class)
+        @Clazz(TestClass3.class)
         private DbSet<TestClass3> objects1;
     }
 
     @Getter
     public static class TestClass3 extends SerializableObject {
         public int id = 1;
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         public List<TestClass2> nested2;
     }
 
@@ -88,7 +88,7 @@ class ForeignKeyInitializerNestedList2LayerTest {
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public List<TestClass> nested;
     }
 

src/test/java/jef/model/ForeignKeyInitializerNestedListMissingPrimaryKeyTest.java

@@ -20,7 +20,7 @@ class ForeignKeyInitializerNestedListMissingPrimaryKeyTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
     }
 
@@ -28,7 +28,7 @@ class ForeignKeyInitializerNestedListMissingPrimaryKeyTest {
     public static class TestClass2 extends SerializableObject {
         //        @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public List<TestClass> nested;
     }
 

src/test/java/jef/model/ForeignKeyInitializerNestedListSimpleTest.java

@@ -53,7 +53,7 @@ class ForeignKeyInitializerNestedListSimpleTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
     }
 
@@ -61,7 +61,7 @@ class ForeignKeyInitializerNestedListSimpleTest {
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public List<TestClass> nested;
     }
 

src/test/java/jef/model/ForeignKeyInitializerNestedObject2LayerTest.java

@@ -70,7 +70,7 @@ class ForeignKeyInitializerNestedObject2LayerTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass3.class)
+        @Clazz(TestClass3.class)
         private DbSet<TestClass3> objects1;
     }
 

src/test/java/jef/model/ForeignKeyInitializerNestedObjectMissingPrimaryKeyTest.java

@@ -18,7 +18,7 @@ class ForeignKeyInitializerNestedObjectMissingPrimaryKeyTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
     }
 

src/test/java/jef/model/ForeignKeyInitializerNestedObjectSimpleTest.java

@@ -51,7 +51,7 @@ class ForeignKeyInitializerNestedObjectSimpleTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
     }
 

src/test/java/jef/model/ForeignKeyInitializerRecursive1To1RelationTest.java

@@ -50,7 +50,7 @@ class ForeignKeyInitializerRecursive1To1RelationTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects2;
     }
 

src/test/java/jef/model/ForeignKeyInitializerRecursive1ToNRelationTest.java

@@ -45,7 +45,7 @@ class ForeignKeyInitializerRecursive1ToNRelationTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects2;
     }
 
@@ -57,7 +57,7 @@ class ForeignKeyInitializerRecursive1ToNRelationTest {
         public double d;
         public float f;
         public long l;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private List<TestClass> recursive;
     }
 }

src/test/java/jef/model/ForeignKeyInitializerRecursiveWithParent1ToNRelationTest.java

@@ -46,7 +46,7 @@ class ForeignKeyInitializerRecursiveWithParent1ToNRelationTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects2;
     }
 
@@ -58,7 +58,7 @@ class ForeignKeyInitializerRecursiveWithParent1ToNRelationTest {
         public double d;
         public float f;
         public long l;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private List<TestClass> recursive;
         private TestClass parent;
     }

src/test/java/jef/model/ModelBuilderCloneTest.java

@@ -224,9 +224,9 @@ public class ModelBuilderCloneTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects2;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 
@@ -243,7 +243,7 @@ public class ModelBuilderCloneTest {
         public long l;
         private TestClass previous;
         private TestClass next;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private List<TestClass> children;
     }
 
@@ -251,7 +251,7 @@ public class ModelBuilderCloneTest {
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public TestClass o;
         public TestClass o2;
     }

src/test/java/jef/model/ModelBuilderSimpleTest.java

@@ -3,15 +3,10 @@ package jef.model;
 import jef.DbSet;
 import jef.model.annotations.Clazz;
 import jef.model.annotations.Id;
-import jef.model.annotations.Index;
-import jef.model.annotations.Key;
-import jef.model.annotations.Unique;
 import jef.serializable.SerializableObject;
 import lombok.Getter;
 import org.junit.jupiter.api.Test;
 
-import java.util.List;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -26,7 +21,7 @@ class ModelBuilderSimpleTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 

src/test/java/jef/model/annotations/processors/ForeignKeyProcessorExposeTest.java

@@ -54,9 +54,9 @@ class ForeignKeyProcessorExposeTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects2;
     }
 

src/test/java/jef/model/annotations/processors/ForeignKeyProcessorInvalidEntityTest.java

@@ -24,7 +24,7 @@ class ForeignKeyProcessorInvalidEntityTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 

src/test/java/jef/model/annotations/processors/ForeignKeyProcessorInvalidFieldOrGetterTest.java

@@ -23,7 +23,7 @@ class ForeignKeyProcessorInvalidFieldOrGetterTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 

src/test/java/jef/model/annotations/processors/ForeignKeyProcessorMissingPrimaryKeyTest.java

@@ -23,7 +23,7 @@ class ForeignKeyProcessorMissingPrimaryKeyTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 

src/test/java/jef/model/annotations/processors/ForeignKeyProcessorNotPrimaryKeyTest.java

@@ -22,7 +22,7 @@ class ForeignKeyProcessorNotPrimaryKeyTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 

src/test/java/jef/model/annotations/processors/ForeignKeyProcessorSelfReferenceTest.java

@@ -45,7 +45,7 @@ class ForeignKeyProcessorSelfReferenceTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 

src/test/java/jef/model/annotations/processors/ForeignKeyProcessorSimpleTest.java

@@ -52,9 +52,9 @@ class ForeignKeyProcessorSimpleTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects2;
     }
 

src/test/java/jef/model/annotations/processors/IndexProcessorClassTest.java

@@ -34,7 +34,7 @@ class IndexProcessorClassTest {
     }
 
     public static class CtxIndexOnClass extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 

src/test/java/jef/model/annotations/processors/IndexProcessorFieldTest.java

@@ -29,7 +29,7 @@ class IndexProcessorFieldTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 

src/test/java/jef/model/annotations/processors/KeyProcessorClassTest.java

@@ -34,7 +34,7 @@ class KeyProcessorClassTest {
     }
 
     public static class CtxKeyOnClass extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 

src/test/java/jef/model/annotations/processors/KeyProcessorFieldTest.java

@@ -29,7 +29,7 @@ class KeyProcessorFieldTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 

src/test/java/jef/model/annotations/processors/NotNullProcessorTest.java

@@ -30,7 +30,7 @@ class NotNullProcessorTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 

src/test/java/jef/model/annotations/processors/UniqueProcessorClassTest.java

@@ -34,7 +34,7 @@ class UniqueProcessorClassTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 

src/test/java/jef/model/annotations/processors/UniqueProcessorFieldTest.java

@@ -29,7 +29,7 @@ class UniqueProcessorFieldTest {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         private DbSet<TestClass> objects1;
     }
 

src/test/java/jef/model/migration/creator/MigrationCreatorAddEntityTest.java

@@ -25,7 +25,7 @@ public class MigrationCreatorAddEntityTest extends MigrationCreatorTestBase {
     public void test() {
         var from = ModelBuilder.from(Ctx.class);
         var to = ModelBuilder.from(Ctx.class);
-        var ent = to.getOrCreateEntity("AddedEntity");
+        var ent = to.entity("AddedEntity");
         ent.getOrCreateField("id", int.class.getName());
         ent.getOrCreateField("addedField", int.class.getName());
         ent.setPrimaryKey(new PrimaryKeyConstraint(ent, List.of(ent.getField("id"))));
@@ -87,7 +87,7 @@ public class MigrationCreatorAddEntityTest extends MigrationCreatorTestBase {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
     }
 
@@ -95,7 +95,7 @@ public class MigrationCreatorAddEntityTest extends MigrationCreatorTestBase {
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public List<TestClass> nested;
     }
 

src/test/java/jef/model/migration/creator/MigrationCreatorAddFieldTest.java

@@ -71,7 +71,7 @@ public class MigrationCreatorAddFieldTest  extends MigrationCreatorTestBase{
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
     }
 
@@ -79,7 +79,7 @@ public class MigrationCreatorAddFieldTest  extends MigrationCreatorTestBase{
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public List<TestClass> nested;
     }
 

src/test/java/jef/model/migration/creator/MigrationCreatorAddForeignKeyTest.java

@@ -58,7 +58,7 @@ public class MigrationCreatorAddForeignKeyTest  extends MigrationCreatorTestBase
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
     }
 
@@ -66,7 +66,7 @@ public class MigrationCreatorAddForeignKeyTest  extends MigrationCreatorTestBase
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public List<TestClass> nested;
     }
 

src/test/java/jef/model/migration/creator/MigrationCreatorAddIndexTest.java

@@ -54,7 +54,7 @@ public class MigrationCreatorAddIndexTest  extends MigrationCreatorTestBase{
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
     }
 
@@ -62,7 +62,7 @@ public class MigrationCreatorAddIndexTest  extends MigrationCreatorTestBase{
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public List<TestClass> nested;
     }
 

src/test/java/jef/model/migration/creator/MigrationCreatorAddKeyTest.java

@@ -54,7 +54,7 @@ public class MigrationCreatorAddKeyTest  extends MigrationCreatorTestBase{
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
     }
 
@@ -62,7 +62,7 @@ public class MigrationCreatorAddKeyTest  extends MigrationCreatorTestBase{
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public List<TestClass> nested;
     }
 

src/test/java/jef/model/migration/creator/MigrationCreatorAddUniqueTest.java

@@ -54,7 +54,7 @@ public class MigrationCreatorAddUniqueTest  extends MigrationCreatorTestBase{
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
     }
 
@@ -62,7 +62,7 @@ public class MigrationCreatorAddUniqueTest  extends MigrationCreatorTestBase{
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public List<TestClass> nested;
     }
 

src/test/java/jef/model/migration/creator/MigrationCreatorEmptyTest.java

@@ -34,7 +34,7 @@ public class MigrationCreatorEmptyTest  extends MigrationCreatorTestBase{
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
     }
 
@@ -42,7 +42,7 @@ public class MigrationCreatorEmptyTest  extends MigrationCreatorTestBase{
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public List<TestClass> nested;
     }
 

src/test/java/jef/model/migration/creator/MigrationCreatorInitialMigrationTest.java

@@ -106,7 +106,7 @@ public class MigrationCreatorInitialMigrationTest extends MigrationCreatorTestBa
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
     }
 
@@ -114,7 +114,7 @@ public class MigrationCreatorInitialMigrationTest extends MigrationCreatorTestBa
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public List<TestClass> nested;
     }
 

src/test/java/jef/model/migration/creator/MigrationCreatorRenameEntityTest.java

@@ -105,7 +105,7 @@ public class MigrationCreatorRenameEntityTest extends MigrationCreatorTestBase {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
     }
 
@@ -113,7 +113,7 @@ public class MigrationCreatorRenameEntityTest extends MigrationCreatorTestBase {
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public List<TestClass> nested;
     }
 

src/test/java/jef/model/migration/creator/MigrationCreatorRenameFieldConstraintsTest.java

@@ -179,7 +179,7 @@ public class MigrationCreatorRenameFieldConstraintsTest extends MigrationCreator
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
 
 
@@ -189,7 +189,7 @@ public class MigrationCreatorRenameFieldConstraintsTest extends MigrationCreator
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public List<TestClass> nested;
     }
 

src/test/java/jef/model/migration/creator/MigrationCreatorRenameFieldTest.java

@@ -54,7 +54,7 @@ public class MigrationCreatorRenameFieldTest extends MigrationCreatorTestBase {
     }
 
     public static class Ctx extends DbContext {
-        @Clazz(clazz = TestClass2.class)
+        @Clazz(TestClass2.class)
         private DbSet<TestClass2> objects1;
     }
 
@@ -62,7 +62,7 @@ public class MigrationCreatorRenameFieldTest extends MigrationCreatorTestBase {
     public static class TestClass2 extends SerializableObject {
         @Id
         public int i = 1;
-        @Clazz(clazz = TestClass.class)
+        @Clazz(TestClass.class)
         public List<TestClass> nested;
     }
 

src/test/java/jef/model/migration/creator/ModelChangeDetectorAddEntityTest.java

@@ -23,22 +23,22 @@ class ModelChangeDetectorAddEntityTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
         return mb;
     }
 
     private ModelBuilder createTo() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass2");
+        mb.entity("TestClass2");
-        mb.getOrCreateEntity("TestClass2").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass2").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass3");
+        mb.entity("TestClass3");
-        mb.getOrCreateEntity("TestClass3").getOrCreateField("i3", int.class.getName())
+        mb.entity("TestClass3").getOrCreateField("i3", int.class.getName())
                 .setNotNull(true);
         return mb;
     }

src/test/java/jef/model/migration/creator/ModelChangeDetectorAddFieldTest.java

@@ -23,20 +23,20 @@ class ModelChangeDetectorAddFieldTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
         return mb;
     }
 
     private ModelBuilder createTo() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i3", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i3", int.class.getName())
                 .setNotNull(true);
         return mb;
     }

src/test/java/jef/model/migration/creator/ModelChangeDetectorAddForeignKeyTest.java

@@ -25,17 +25,17 @@ class ModelChangeDetectorAddForeignKeyTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
         return mb;
     }
 
     private ModelBuilder createTo() {
         var mb = new ModelBuilder();
-        var ent = mb.getOrCreateEntity("TestClass");
+        var ent = mb.entity("TestClass");
         ent.getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
         ent.getOrCreateField("i2", int.class.getName())

src/test/java/jef/model/migration/creator/ModelChangeDetectorAddIndexTest.java

@@ -22,22 +22,22 @@ class ModelChangeDetectorAddIndexTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
         return mb;
     }
 
     private ModelBuilder createTo() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()).setIndex(true);
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName()).setIndex(true);
         return mb;
     }
 }

src/test/java/jef/model/migration/creator/ModelChangeDetectorAddKeyTest.java

@@ -22,22 +22,22 @@ class ModelChangeDetectorAddKeyTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
         return mb;
     }
 
     private ModelBuilder createTo() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()).setKey(true);
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName()).setKey(true);
         return mb;
     }
 }

src/test/java/jef/model/migration/creator/ModelChangeDetectorAddPrimaryKeyTest.java

@@ -26,23 +26,23 @@ class ModelChangeDetectorAddPrimaryKeyTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
         return mb;
     }
 
     private ModelBuilder createTo() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").setPrimaryKey(new PrimaryKeyConstraint(mb.getOrCreateEntity("TestClass"),
+        mb.entity("TestClass").setPrimaryKey(new PrimaryKeyConstraint(mb.entity("TestClass"),
-                                                                                 List.of(mb.getOrCreateEntity("TestClass").getField("i"))));
+                                                                      List.of(mb.entity("TestClass").getField("i"))));
         return mb;
     }
 }

src/test/java/jef/model/migration/creator/ModelChangeDetectorAddUniqueTest.java

@@ -22,22 +22,22 @@ class ModelChangeDetectorAddUniqueTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
         return mb;
     }
 
     private ModelBuilder createTo() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()).setUnique(true);
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName()).setUnique(true);
         return mb;
     }
 }

src/test/java/jef/model/migration/creator/ModelChangeDetectorDropEntityTest.java

@@ -23,22 +23,22 @@ class ModelChangeDetectorDropEntityTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass2");
+        mb.entity("TestClass2");
-        mb.getOrCreateEntity("TestClass2").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass2").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass3");
+        mb.entity("TestClass3");
-        mb.getOrCreateEntity("TestClass3").getOrCreateField("i3", int.class.getName())
+        mb.entity("TestClass3").getOrCreateField("i3", int.class.getName())
                 .setNotNull(true);
         return mb;
     }
 
     private ModelBuilder createTo() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
         return mb;
     }

src/test/java/jef/model/migration/creator/ModelChangeDetectorDropFieldTest.java

@@ -23,20 +23,20 @@ class ModelChangeDetectorDropFieldTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i3", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i3", int.class.getName())
                 .setNotNull(true);
         return mb;
     }
 
     private ModelBuilder createTo() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
         return mb;
     }

src/test/java/jef/model/migration/creator/ModelChangeDetectorDropForeignKeyTest.java

@@ -25,7 +25,7 @@ class ModelChangeDetectorDropForeignKeyTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        var ent = mb.getOrCreateEntity("TestClass");
+        var ent = mb.entity("TestClass");
         ent.getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
         ent.getOrCreateField("i2", int.class.getName())
@@ -38,10 +38,10 @@ class ModelChangeDetectorDropForeignKeyTest {
 
     private ModelBuilder createTo() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
         return mb;
     }

src/test/java/jef/model/migration/creator/ModelChangeDetectorDropIndexTest.java

@@ -22,21 +22,21 @@ class ModelChangeDetectorDropIndexTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()).setIndex(true);
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName()).setIndex(true);
         return mb;
     }
 
     private ModelBuilder createTo() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
         return mb;
     }

src/test/java/jef/model/migration/creator/ModelChangeDetectorDropKeyTest.java

@@ -22,21 +22,21 @@ class ModelChangeDetectorDropKeyTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()).setKey(true);
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName()).setKey(true);
         return mb;
     }
 
     private ModelBuilder createTo() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
         return mb;
     }

src/test/java/jef/model/migration/creator/ModelChangeDetectorDropPrimaryKeyTest.java

@@ -26,22 +26,22 @@ class ModelChangeDetectorDropPrimaryKeyTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").setPrimaryKey(new PrimaryKeyConstraint(mb.getOrCreateEntity("TestClass"),
+        mb.entity("TestClass").setPrimaryKey(new PrimaryKeyConstraint(mb.entity("TestClass"),
-                                                                                 List.of(mb.getOrCreateEntity("TestClass").getField("i"))));
+                                                                      List.of(mb.entity("TestClass").getField("i"))));
         return mb;
     }
 
     private ModelBuilder createTo() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
         return mb;
     }

src/test/java/jef/model/migration/creator/ModelChangeDetectorDropUniqueTest.java

@@ -22,21 +22,21 @@ class ModelChangeDetectorDropUniqueTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()).setUnique(true);
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName()).setUnique(true);
         return mb;
     }
 
     private ModelBuilder createTo() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
         return mb;
     }

src/test/java/jef/model/migration/creator/ModelChangeDetectorNoChangeTest.java

@@ -17,13 +17,13 @@ class ModelChangeDetectorNoChangeTest {
 
     private ModelBuilder createFrom() {
         var mb = new ModelBuilder();
-        mb.getOrCreateEntity("TestClass");
+        mb.entity("TestClass");
-        mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass2");
+        mb.entity("TestClass2");
-        mb.getOrCreateEntity("TestClass2").getOrCreateField("i", int.class.getName())
+        mb.entity("TestClass2").getOrCreateField("i", int.class.getName())
                 .setNotNull(true);
-        mb.getOrCreateEntity("TestClass2").getOrCreateField("i2", int.class.getName())
+        mb.entity("TestClass2").getOrCreateField("i2", int.class.getName())
                 .setNotNull(true);
         return mb;
     }