CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-04 21:01:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
f43nd1r 2021-04-05 04:51:14 +02:00
parent 30609045de
commit b56fe61488
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
querydsl-apt/src/main/java/com/querydsl/apt/AbstractQuerydslProcessor.java
View File

@ -30,7 +30,6 @@ import javax.lang.model.type.NoType;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.ElementFilter;
import javax.tools.Diagnostic.Kind;
import javax.tools.JavaFileObject;
import com.querydsl.codegen.utils.JavaWriter;
import com.querydsl.codegen.utils.model.Parameter;

8
querydsl-codegen/src/main/java/com/querydsl/codegen/GenericExporter.java
View File

@ -292,10 +292,10 @@ public class GenericExporter {
embeddableSerializer = serializer;
projectionSerializer = serializer;
} else {
supertypeSerializer = codegenModule.get(DefaultSupertypeSerializer.class);
entitySerializer = codegenModule.get(DefaultEntitySerializer.class);
embeddableSerializer = codegenModule.get(DefaultEmbeddableSerializer.class);
projectionSerializer = codegenModule.get(DefaultProjectionSerializer.class);
supertypeSerializer = codegenModule.get(SupertypeSerializer.class);
entitySerializer = codegenModule.get(EntitySerializer.class);
embeddableSerializer = codegenModule.get(EmbeddableSerializer.class);
projectionSerializer = codegenModule.get(ProjectionSerializer.class);
}
// serialize super types

4
querydsl-codegen/src/test/java/com/querydsl/codegen/EmbeddableSerializerTest.java
View File

@ -186,7 +186,7 @@ public class EmbeddableSerializerTest {
serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
final String generatedSource = writer.toString();
assertThat(generatedSource, containsString("import javax.annotation.Generated;"));
assertThat(generatedSource, containsString("@Generated(\"com.querydsl.codegen.EmbeddableSerializer\")\npublic class"));
assertThat(generatedSource, containsString("@Generated(\"com.querydsl.codegen.DefaultEmbeddableSerializer\")\npublic class"));
CompileUtils.assertCompiles("QEntity", generatedSource);
}
@ -198,7 +198,7 @@ public class EmbeddableSerializerTest {
new DefaultEmbeddableSerializer(typeMappings, Collections.<String>emptySet(), com.querydsl.core.annotations.Generated.class).serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
String generatedSourceCode = writer.toString();
assertThat(generatedSourceCode, containsString("@Generated(\"com.querydsl.codegen.EmbeddableSerializer\")\npublic class"));
assertThat(generatedSourceCode, containsString("@Generated(\"com.querydsl.codegen.DefaultEmbeddableSerializer\")\npublic class"));
CompileUtils.assertCompiles("QEntity", generatedSourceCode);
}
}

4
querydsl-codegen/src/test/java/com/querydsl/codegen/EntitySerializerTest.java
View File

@ -198,7 +198,7 @@ public class EntitySerializerTest {
serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
String generatedSourceCode = writer.toString();
assertTrue(generatedSourceCode.contains("import javax.annotation.Generated;"));
assertTrue(generatedSourceCode.contains("@Generated(\"com.querydsl.codegen.EntitySerializer\")\npublic class"));
assertTrue(generatedSourceCode.contains("@Generated(\"com.querydsl.codegen.DefaultEntitySerializer\")\npublic class"));
CompileUtils.assertCompiles("QEntitySerializerTest_Entity", generatedSourceCode);
}
@ -210,7 +210,7 @@ public class EntitySerializerTest {
new DefaultEntitySerializer(typeMappings, Collections.<String>emptySet(), com.querydsl.core.annotations.Generated.class).serialize(entityType, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
String generatedSourceCode = writer.toString();
assertTrue(generatedSourceCode.contains("import " + com.querydsl.core.annotations.Generated.class.getName() + ";"));
assertTrue(generatedSourceCode.contains("@" + com.querydsl.core.annotations.Generated.class.getSimpleName() + "(\"com.querydsl.codegen.EntitySerializer\")\npublic class"));
assertTrue(generatedSourceCode.contains("@" + com.querydsl.core.annotations.Generated.class.getSimpleName() + "(\"com.querydsl.codegen.DefaultEntitySerializer\")\npublic class"));
CompileUtils.assertCompiles("QEntitySerializerTest_Entity", generatedSourceCode);
}

4
querydsl-codegen/src/test/java/com/querydsl/codegen/ProjectionSerializerTest.java
View File

@ -63,7 +63,7 @@ public class ProjectionSerializerTest {
serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
String generatedSource = writer.toString();
assertThat(generatedSource, containsString("import javax.annotation.Generated"));
assertThat(generatedSource, containsString("@Generated(\"com.querydsl.codegen.ProjectionSerializer\")\npublic class"));
assertThat(generatedSource, containsString("@Generated(\"com.querydsl.codegen.DefaultProjectionSerializer\")\npublic class"));
}
@Test
@ -76,7 +76,7 @@ public class ProjectionSerializerTest {
serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer));
String generatedSource = writer.toString();
assertThat(generatedSource, containsString("import com.querydsl.core.annotations.Generated"));
assertThat(generatedSource, containsString("@Generated(\"com.querydsl.codegen.ProjectionSerializer\")\npublic class"));
assertThat(generatedSource, containsString("@Generated(\"com.querydsl.codegen.DefaultProjectionSerializer\")\npublic class"));
}
}

6
querydsl-jpa-codegen/src/main/java/com/querydsl/jpa/codegen/AbstractDomainExporter.java
View File

@ -109,9 +109,9 @@ public abstract class AbstractDomainExporter {
module.loadExtensions();
this.queryTypeFactory = module.get(QueryTypeFactory.class);
this.typeMappings = module.get(TypeMappings.class);
this.embeddableSerializer = module.get(DefaultEmbeddableSerializer.class);
this.entitySerializer = module.get(DefaultEntitySerializer.class);
this.supertypeSerializer = module.get(DefaultSupertypeSerializer.class);
this.embeddableSerializer = module.get(EmbeddableSerializer.class);
this.entitySerializer = module.get(EntitySerializer.class);
this.supertypeSerializer = module.get(SupertypeSerializer.class);
this.variableNameFunction = module.get(Function.class, CodegenModule.VARIABLE_NAME_FUNCTION_CLASS);
}