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

Deprecate JavaSyntaxUtils in favor of SourceVersion

Browse Source
This commit is contained in:
Ruben Dijkstra 2016-01-26 22:48:08 +01:00
parent 5ad7a504f7
commit fae85e7b6e
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
querydsl-codegen/src/main/java/com/querydsl/codegen/DefaultVariableNameFunction.java
View File

@ -1,8 +1,9 @@
package com.querydsl.codegen;
import javax.lang.model.SourceVersion;
import com.google.common.base.Function;
import com.mysema.codegen.StringUtils;
import com.querydsl.core.util.JavaSyntaxUtils;
/**
* Default variable name generation strategy which un-capitalizes the first letter of the class name.
@ -15,7 +16,7 @@ public final class DefaultVariableNameFunction implements Function<EntityType, S
@Override
public String apply(EntityType entity) {
String uncapSimpleName = StringUtils.uncapitalize(entity.getInnerType().getSimpleName());
if (JavaSyntaxUtils.isReserved(uncapSimpleName)) {
if (SourceVersion.isKeyword(uncapSimpleName)) {
uncapSimpleName = uncapSimpleName + "$";
}
return uncapSimpleName;

5
querydsl-codegen/src/main/java/com/querydsl/codegen/Property.java
View File

@ -16,9 +16,10 @@ package com.querydsl.codegen;
import java.lang.annotation.Annotation;
import java.util.*;
import javax.lang.model.SourceVersion;
import com.google.common.base.Objects;
import com.mysema.codegen.model.Type;
import com.querydsl.core.util.JavaSyntaxUtils;
/**
* {@code Property} represents a property in a query domain type.
@ -65,7 +66,7 @@ public final class Property implements Comparable<Property> {
}
private static String escapeName(String name) {
if (JavaSyntaxUtils.isReserved(name)) {
if (SourceVersion.isKeyword(name)) {
name = name + "$";
} else if (!Character.isJavaIdentifierStart(name.charAt(0))) {
name = "_" + name;

2
querydsl-core/src/main/java/com/querydsl/core/util/JavaSyntaxUtils.java
View File

@ -19,8 +19,10 @@ import javax.lang.model.SourceVersion;
* JavaSyntaxUtils defines reserved keywords for Java
*
* @author tiwe
* @deprecated use the built-in {@link SourceVersion#isKeyword(CharSequence) keyword list} instead.
*
*/
@Deprecated
public final class JavaSyntaxUtils {
private JavaSyntaxUtils() { }

5
querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/AbstractNamingStrategy.java
View File

@ -13,8 +13,9 @@
*/
package com.querydsl.sql.codegen;
import javax.lang.model.SourceVersion;
import com.querydsl.codegen.EntityType;
import com.querydsl.core.util.JavaSyntaxUtils;
import com.querydsl.sql.SchemaAndTable;
import com.querydsl.sql.codegen.support.ForeignKeyData;
@ -42,7 +43,7 @@ public abstract class AbstractNamingStrategy implements NamingStrategy {
return packageName;
}
String suffix = schemaName.toLowerCase();
if (JavaSyntaxUtils.isReserved(suffix)) {
if (SourceVersion.isKeyword(suffix)) {
suffix += "_";
}
return packageName + "." + suffix;

4
querydsl-sql-codegen/src/main/java/com/querydsl/sql/codegen/Naming.java
View File

@ -13,7 +13,7 @@
*/
package com.querydsl.sql.codegen;
import static com.querydsl.core.util.JavaSyntaxUtils.isReserved;
import static javax.lang.model.SourceVersion.isKeyword;
/**
* {@code Naming} provides name normalization functionality
@ -24,7 +24,7 @@ import static com.querydsl.core.util.JavaSyntaxUtils.isReserved;
public final class Naming {
public static String normalize(String s, String reservedSuffix) {
if (isReserved(s)) {
if (isKeyword(s)) {
return s + reservedSuffix;
} else {
StringBuilder sb = new StringBuilder(s.length() + 1);