diff --git a/src/main/java/jef/model/EntityInitializer.java b/src/main/java/jef/model/EntityInitializer.java index 8179336..7e92edc 100644 --- a/src/main/java/jef/model/EntityInitializer.java +++ b/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) clazzAnnotation.clazz(); + var dbSetClazz = (Class) 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() diff --git a/src/main/java/jef/model/ForeignKeyInitializer.java b/src/main/java/jef/model/ForeignKeyInitializer.java index 8c4b204..c43a29b 100644 --- a/src/main/java/jef/model/ForeignKeyInitializer.java +++ b/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) clazzAnnotation.clazz()); + var otherEntity = mb.getEntity((Class) clazzAnnotation.value()); if (otherEntity == null) { - EntityInitializer.initEntity(mb, (Class) clazzAnnotation.clazz(), f.getName()); - otherEntity = mb.getEntity((Class) clazzAnnotation.clazz()); + EntityInitializer.initEntity(mb, (Class) clazzAnnotation.value(), f.getName()); + otherEntity = mb.getEntity((Class) 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); // } diff --git a/src/main/java/jef/model/annotations/Clazz.java b/src/main/java/jef/model/annotations/Clazz.java index 7d3f261..943dbbc 100644 --- a/src/main/java/jef/model/annotations/Clazz.java +++ b/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(); } diff --git a/src/test/java/jef/model/DbContextSimpleTest.java b/src/test/java/jef/model/DbContextSimpleTest.java index 7c14fa7..2716b46 100644 --- a/src/test/java/jef/model/DbContextSimpleTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/EntityInitializerMultiple1To1RelationTest.java b/src/test/java/jef/model/EntityInitializerMultiple1To1RelationTest.java index f0d9e9f..319bc63 100644 --- a/src/test/java/jef/model/EntityInitializerMultiple1To1RelationTest.java +++ b/src/test/java/jef/model/EntityInitializerMultiple1To1RelationTest.java @@ -49,18 +49,18 @@ class EntityInitializerMultiple1To1RelationTest { assertEquals(mb.getEntity(TestClass.class), mb.getEntity(TestClass2.class).getForeignKeys().get(0).getReferencedEntity()); assertEquals(mb.getEntity(TestClass.class), mb.getEntity(TestClass2.class).getForeignKeys().get(1).getReferencedEntity()); assertEquals(mb.getEntity(TestClass2.class).getFields().stream().filter(e -> e.getName().equals("nested2I")).toList(), - mb.getEntity(TestClass2.class).getForeignKeys().get(0).getFields()); + mb.getEntity(TestClass2.class).getForeignKeys().get(0).getFields()); assertEquals(mb.getEntity(TestClass2.class).getFields().stream().filter(e -> e.getName().equals("nested1I")).toList(), - mb.getEntity(TestClass2.class).getForeignKeys().get(1).getFields()); + mb.getEntity(TestClass2.class).getForeignKeys().get(1).getFields()); assertEquals(mb.getEntity(TestClass.class).getPrimaryKey().getFields(), mb.getEntity(TestClass2.class).getForeignKeys().get(0).getReferencedFields()); assertEquals(mb.getEntity(TestClass.class).getPrimaryKey().getFields(), mb.getEntity(TestClass2.class).getForeignKeys().get(1).getReferencedFields()); // /keys ------------------------ } public static class Ctx extends DbContext { - @Clazz(clazz = TestClass.class) + @Clazz(TestClass.class) private DbSet objects1; - @Clazz(clazz = TestClass2.class) + @Clazz(TestClass2.class) private DbSet objects2; } diff --git a/src/test/java/jef/model/EntityInitializerMultiple1ToNRelationTest.java b/src/test/java/jef/model/EntityInitializerMultiple1ToNRelationTest.java index 26c2492..7cb286a 100644 --- a/src/test/java/jef/model/EntityInitializerMultiple1ToNRelationTest.java +++ b/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 objects1; - @Clazz(clazz = TestClass2.class) + @Clazz(TestClass2.class) private DbSet 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 mapping; - @Clazz(clazz = TestClass.class) + @Clazz(TestClass.class) private Set mapping2; } diff --git a/src/test/java/jef/model/ForeignKeyInitializerNToNRelationTest.java b/src/test/java/jef/model/ForeignKeyInitializerNToNRelationTest.java index 2f61a0b..0b21d57 100644 --- a/src/test/java/jef/model/ForeignKeyInitializerNToNRelationTest.java +++ b/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 objects1; - @Clazz(clazz = TestClass2.class) + @Clazz(TestClass2.class) private DbSet objects2; - @Clazz(clazz = Mapping.class) + @Clazz(Mapping.class) private DbSet 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; } @@ -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; } @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; } } \ No newline at end of file diff --git a/src/test/java/jef/model/ForeignKeyInitializerNestedList2LayerTest.java b/src/test/java/jef/model/ForeignKeyInitializerNestedList2LayerTest.java index 41ca7d8..9c89bae 100644 --- a/src/test/java/jef/model/ForeignKeyInitializerNestedList2LayerTest.java +++ b/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 objects1; } @Getter public static class TestClass3 extends SerializableObject { public int id = 1; - @Clazz(clazz = TestClass2.class) + @Clazz(TestClass2.class) public List 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 nested; } diff --git a/src/test/java/jef/model/ForeignKeyInitializerNestedListMissingPrimaryKeyTest.java b/src/test/java/jef/model/ForeignKeyInitializerNestedListMissingPrimaryKeyTest.java index 99f29da..0229fb8 100644 --- a/src/test/java/jef/model/ForeignKeyInitializerNestedListMissingPrimaryKeyTest.java +++ b/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 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 nested; } diff --git a/src/test/java/jef/model/ForeignKeyInitializerNestedListSimpleTest.java b/src/test/java/jef/model/ForeignKeyInitializerNestedListSimpleTest.java index dd6ea7a..05a594e 100644 --- a/src/test/java/jef/model/ForeignKeyInitializerNestedListSimpleTest.java +++ b/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 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 nested; } diff --git a/src/test/java/jef/model/ForeignKeyInitializerNestedObject2LayerTest.java b/src/test/java/jef/model/ForeignKeyInitializerNestedObject2LayerTest.java index 77fcead..f52db24 100644 --- a/src/test/java/jef/model/ForeignKeyInitializerNestedObject2LayerTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/ForeignKeyInitializerNestedObjectMissingPrimaryKeyTest.java b/src/test/java/jef/model/ForeignKeyInitializerNestedObjectMissingPrimaryKeyTest.java index 4db0310..29eeeae 100644 --- a/src/test/java/jef/model/ForeignKeyInitializerNestedObjectMissingPrimaryKeyTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/ForeignKeyInitializerNestedObjectSimpleTest.java b/src/test/java/jef/model/ForeignKeyInitializerNestedObjectSimpleTest.java index a7f8b51..e3a6af2 100644 --- a/src/test/java/jef/model/ForeignKeyInitializerNestedObjectSimpleTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/ForeignKeyInitializerRecursive1To1RelationTest.java b/src/test/java/jef/model/ForeignKeyInitializerRecursive1To1RelationTest.java index af9a57c..6382209 100644 --- a/src/test/java/jef/model/ForeignKeyInitializerRecursive1To1RelationTest.java +++ b/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 objects2; } diff --git a/src/test/java/jef/model/ForeignKeyInitializerRecursive1ToNRelationTest.java b/src/test/java/jef/model/ForeignKeyInitializerRecursive1ToNRelationTest.java index 51b500a..5c20036 100644 --- a/src/test/java/jef/model/ForeignKeyInitializerRecursive1ToNRelationTest.java +++ b/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 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 recursive; } } \ No newline at end of file diff --git a/src/test/java/jef/model/ForeignKeyInitializerRecursiveWithParent1ToNRelationTest.java b/src/test/java/jef/model/ForeignKeyInitializerRecursiveWithParent1ToNRelationTest.java index c2a8f23..09a1174 100644 --- a/src/test/java/jef/model/ForeignKeyInitializerRecursiveWithParent1ToNRelationTest.java +++ b/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 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 recursive; private TestClass parent; } diff --git a/src/test/java/jef/model/ModelBuilderCloneTest.java b/src/test/java/jef/model/ModelBuilderCloneTest.java index ccb8dbf..510dc7e 100644 --- a/src/test/java/jef/model/ModelBuilderCloneTest.java +++ b/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 objects2; - @Clazz(clazz = TestClass.class) + @Clazz(TestClass.class) private DbSet 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 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; } diff --git a/src/test/java/jef/model/ModelBuilderSimpleTest.java b/src/test/java/jef/model/ModelBuilderSimpleTest.java index 53e872f..3150e53 100644 --- a/src/test/java/jef/model/ModelBuilderSimpleTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorExposeTest.java b/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorExposeTest.java index 1f88d74..0a9e305 100644 --- a/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorExposeTest.java +++ b/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 objects1; - @Clazz(clazz = TestClass2.class) + @Clazz(TestClass2.class) private DbSet objects2; } diff --git a/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorInvalidEntityTest.java b/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorInvalidEntityTest.java index 740b108..c807322 100644 --- a/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorInvalidEntityTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorInvalidFieldOrGetterTest.java b/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorInvalidFieldOrGetterTest.java index 0692faf..2ac547b 100644 --- a/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorInvalidFieldOrGetterTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorMissingPrimaryKeyTest.java b/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorMissingPrimaryKeyTest.java index 3faf3db..4e96b94 100644 --- a/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorMissingPrimaryKeyTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorNotPrimaryKeyTest.java b/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorNotPrimaryKeyTest.java index a0f27e8..a014daf 100644 --- a/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorNotPrimaryKeyTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorSelfReferenceTest.java b/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorSelfReferenceTest.java index c830ee9..81fc0a2 100644 --- a/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorSelfReferenceTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorSimpleTest.java b/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorSimpleTest.java index 6fa444f..0b4fed8 100644 --- a/src/test/java/jef/model/annotations/processors/ForeignKeyProcessorSimpleTest.java +++ b/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 objects1; - @Clazz(clazz = TestClass2.class) + @Clazz(TestClass2.class) private DbSet objects2; } diff --git a/src/test/java/jef/model/annotations/processors/IndexProcessorClassTest.java b/src/test/java/jef/model/annotations/processors/IndexProcessorClassTest.java index 5ddf888..a72ca99 100644 --- a/src/test/java/jef/model/annotations/processors/IndexProcessorClassTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/annotations/processors/IndexProcessorFieldTest.java b/src/test/java/jef/model/annotations/processors/IndexProcessorFieldTest.java index c299549..0ee362d 100644 --- a/src/test/java/jef/model/annotations/processors/IndexProcessorFieldTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/annotations/processors/KeyProcessorClassTest.java b/src/test/java/jef/model/annotations/processors/KeyProcessorClassTest.java index 141622a..cde788f 100644 --- a/src/test/java/jef/model/annotations/processors/KeyProcessorClassTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/annotations/processors/KeyProcessorFieldTest.java b/src/test/java/jef/model/annotations/processors/KeyProcessorFieldTest.java index 54e17be..ca1f487 100644 --- a/src/test/java/jef/model/annotations/processors/KeyProcessorFieldTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/annotations/processors/NotNullProcessorTest.java b/src/test/java/jef/model/annotations/processors/NotNullProcessorTest.java index e50eb78..6d319b8 100644 --- a/src/test/java/jef/model/annotations/processors/NotNullProcessorTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/annotations/processors/UniqueProcessorClassTest.java b/src/test/java/jef/model/annotations/processors/UniqueProcessorClassTest.java index 3651a8e..375ad4b 100644 --- a/src/test/java/jef/model/annotations/processors/UniqueProcessorClassTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/annotations/processors/UniqueProcessorFieldTest.java b/src/test/java/jef/model/annotations/processors/UniqueProcessorFieldTest.java index 023cae2..c9656a7 100644 --- a/src/test/java/jef/model/annotations/processors/UniqueProcessorFieldTest.java +++ b/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 objects1; } diff --git a/src/test/java/jef/model/migration/creator/MigrationCreatorAddEntityTest.java b/src/test/java/jef/model/migration/creator/MigrationCreatorAddEntityTest.java index 293a57b..4c05485 100644 --- a/src/test/java/jef/model/migration/creator/MigrationCreatorAddEntityTest.java +++ b/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 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 nested; } diff --git a/src/test/java/jef/model/migration/creator/MigrationCreatorAddFieldTest.java b/src/test/java/jef/model/migration/creator/MigrationCreatorAddFieldTest.java index 9ccb8a0..cc355ec 100644 --- a/src/test/java/jef/model/migration/creator/MigrationCreatorAddFieldTest.java +++ b/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 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 nested; } diff --git a/src/test/java/jef/model/migration/creator/MigrationCreatorAddForeignKeyTest.java b/src/test/java/jef/model/migration/creator/MigrationCreatorAddForeignKeyTest.java index b178230..ff47bf1 100644 --- a/src/test/java/jef/model/migration/creator/MigrationCreatorAddForeignKeyTest.java +++ b/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 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 nested; } diff --git a/src/test/java/jef/model/migration/creator/MigrationCreatorAddIndexTest.java b/src/test/java/jef/model/migration/creator/MigrationCreatorAddIndexTest.java index f4d208e..91955e0 100644 --- a/src/test/java/jef/model/migration/creator/MigrationCreatorAddIndexTest.java +++ b/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 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 nested; } diff --git a/src/test/java/jef/model/migration/creator/MigrationCreatorAddKeyTest.java b/src/test/java/jef/model/migration/creator/MigrationCreatorAddKeyTest.java index 7ec57a9..c163ff0 100644 --- a/src/test/java/jef/model/migration/creator/MigrationCreatorAddKeyTest.java +++ b/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 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 nested; } diff --git a/src/test/java/jef/model/migration/creator/MigrationCreatorAddUniqueTest.java b/src/test/java/jef/model/migration/creator/MigrationCreatorAddUniqueTest.java index c8a8541..8e7f0b3 100644 --- a/src/test/java/jef/model/migration/creator/MigrationCreatorAddUniqueTest.java +++ b/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 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 nested; } diff --git a/src/test/java/jef/model/migration/creator/MigrationCreatorEmptyTest.java b/src/test/java/jef/model/migration/creator/MigrationCreatorEmptyTest.java index a8e401b..6f4e9f4 100644 --- a/src/test/java/jef/model/migration/creator/MigrationCreatorEmptyTest.java +++ b/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 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 nested; } diff --git a/src/test/java/jef/model/migration/creator/MigrationCreatorInitialMigrationTest.java b/src/test/java/jef/model/migration/creator/MigrationCreatorInitialMigrationTest.java index 3155f37..2baa042 100644 --- a/src/test/java/jef/model/migration/creator/MigrationCreatorInitialMigrationTest.java +++ b/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 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 nested; } diff --git a/src/test/java/jef/model/migration/creator/MigrationCreatorRenameEntityTest.java b/src/test/java/jef/model/migration/creator/MigrationCreatorRenameEntityTest.java index 74f23a5..b9af916 100644 --- a/src/test/java/jef/model/migration/creator/MigrationCreatorRenameEntityTest.java +++ b/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 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 nested; } diff --git a/src/test/java/jef/model/migration/creator/MigrationCreatorRenameFieldConstraintsTest.java b/src/test/java/jef/model/migration/creator/MigrationCreatorRenameFieldConstraintsTest.java index dcc7347..a30c9f4 100644 --- a/src/test/java/jef/model/migration/creator/MigrationCreatorRenameFieldConstraintsTest.java +++ b/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 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 nested; } diff --git a/src/test/java/jef/model/migration/creator/MigrationCreatorRenameFieldTest.java b/src/test/java/jef/model/migration/creator/MigrationCreatorRenameFieldTest.java index 9aa1843..48f8bea 100644 --- a/src/test/java/jef/model/migration/creator/MigrationCreatorRenameFieldTest.java +++ b/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 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 nested; } diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddEntityTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddEntityTest.java index 560a51a..439e064 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddEntityTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + mb.entity("TestClass").getOrCreateField("i", int.class.getName()) .setNotNull(true); return mb; } private ModelBuilder createTo() { var mb = new ModelBuilder(); - mb.getOrCreateEntity("TestClass"); - mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + mb.entity("TestClass").getOrCreateField("i", int.class.getName()) .setNotNull(true); - mb.getOrCreateEntity("TestClass2"); - mb.getOrCreateEntity("TestClass2").getOrCreateField("i2", int.class.getName()) + mb.entity("TestClass2"); + mb.entity("TestClass2").getOrCreateField("i2", int.class.getName()) .setNotNull(true); - mb.getOrCreateEntity("TestClass3"); - mb.getOrCreateEntity("TestClass3").getOrCreateField("i3", int.class.getName()) + mb.entity("TestClass3"); + mb.entity("TestClass3").getOrCreateField("i3", int.class.getName()) .setNotNull(true); return mb; } diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddFieldTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddFieldTest.java index 2e9b61c..4674068 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddFieldTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + mb.entity("TestClass").getOrCreateField("i", int.class.getName()) .setNotNull(true); return mb; } private ModelBuilder createTo() { var mb = new ModelBuilder(); - mb.getOrCreateEntity("TestClass"); - mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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; } diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddForeignKeyTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddForeignKeyTest.java index f4e0709..cbb8a3f 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddForeignKeyTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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()) diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddIndexTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddIndexTest.java index 02ce9ba..1ebbd7e 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddIndexTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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; } } \ No newline at end of file diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddKeyTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddKeyTest.java index 4f58548..ac1ded6 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddKeyTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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; } } \ No newline at end of file diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddPrimaryKeyTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddPrimaryKeyTest.java index f882a50..47f3b11 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddPrimaryKeyTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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"), - List.of(mb.getOrCreateEntity("TestClass").getField("i")))); + mb.entity("TestClass").setPrimaryKey(new PrimaryKeyConstraint(mb.entity("TestClass"), + List.of(mb.entity("TestClass").getField("i")))); return mb; } } \ No newline at end of file diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddUniqueTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddUniqueTest.java index ceb5983..30eadec 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorAddUniqueTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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; } } \ No newline at end of file diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropEntityTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropEntityTest.java index c740b3b..733fde0 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropEntityTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + mb.entity("TestClass").getOrCreateField("i", int.class.getName()) .setNotNull(true); - mb.getOrCreateEntity("TestClass2"); - mb.getOrCreateEntity("TestClass2").getOrCreateField("i2", int.class.getName()) + mb.entity("TestClass2"); + mb.entity("TestClass2").getOrCreateField("i2", int.class.getName()) .setNotNull(true); - mb.getOrCreateEntity("TestClass3"); - mb.getOrCreateEntity("TestClass3").getOrCreateField("i3", int.class.getName()) + mb.entity("TestClass3"); + mb.entity("TestClass3").getOrCreateField("i3", int.class.getName()) .setNotNull(true); return mb; } private ModelBuilder createTo() { var mb = new ModelBuilder(); - mb.getOrCreateEntity("TestClass"); - mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + mb.entity("TestClass").getOrCreateField("i", int.class.getName()) .setNotNull(true); return mb; } diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropFieldTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropFieldTest.java index 15814f4..3e84738 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropFieldTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + mb.entity("TestClass").getOrCreateField("i", int.class.getName()) .setNotNull(true); return mb; } diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropForeignKeyTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropForeignKeyTest.java index b5a6530..60a4e98 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropForeignKeyTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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; } diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropIndexTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropIndexTest.java index b8a8d94..2556a8b 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropIndexTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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; } diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropKeyTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropKeyTest.java index 95fa24f..692bca0 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropKeyTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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; } diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropPrimaryKeyTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropPrimaryKeyTest.java index a1fffaa..e588257 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropPrimaryKeyTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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"), - List.of(mb.getOrCreateEntity("TestClass").getField("i")))); + mb.entity("TestClass").setPrimaryKey(new PrimaryKeyConstraint(mb.entity("TestClass"), + List.of(mb.entity("TestClass").getField("i")))); return mb; } private ModelBuilder createTo() { var mb = new ModelBuilder(); - mb.getOrCreateEntity("TestClass"); - mb.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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; } diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropUniqueTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropUniqueTest.java index 2ab489c..bf0c7a3 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorDropUniqueTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + 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; } diff --git a/src/test/java/jef/model/migration/creator/ModelChangeDetectorNoChangeTest.java b/src/test/java/jef/model/migration/creator/ModelChangeDetectorNoChangeTest.java index c6738aa..3bedbf8 100644 --- a/src/test/java/jef/model/migration/creator/ModelChangeDetectorNoChangeTest.java +++ b/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.getOrCreateEntity("TestClass").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass"); + mb.entity("TestClass").getOrCreateField("i", int.class.getName()) .setNotNull(true); - mb.getOrCreateEntity("TestClass2"); - mb.getOrCreateEntity("TestClass2").getOrCreateField("i", int.class.getName()) + mb.entity("TestClass2"); + 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; }