From 8afc6495bdb114b7a36429cdeb564124ce5f2560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Mon, 8 Mar 2010 14:36:18 +0000 Subject: [PATCH] fixes based on Sonar reports --- .../com/mysema/query/apt/APTTypeFactory.java | 4 ++-- .../java/com/mysema/query/types/Visitor.java | 2 +- .../java/com/mysema/query/hql/HQLSerializer.java | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/APTTypeFactory.java b/querydsl-apt/src/main/java/com/mysema/query/apt/APTTypeFactory.java index c9749b103..ae54fb377 100644 --- a/querydsl-apt/src/main/java/com/mysema/query/apt/APTTypeFactory.java +++ b/querydsl-apt/src/main/java/com/mysema/query/apt/APTTypeFactory.java @@ -265,8 +265,8 @@ public final class APTTypeFactory { return key; } - private Set getSupertypes(TypeMirror type, Type value) { - type = normalize(type); + private Set getSupertypes(TypeMirror t, Type value) { + TypeMirror type = normalize(t); Set superTypes = Collections.emptySet(); if (type.getKind() == TypeKind.DECLARED){ DeclaredType declaredType = (DeclaredType)type; diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Visitor.java b/querydsl-core/src/main/java/com/mysema/query/types/Visitor.java index 79574c94d..1fc24974e 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/Visitor.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/Visitor.java @@ -54,6 +54,6 @@ public interface Visitor { /** * @param query */ - void visit(SubQuery query); + void visit(SubQuery query); } diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLSerializer.java b/querydsl-hql/src/main/java/com/mysema/query/hql/HQLSerializer.java index eb4472e2d..94842cf07 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLSerializer.java +++ b/querydsl-hql/src/main/java/com/mysema/query/hql/HQLSerializer.java @@ -257,7 +257,7 @@ public final class HQLSerializer extends SerializerBase { } @Override - public void visit(SubQuery query) { + public void visit(SubQuery query) { append("("); serialize(query.getMetadata(), false, null); append(")"); @@ -285,26 +285,26 @@ public final class HQLSerializer extends SerializerBase { } @SuppressWarnings("unchecked") - protected void visitOperation(Class type, Operator operator, List> args) { + protected void visitOperation(Class type, Operator operator, List> a) { boolean old = wrapElements; wrapElements = HQLTemplates.wrapCollectionsForOp.contains(operator); // if (operator.equals(Ops.INSTANCE_OF)) { - args = new ArrayList>(args); + List> args = new ArrayList>(a); args.set(1, EStringConst.create(((Class) ((Constant) args.get(1)).getConstant()).getName())); super.visitOperation(type, operator, args); } else if (operator.equals(Ops.NUMCAST)) { - visitCast(args.get(0), (Class) ((Constant) args.get(1)).getConstant()); + visitCast(a.get(0), (Class) ((Constant) a.get(1)).getConstant()); - } else if (operator.equals(Ops.EXISTS) && args.get(0) instanceof SubQuery){ - SubQuery subQuery = (SubQuery) args.get(0); + } else if (operator.equals(Ops.EXISTS) && a.get(0) instanceof SubQuery){ + SubQuery subQuery = (SubQuery) a.get(0); append("exists ("); serialize(subQuery.getMetadata(), false, "1"); append(")"); } else if (operator.equals(Ops.MATCHES)){ - args = new ArrayList>(args); + List> args = new ArrayList>(a); if (args.get(1) instanceof Constant){ args.set(1, regexToLike(args.get(1).toString())); }else if (args.get(1) instanceof Operation){ @@ -313,7 +313,7 @@ public final class HQLSerializer extends SerializerBase { super.visitOperation(type, operator, args); } else { - super.visitOperation(type, operator, args); + super.visitOperation(type, operator, a); } // wrapElements = old;