diff --git a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/Symbols.java b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/Symbols.java index 39fd4a5465..5beb7d21c0 100644 --- a/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/Symbols.java +++ b/querydsl-codegen-utils/src/main/java/com/querydsl/codegen/utils/Symbols.java @@ -50,6 +50,8 @@ public final class Symbols { public static final String THIS = "this"; + public static final String THIS_ESCAPE = "this-escape"; + public static final String UNCHECKED = "unchecked"; private Symbols() {} diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/BeanSerializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/BeanSerializer.java index 76f1fac6f8..e764c0d07b 100644 --- a/querydsl-codegen/src/main/java/com/querydsl/codegen/BeanSerializer.java +++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/BeanSerializer.java @@ -13,6 +13,8 @@ */ package com.querydsl.codegen; +import static com.querydsl.codegen.utils.Symbols.THIS_ESCAPE; + import com.querydsl.codegen.utils.CodeWriter; import com.querydsl.codegen.utils.model.ClassType; import com.querydsl.codegen.utils.model.Parameter; @@ -179,6 +181,7 @@ public void serialize(EntityType model, SerializerConfig serializerConfig, CodeW writer.annotation(annotation); } + writer.suppressWarnings(THIS_ESCAPE); writer.line("@", generatedAnnotationClass.getSimpleName(), "(\"", getClass().getName(), "\")"); if (!interfaces.isEmpty()) { diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEmbeddableSerializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEmbeddableSerializer.java index e907447635..339d93ff3f 100644 --- a/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEmbeddableSerializer.java +++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEmbeddableSerializer.java @@ -13,6 +13,7 @@ */ package com.querydsl.codegen; +import static com.querydsl.codegen.utils.Symbols.THIS_ESCAPE; import static com.querydsl.codegen.utils.Symbols.UNCHECKED; import com.querydsl.codegen.utils.CodeWriter; @@ -110,6 +111,7 @@ protected void introClassHeader(CodeWriter writer, EntityType model) throws IOEx writer.annotation(annotation); } + writer.suppressWarnings(THIS_ESCAPE); writer.line("@", generatedAnnotationClass.getSimpleName(), "(\"", getClass().getName(), "\")"); if (category == TypeCategory.BOOLEAN || category == TypeCategory.STRING) { diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEntitySerializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEntitySerializer.java index bde085863d..1fd8054018 100644 --- a/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEntitySerializer.java +++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultEntitySerializer.java @@ -374,6 +374,7 @@ protected void introClassHeader(CodeWriter writer, EntityType model) throws IOEx writer.annotation(annotation); } + writer.suppressWarnings(THIS_ESCAPE); writer.line("@", generatedAnnotationClass.getSimpleName(), "(\"", getClass().getName(), "\")"); if (category == TypeCategory.BOOLEAN || category == TypeCategory.STRING) { @@ -407,7 +408,7 @@ protected void introFactoryMethods(CodeWriter writer, final EntityType model) th for (Constructor c : model.getConstructors()) { // begin if (!localName.equals(genericName)) { - writer.suppressWarnings(UNCHECKED, "this-escape"); + writer.suppressWarnings(UNCHECKED); } Type returnType = new ClassType(ConstructorExpression.class, model); final boolean asExpr = sizes.add(c.getParameters().size()); diff --git a/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultProjectionSerializer.java b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultProjectionSerializer.java index 6d1c21cbd4..8c3c643b0f 100644 --- a/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultProjectionSerializer.java +++ b/querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultProjectionSerializer.java @@ -13,6 +13,8 @@ */ package com.querydsl.codegen; +import static com.querydsl.codegen.utils.Symbols.THIS_ESCAPE; + import com.querydsl.codegen.utils.CodeWriter; import com.querydsl.codegen.utils.model.*; import com.querydsl.core.types.ConstructorExpression; @@ -88,6 +90,7 @@ protected void intro(EntityType model, CodeWriter writer) throws IOException { // javadoc writer.javadoc(queryType + " is a Querydsl Projection type for " + simpleName); + writer.suppressWarnings(THIS_ESCAPE); writer.line("@", generatedAnnotationClass.getSimpleName(), "(\"", getClass().getName(), "\")"); // class header diff --git a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataSerializer.java b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataSerializer.java index d4d34003fe..139c5596d8 100644 --- a/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataSerializer.java +++ b/querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/MetaDataSerializer.java @@ -16,6 +16,7 @@ import static com.querydsl.codegen.utils.Symbols.COMMA; import static com.querydsl.codegen.utils.Symbols.NEW; import static com.querydsl.codegen.utils.Symbols.SUPER; +import static com.querydsl.codegen.utils.Symbols.THIS_ESCAPE; import com.querydsl.codegen.*; import com.querydsl.codegen.utils.CodeWriter; @@ -177,6 +178,7 @@ protected void constructorContent(CodeWriter writer, EntityType model) throws IO protected void introClassHeader(CodeWriter writer, EntityType model) throws IOException { Type queryType = typeMappings.getPathType(model, model, true); + writer.suppressWarnings(THIS_ESCAPE); writer.line("@", generatedAnnotationClass.getSimpleName(), "(\"", getClass().getName(), "\")"); TypeCategory category = model.getOriginalCategory();