Skip to content

Commit

Permalink
Fix whitespace for querydsl-jpa
Browse files Browse the repository at this point in the history
  • Loading branch information
@timowest
timowest committed May 13, 2015
1 parent b23eb5b commit 658584d
Show file tree
Hide file tree
Showing 110 changed files with 288 additions and 291 deletions.
4 changes: 2 additions & 2 deletions querydsl-jpa/src/main/java/com/querydsl/jpa/AbstractSQLQuery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ protected boolean isEntityExpression(Expression<?> expr) {

protected Expression<?> extractEntityExpression(Expression<?> expr) {
if (expr instanceof Operation) {
return ((Operation<?>)expr).getArg(0);
return ((Operation<?>) expr).getArg(0);
} else if (expr instanceof TemplateExpression) {
return (Expression<?>) ((TemplateExpression<?>)expr).getArg(0);
return (Expression<?>) ((TemplateExpression<?>) expr).getArg(0);
} else {
return expr;
}
Expand Down
6 changes: 3 additions & 3 deletions querydsl-jpa/src/main/java/com/querydsl/jpa/Conversions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ private static boolean needsNumberConversion(Expression<?> expr) {
private static boolean isEntityPathAndNeedsWrapping(Expression<?> expr) {
if ((expr instanceof Path && expr.getType().isAnnotationPresent(Entity.class)) ||
(expr instanceof EntityPath && !RelationalPath.class.isInstance(expr))) {
Path<?> path = (Path<?>)expr;
Path<?> path = (Path<?>) expr;
if (path.getMetadata().getParent() == null) {
return true;
}
Expand Down Expand Up @@ -83,7 +83,7 @@ public static <RT> Expression<RT> convertForNativeQuery(Expression<RT> expr) {
} else if (Enum.class.isAssignableFrom(expr.getType())) {
return new EnumConversion<RT>(expr);
} else if (expr instanceof FactoryExpression) {
FactoryExpression<RT> factoryExpr = (FactoryExpression<RT>)expr;
FactoryExpression<RT> factoryExpr = (FactoryExpression<RT>) expr;
boolean numberConversions = false;
boolean hasEntityPath = false;
for (Expression<?> e : factoryExpr.getArgs()) {
Expand All @@ -106,6 +106,6 @@ public static <RT> Expression<RT> convertForNativeQuery(Expression<RT> expr) {
return expr;
}

private Conversions() {}
private Conversions() { }

}
2 changes: 1 addition & 1 deletion querydsl-jpa/src/main/java/com/querydsl/jpa/DefaultQueryHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public boolean wrapEntityProjections() {
return false;
}

private DefaultQueryHandler() {}
private DefaultQueryHandler() { }


}
2 changes: 1 addition & 1 deletion querydsl-jpa/src/main/java/com/querydsl/jpa/HQLTemplates.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public HQLTemplates(char escape) {
// add Hibernate Spatial mappings, if on classpath
try {
Class cl = Class.forName("com.querydsl.spatial.hibernate.HibernateSpatialSupport");
add((Map)cl.getMethod("getSpatialOps").invoke(null));
add((Map) cl.getMethod("getSpatialOps").invoke(null));
} catch (Exception e) {
// do nothing
}
Expand Down
12 changes: 6 additions & 6 deletions querydsl-jpa/src/main/java/com/querydsl/jpa/HibernateHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ class HibernateHandler implements QueryHandler {
@Override
public void addEntity(Query query, String alias, Class<?> type) {
if (query instanceof HibernateQuery) {
org.hibernate.Query hibernateQuery = ((HibernateQuery)query).getHibernateQuery();
org.hibernate.Query hibernateQuery = ((HibernateQuery) query).getHibernateQuery();
if (hibernateQuery instanceof SQLQuery) {
((SQLQuery)hibernateQuery).addEntity(alias, type);
((SQLQuery) hibernateQuery).addEntity(alias, type);
}
}
}

@Override
public void addScalar(Query query, String alias, Class<?> type) {
if (query instanceof HibernateQuery) {
org.hibernate.Query hibernateQuery = ((HibernateQuery)query).getHibernateQuery();
org.hibernate.Query hibernateQuery = ((HibernateQuery) query).getHibernateQuery();
if (hibernateQuery instanceof SQLQuery) {
((SQLQuery)hibernateQuery).addScalar(alias);
((SQLQuery) hibernateQuery).addScalar(alias);
}
}
}
Expand All @@ -63,7 +63,7 @@ public boolean createNativeQueryTyped() {
@Override
public <T> CloseableIterator<T> iterate(Query query, FactoryExpression<?> projection) {
if (query instanceof HibernateQuery) {
HibernateQuery hQuery = (HibernateQuery)query;
HibernateQuery hQuery = (HibernateQuery) query;
ScrollableResults results = hQuery.getHibernateQuery().scroll(ScrollMode.FORWARD_ONLY);
CloseableIterator<T> iterator = new ScrollableResultsIterator<T>(results);
if (projection != null) {
Expand All @@ -84,7 +84,7 @@ public <T> CloseableIterator<T> iterate(Query query, FactoryExpression<?> projec
public boolean transform(Query query, FactoryExpression<?> projection) {
if (query instanceof HibernateQuery) {
ResultTransformer transformer = new FactoryExpressionTransformer(projection);
((HibernateQuery)query).getHibernateQuery().setResultTransformer(transformer);
((HibernateQuery) query).getHibernateQuery().setResultTransformer(transformer);
return true;
} else {
return false;
Expand Down
2 changes: 1 addition & 1 deletion querydsl-jpa/src/main/java/com/querydsl/jpa/JPACollectionAnyVisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ protected Predicate exists(Context c, Predicate condition) {
EntityPath<Object> replacement = (EntityPath<Object>) c.replacements.get(i);
if (c.paths.get(i).getType().isAnnotationPresent(Entity.class)) {
query.from(Expressions.as(
Expressions.listPath((Class)c.paths.get(i).getType(), SimplePath.class,
Expressions.listPath((Class) c.paths.get(i).getType(), SimplePath.class,
child.getMetadata()), replacement));
} else {
// join via parent
Expand Down
2 changes: 1 addition & 1 deletion querydsl-jpa/src/main/java/com/querydsl/jpa/JPAExpressions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,6 @@ public static StringExpression type(EntityPath<?> path) {
return Expressions.stringOperation(JPQLOps.TYPE, path);
}

private JPAExpressions() {}
private JPAExpressions() { }

}
2 changes: 1 addition & 1 deletion querydsl-jpa/src/main/java/com/querydsl/jpa/JPAListAccessVisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public Expression<?> visit(Path<?> expr, @Nullable Void context) {
ExpressionUtils.createRootVariable(parent, replacements.size()));
metadata.addJoin(JoinType.LEFTJOIN, ExpressionUtils.as(parent, replacement));
metadata.addJoinCondition(ExpressionUtils.eq(
(Expression)Expressions.operation(Integer.class, JPQLOps.INDEX, replacement),
(Expression) Expressions.operation(Integer.class, JPQLOps.INDEX, replacement),
ExpressionUtils.toExpression(pathMetadata.getElement())));
replacements.put(expr, replacement);
}
Expand Down
2 changes: 1 addition & 1 deletion querydsl-jpa/src/main/java/com/querydsl/jpa/JPAMapAccessVisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public Expression<?> visit(Operation<?> expr, @Nullable Void context) {
ParameterizedExpression map = (ParameterizedExpression<?>) expr.getArg(0);
Expression key = expr.getArg(1);
Path replacement = ExpressionUtils.path(map.getParameter(1),
ExpressionUtils.createRootVariable((Path<?>)map, Math.abs(expr.hashCode())));
ExpressionUtils.createRootVariable((Path<?>) map, Math.abs(expr.hashCode())));
metadata.addJoin(JoinType.LEFTJOIN, ExpressionUtils.as(map, replacement));
metadata.addJoinCondition(ExpressionUtils.eq(
Expressions.operation(map.getParameter(0), JPQLOps.KEY, replacement),
Expand Down
2 changes: 1 addition & 1 deletion querydsl-jpa/src/main/java/com/querydsl/jpa/JPAQueryBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public Q from(EntityPath<?>... args) {

@Override
public <P> Q from(CollectionExpression<?,P> target, Path<P> alias) {
return queryMixin.from(Expressions.as((Path)target, alias));
return queryMixin.from(Expressions.as((Path) target, alias));
}

@Override
Expand Down
12 changes: 6 additions & 6 deletions querydsl-jpa/src/main/java/com/querydsl/jpa/JPAQueryMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ protected <D> Expression<D> createAlias(Expression<?> expr, Path<D> alias) {

private boolean isEntityPath(Path<?> path) {
if (path instanceof CollectionPathBase) {
return isEntityPath((Path<?>) ((CollectionPathBase)path).any());
return isEntityPath((Path<?>) ((CollectionPathBase) path).any());
} else {
return path instanceof EntityPath
|| path.getType().isAnnotationPresent(Entity.class);
Expand All @@ -115,7 +115,7 @@ private boolean isEntityPath(Path<?> path) {

private <T> Class<T> getElementTypeOrType(Path<T> path) {
if (path instanceof CollectionExpression) {
return ((CollectionExpression)path).getParameter(0);
return ((CollectionExpression) path).getParameter(0);
} else {
return (Class<T>) path.getType();
}
Expand Down Expand Up @@ -189,9 +189,9 @@ public <RT> Expression<RT> convert(Expression<RT> expr, Role role) {
expr = (Expression<RT>) expr.accept(listAccessVisitor, null);
if (role == Role.ORDER_BY) {
if (expr instanceof Path) {
expr = convertPathForOrder((Path)expr);
expr = convertPathForOrder((Path) expr);
} else {
expr = (Expression<RT>)expr.accept(replaceVisitor, null);
expr = (Expression<RT>) expr.accept(replaceVisitor, null);
}
}
return Conversions.convert(super.convert(expr, role));
Expand Down Expand Up @@ -219,13 +219,13 @@ protected Predicate convert(Predicate predicate, Role role) {
private void addCondition(Context context, int i, Path<?> path, boolean where) {
paths.add(path);
EntityPath<?> alias = context.replacements.get(i);
leftJoin((Expression)path.getMetadata().getParent(), context.replacements.get(i));
leftJoin((Expression) path.getMetadata().getParent(), context.replacements.get(i));
Expression index = ExpressionUtils.operation(Integer.class, JPQLOps.INDEX, alias);
Object element = path.getMetadata().getElement();
if (!(element instanceof Expression)) {
element = ConstantImpl.create(element);
}
Predicate condition = ExpressionUtils.eq(index, (Expression)element);
Predicate condition = ExpressionUtils.eq(index, (Expression) element);
if (where) {
super.where(condition);
} else {
Expand Down
22 changes: 11 additions & 11 deletions querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLSerializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,17 +128,17 @@ private void handleJoinTarget(JoinExpression je) {
}
handle(je.getTarget());
} else if (je.getTarget() instanceof Operation) {
Operation<?> op = (Operation)je.getTarget();
Operation<?> op = (Operation) je.getTarget();
if (op.getOperator() == Ops.ALIAS) {
boolean treat = false;
if (Collection.class.isAssignableFrom(op.getArg(0).getType())) {
if (op.getArg(0) instanceof CollectionExpression) {
Class<?> par = ((CollectionExpression)op.getArg(0)).getParameter(0);
Class<?> par = ((CollectionExpression) op.getArg(0)).getParameter(0);
treat = !par.equals(op.getArg(1).getType());
}
} else if (Map.class.isAssignableFrom(op.getArg(0).getType())) {
if (op.getArg(0) instanceof MapExpression) {
Class<?> par = ((MapExpression)op.getArg(0)).getParameter(1);
Class<?> par = ((MapExpression) op.getArg(0)).getParameter(1);
treat = !par.equals(op.getArg(1).getType());
}
} else {
Expand Down Expand Up @@ -298,7 +298,7 @@ public void visitConstant(Object constant) {
if (constant instanceof Collection) {
append("(");
boolean first = true;
for (Object o : (Collection)constant) {
for (Object o : (Collection) constant) {
if (!first) {
append(", ");
}
Expand All @@ -316,7 +316,7 @@ public void visitConstant(Object constant) {
}
append("?");
if (!getConstantToLabel().containsKey(constant)) {
final String constLabel = String.valueOf(getConstantToLabel().size()+1);
final String constLabel = String.valueOf(getConstantToLabel().size() + 1);
getConstantToLabel().put(constant, constLabel);
append(constLabel);
} else {
Expand Down Expand Up @@ -369,7 +369,7 @@ private String escapeLiteral(String str) {
public Void visit(ParamExpression<?> param, Void context) {
append("?");
if (!getConstantToLabel().containsKey(param)) {
final String paramLabel = String.valueOf(getConstantToLabel().size()+1);
final String paramLabel = String.valueOf(getConstantToLabel().size() + 1);
getConstantToLabel().put(param, paramLabel);
append(paramLabel);
} else {
Expand Down Expand Up @@ -411,13 +411,13 @@ protected void visitOperation(Class<?> type, Operator operator, List<? extends E
wrapElements = templates.wrapElements(operator);

if (operator == Ops.EQ && args.get(1) instanceof Operation &&
((Operation)args.get(1)).getOperator() == Ops.QuantOps.ANY) {
args = ImmutableList.<Expression<?>>of(args.get(0), ((Operation)args.get(1)).getArg(0));
((Operation) args.get(1)).getOperator() == Ops.QuantOps.ANY) {
args = ImmutableList.<Expression<?>>of(args.get(0), ((Operation) args.get(1)).getArg(0));
visitOperation(type, Ops.IN, args);

} else if (operator == Ops.NE && args.get(1) instanceof Operation &&
((Operation)args.get(1)).getOperator() == Ops.QuantOps.ANY) {
args = ImmutableList.<Expression<?>>of(args.get(0), ((Operation)args.get(1)).getArg(0));
((Operation) args.get(1)).getOperator() == Ops.QuantOps.ANY) {
args = ImmutableList.<Expression<?>>of(args.get(0), ((Operation) args.get(1)).getArg(0));
visitOperation(type, Ops.NOT_IN, args);

} else if (operator == Ops.IN || operator == Ops.NOT_IN) {
Expand Down Expand Up @@ -514,7 +514,7 @@ private void visitAnyInPath(Class<?> type, Operator operator, List<? extends Exp
Constant<? extends Enum<?>> expectedConstant = (Constant<? extends Enum<?>>) args.get(0);

final Enum<?> constant = expectedConstant.getConstant();
final Enumerated enumerated = ((Path<?>)args.get(1)).getAnnotatedElement().getAnnotation(Enumerated.class);
final Enumerated enumerated = ((Path<?>) args.get(1)).getAnnotatedElement().getAnnotation(Enumerated.class);
if (enumerated == null || enumerated.value() == EnumType.ORDINAL) {
args = ImmutableList.of(ConstantImpl.create(constant.ordinal()), args.get(1));
} else {
Expand Down
18 changes: 9 additions & 9 deletions querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLTemplates.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ protected JPQLTemplates(char escape, QueryHandler queryHandler) {
add(Ops.ARRAY_SIZE, "size({0})");

// string
add(Ops.LIKE, "{0} like {1} escape '"+escape+"'");
add(Ops.LIKE, "{0} like {1} escape '" + escape + "'");
add(Ops.CONCAT, "concat({0},{1})", -1);
add(Ops.MATCHES, "{0} like {1} escape '"+escape+"'"); // TODO : support real regexes
add(Ops.MATCHES_IC, "{0} like {1} escape '"+escape+"'"); // TODO : support real regexes
add(Ops.MATCHES, "{0} like {1} escape '" + escape + "'"); // TODO : support real regexes
add(Ops.MATCHES_IC, "{0} like {1} escape '" + escape + "'"); // TODO : support real regexes
add(Ops.LOWER, "lower({0})");
add(Ops.SUBSTR_1ARG, "substring({0},{1s}+1)", Precedence.ARITH_LOW);
add(Ops.SUBSTR_2ARGS, "substring({0},{1s}+1,{2s}-{1s})", Precedence.ARITH_LOW);
Expand All @@ -107,12 +107,12 @@ protected JPQLTemplates(char escape, QueryHandler queryHandler) {
add(Ops.CHAR_AT, "cast(substring({0},{1s}+1,1) as char)", Precedence.ARITH_LOW);
add(Ops.STRING_IS_EMPTY, "length({0}) = 0");

add(Ops.STRING_CONTAINS, "{0} like {%1%} escape '"+escape+"'");
add(Ops.STRING_CONTAINS_IC, "{0l} like {%%1%%} escape '"+escape+"'");
add(Ops.ENDS_WITH, "{0} like {%1} escape '"+escape+"'");
add(Ops.ENDS_WITH_IC, "{0l} like {%%1} escape '"+escape+"'");
add(Ops.STARTS_WITH, "{0} like {1%} escape '"+escape+"'");
add(Ops.STARTS_WITH_IC, "{0l} like {1%%} escape '"+escape+"'");
add(Ops.STRING_CONTAINS, "{0} like {%1%} escape '" + escape + "'");
add(Ops.STRING_CONTAINS_IC, "{0l} like {%%1%%} escape '" + escape + "'");
add(Ops.ENDS_WITH, "{0} like {%1} escape '" + escape + "'");
add(Ops.ENDS_WITH_IC, "{0l} like {%%1} escape '" + escape + "'");
add(Ops.STARTS_WITH, "{0} like {1%} escape '" + escape + "'");
add(Ops.STARTS_WITH_IC, "{0l} like {1%%} escape '" + escape + "'");
add(Ops.INDEX_OF, "locate({1},{0})-1", Precedence.ARITH_LOW);
add(Ops.INDEX_OF_2ARGS, "locate({1},{0},{2s}+1)-1", Precedence.ARITH_LOW);

Expand Down
Loading

0 comments on commit 658584d

Please sign in to comment.