wea_ondara/JEF
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wea_ondara
2022-08-14 16:44:32 +02:00
parent c6264b8e3e
commit d532d92c0f
58 changed files with 182 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/jef/model/EntityInitializer.java
View File

@@ -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()

10
src/main/java/jef/model/ForeignKeyInitializer.java
View File

@@ -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());
otherEntity = mb.getEntity((Class<? extends SerializableObject>) clazzAnnotation.clazz());
EntityInitializer.initEntity(mb, (Class<? extends SerializableObject>) clazzAnnotation.value(), f.getName());
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);
// }

2
src/main/java/jef/model/annotations/Clazz.java
View File

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

2
src/test/java/jef/model/DbContextSimpleTest.java
View File

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

8
src/test/java/jef/model/EntityInitializerMultiple1To1RelationTest.java
View File

@@ -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<TestClass> objects1;
@Clazz(clazz = TestClass2.class)
@Clazz(TestClass2.class)
private DbSet<TestClass2> objects2;
}

8
src/test/java/jef/model/EntityInitializerMultiple1ToNRelationTest.java
View File

@@ -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;
}

14
src/test/java/jef/model/ForeignKeyInitializerNToNRelationTest.java
View File

@@ -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;
}
}

6
src/test/java/jef/model/ForeignKeyInitializerNestedList2LayerTest.java
View File

@@ -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;
}

4
src/test/java/jef/model/ForeignKeyInitializerNestedListMissingPrimaryKeyTest.java
View File

@@ -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;
}

4
src/test/java/jef/model/ForeignKeyInitializerNestedListSimpleTest.java
View File

@@ -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;
}

2
src/test/java/jef/model/ForeignKeyInitializerNestedObject2LayerTest.java
View File

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

2
src/test/java/jef/model/ForeignKeyInitializerNestedObjectMissingPrimaryKeyTest.java
View File

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

2
src/test/java/jef/model/ForeignKeyInitializerNestedObjectSimpleTest.java
View File

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

2
src/test/java/jef/model/ForeignKeyInitializerRecursive1To1RelationTest.java
View File

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

4
src/test/java/jef/model/ForeignKeyInitializerRecursive1ToNRelationTest.java
View File

@@ -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;
}
}

4
src/test/java/jef/model/ForeignKeyInitializerRecursiveWithParent1ToNRelationTest.java
View File

@@ -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;
}

8
src/test/java/jef/model/ModelBuilderCloneTest.java
View File

@@ -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;
}

7
src/test/java/jef/model/ModelBuilderSimpleTest.java
View File

@@ -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;
}

4
src/test/java/jef/model/annotations/processors/ForeignKeyProcessorExposeTest.java
View File

@@ -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;
}

2
src/test/java/jef/model/annotations/processors/ForeignKeyProcessorInvalidEntityTest.java
View File

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

2
src/test/java/jef/model/annotations/processors/ForeignKeyProcessorInvalidFieldOrGetterTest.java
View File

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

2
src/test/java/jef/model/annotations/processors/ForeignKeyProcessorMissingPrimaryKeyTest.java
View File

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

2
src/test/java/jef/model/annotations/processors/ForeignKeyProcessorNotPrimaryKeyTest.java
View File

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

2
src/test/java/jef/model/annotations/processors/ForeignKeyProcessorSelfReferenceTest.java
View File

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

4
src/test/java/jef/model/annotations/processors/ForeignKeyProcessorSimpleTest.java
View File

@@ -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;
}

2
src/test/java/jef/model/annotations/processors/IndexProcessorClassTest.java
View File

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

2
src/test/java/jef/model/annotations/processors/IndexProcessorFieldTest.java
View File

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

2
src/test/java/jef/model/annotations/processors/KeyProcessorClassTest.java
View File

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

2
src/test/java/jef/model/annotations/processors/KeyProcessorFieldTest.java
View File

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

2
src/test/java/jef/model/annotations/processors/NotNullProcessorTest.java
View File

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

2
src/test/java/jef/model/annotations/processors/UniqueProcessorClassTest.java
View File

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

2
src/test/java/jef/model/annotations/processors/UniqueProcessorFieldTest.java
View File

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

6
src/test/java/jef/model/migration/creator/MigrationCreatorAddEntityTest.java
View File

@@ -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;
}

4
src/test/java/jef/model/migration/creator/MigrationCreatorAddFieldTest.java
View File

@@ -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;
}

4
src/test/java/jef/model/migration/creator/MigrationCreatorAddForeignKeyTest.java
View File

@@ -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;
}

4
src/test/java/jef/model/migration/creator/MigrationCreatorAddIndexTest.java
View File

@@ -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;
}

4
src/test/java/jef/model/migration/creator/MigrationCreatorAddKeyTest.java
View File

@@ -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;
}

4
src/test/java/jef/model/migration/creator/MigrationCreatorAddUniqueTest.java
View File

@@ -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;
}

4
src/test/java/jef/model/migration/creator/MigrationCreatorEmptyTest.java
View File

@@ -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;
}

4
src/test/java/jef/model/migration/creator/MigrationCreatorInitialMigrationTest.java
View File

@@ -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;
}

4
src/test/java/jef/model/migration/creator/MigrationCreatorRenameEntityTest.java
View File

@@ -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;
}

4
src/test/java/jef/model/migration/creator/MigrationCreatorRenameFieldConstraintsTest.java
View File

@@ -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;
}

4
src/test/java/jef/model/migration/creator/MigrationCreatorRenameFieldTest.java
View File

@@ -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;
}

16
src/test/java/jef/model/migration/creator/ModelChangeDetectorAddEntityTest.java
View File

@@ -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;
}

12
src/test/java/jef/model/migration/creator/ModelChangeDetectorAddFieldTest.java
View File

@@ -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;
}

8
src/test/java/jef/model/migration/creator/ModelChangeDetectorAddForeignKeyTest.java
View File

@@ -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())

14
src/test/java/jef/model/migration/creator/ModelChangeDetectorAddIndexTest.java
View File

@@ -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;
}
}

14
src/test/java/jef/model/migration/creator/ModelChangeDetectorAddKeyTest.java
View File

@@ -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;
}
}

16
src/test/java/jef/model/migration/creator/ModelChangeDetectorAddPrimaryKeyTest.java
View File

@@ -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;
}
}

14
src/test/java/jef/model/migration/creator/ModelChangeDetectorAddUniqueTest.java
View File

@@ -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;
}
}

16
src/test/java/jef/model/migration/creator/ModelChangeDetectorDropEntityTest.java
View File

@@ -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;
}

12
src/test/java/jef/model/migration/creator/ModelChangeDetectorDropFieldTest.java
View File

@@ -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;
}

8
src/test/java/jef/model/migration/creator/ModelChangeDetectorDropForeignKeyTest.java
View File

@@ -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;
}

14
src/test/java/jef/model/migration/creator/ModelChangeDetectorDropIndexTest.java
View File

@@ -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;
}

14
src/test/java/jef/model/migration/creator/ModelChangeDetectorDropKeyTest.java
View File

@@ -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;
}

16
src/test/java/jef/model/migration/creator/ModelChangeDetectorDropPrimaryKeyTest.java
View File

@@ -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;
}

14
src/test/java/jef/model/migration/creator/ModelChangeDetectorDropUniqueTest.java
View File

@@ -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;
}

10
src/test/java/jef/model/migration/creator/ModelChangeDetectorNoChangeTest.java
View File

@@ -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;
}