From 508d2feaa506233e0cf517019885426826cd1358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Mon, 20 Feb 2012 21:08:44 +0200 Subject: [PATCH] formatted code --- .../query/apt/AbstractQuerydslProcessor.java | 3 +- .../com/mysema/query/apt/Configuration.java | 1 - .../query/apt/DefaultConfiguration.java | 1 - .../mysema/query/apt/ExtendedTypeFactory.java | 9 ++-- .../mysema/query/apt/TypeElementHandler.java | 3 +- .../collections/DefaultEvaluatorFactory.java | 18 +++++--- .../query/collections/DefaultQueryEngine.java | 12 +++-- .../mysema/query/collections/QueryEngine.java | 3 +- .../java/com/mysema/query/Projectable.java | 6 ++- .../PropertyAccessInvocationHandler.java | 3 +- .../query/codegen/EntitySerializer.java | 30 ++++++++----- .../mysema/query/codegen/TypeMappings.java | 6 ++- .../query/support/CollectionAnyVisitor.java | 3 +- .../query/support/DetachableAdapter.java | 3 +- .../mysema/query/support/DetachableMixin.java | 9 ++-- .../mysema/query/support/DetachableQuery.java | 6 ++- .../com/mysema/query/support/Expressions.java | 45 ++++++++++++------- .../query/support/ListAccessVisitor.java | 3 +- .../query/support/ProjectableAdapter.java | 9 ++-- .../query/support/ProjectableQuery.java | 15 ++++--- .../com/mysema/query/jdo/JDOQLQueryImpl.java | 6 ++- .../com/mysema/query/jdo/JDOQLSerializer.java | 3 +- .../query/jdo/dml/JDOQLDeleteClause.java | 3 +- .../query/jdo/dml/JDOQLUpdateClause.java | 3 +- .../hibernate/HibernateDomainExporter.java | 27 +++++++---- .../query/jpa/hibernate/HibernateQuery.java | 3 +- .../jpa/hibernate/HibernateUpdateClause.java | 6 ++- .../query/jpa/hibernate/HibernateUtil.java | 3 +- .../query/jpa/impl/JPAUpdateClause.java | 3 +- 29 files changed, 162 insertions(+), 83 deletions(-) diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/AbstractQuerydslProcessor.java b/querydsl-apt/src/main/java/com/mysema/query/apt/AbstractQuerydslProcessor.java index ef4bc7664..78f0021de 100644 --- a/querydsl-apt/src/main/java/com/mysema/query/apt/AbstractQuerydslProcessor.java +++ b/querydsl-apt/src/main/java/com/mysema/query/apt/AbstractQuerydslProcessor.java @@ -522,7 +522,8 @@ public abstract class AbstractQuerydslProcessor extends AbstractProcessor { } processingEnv.getMessager().printMessage(Kind.NOTE, "Generating " + className + " for " + elements); - JavaFileObject fileObject = processingEnv.getFiler().createSourceFile(className, elements.toArray(new Element[elements.size()])); + JavaFileObject fileObject = processingEnv.getFiler().createSourceFile(className, + elements.toArray(new Element[elements.size()])); Writer writer = fileObject.openWriter(); try { SerializerConfig serializerConfig = conf.getSerializerConfig(model); diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/Configuration.java b/querydsl-apt/src/main/java/com/mysema/query/apt/Configuration.java index ce2dd8b02..aac5699a8 100644 --- a/querydsl-apt/src/main/java/com/mysema/query/apt/Configuration.java +++ b/querydsl-apt/src/main/java/com/mysema/query/apt/Configuration.java @@ -23,7 +23,6 @@ import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; -import javax.lang.model.type.TypeMirror; import com.mysema.query.codegen.EntityType; import com.mysema.query.codegen.QueryTypeFactory; diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/DefaultConfiguration.java b/querydsl-apt/src/main/java/com/mysema/query/apt/DefaultConfiguration.java index ec72bbf46..488edb233 100644 --- a/querydsl-apt/src/main/java/com/mysema/query/apt/DefaultConfiguration.java +++ b/querydsl-apt/src/main/java/com/mysema/query/apt/DefaultConfiguration.java @@ -41,7 +41,6 @@ import javax.lang.model.element.Modifier; import javax.lang.model.element.PackageElement; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; -import javax.lang.model.type.TypeMirror; import org.apache.commons.lang3.StringUtils; diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/ExtendedTypeFactory.java b/querydsl-apt/src/main/java/com/mysema/query/apt/ExtendedTypeFactory.java index b271dac2d..b840a12bc 100644 --- a/querydsl-apt/src/main/java/com/mysema/query/apt/ExtendedTypeFactory.java +++ b/querydsl-apt/src/main/java/com/mysema/query/apt/ExtendedTypeFactory.java @@ -280,7 +280,8 @@ public final class ExtendedTypeFactory { return env.getTypeUtils().erasure(env.getElementUtils().getTypeElement(clazz.getName()).asType()); } - private Type createType(TypeElement typeElement, TypeCategory category, List typeArgs, boolean deep) { + private Type createType(TypeElement typeElement, TypeCategory category, + List typeArgs, boolean deep) { String name = typeElement.getQualifiedName().toString(); String simpleName = typeElement.getSimpleName().toString(); String packageName = env.getElementUtils().getPackageOf(typeElement).getQualifiedName().toString(); @@ -376,7 +377,8 @@ public final class ExtendedTypeFactory { // entity type for (Class entityAnn : entityAnnotations) { - if (typeElement.getAnnotation(entityAnn) != null || (superTypeElement != null && superTypeElement.getAnnotation(entityAnn) != null)){ + if (typeElement.getAnnotation(entityAnn) != null || + (superTypeElement != null && superTypeElement.getAnnotation(entityAnn) != null)){ EntityType entityType = new EntityType(type); typeMappings.register(entityType, queryTypeFactory.create(entityType)); return entityType; @@ -410,7 +412,8 @@ public final class ExtendedTypeFactory { return new SimpleType(Types.MAP, keyType, valueType); } - private Type createCollectionType(Type baseType, String simpleName, Iterator typeMirrors, boolean deep) { + private Type createCollectionType(Type baseType, String simpleName, + Iterator typeMirrors, boolean deep) { if (!typeMirrors.hasNext()){ return new SimpleType(baseType, defaultType); } diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/TypeElementHandler.java b/querydsl-apt/src/main/java/com/mysema/query/apt/TypeElementHandler.java index a85b1385a..6da2ce99c 100644 --- a/querydsl-apt/src/main/java/com/mysema/query/apt/TypeElementHandler.java +++ b/querydsl-apt/src/main/java/com/mysema/query/apt/TypeElementHandler.java @@ -136,7 +136,8 @@ public final class TypeElementHandler { return entityType; } - private Property toProperty(EntityType entityType, String name, TypeMirror type, Annotations annotations) { + private Property toProperty(EntityType entityType, String name, TypeMirror type, + Annotations annotations) { // type Type propertyType = typeFactory.getType(type, true); if (annotations.isAnnotationPresent(QueryType.class)) { diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultEvaluatorFactory.java b/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultEvaluatorFactory.java index e8bcd8eba..20a122f2b 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultEvaluatorFactory.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultEvaluatorFactory.java @@ -81,7 +81,8 @@ public class DefaultEvaluatorFactory { * @param projection * @return */ - public Evaluator create(QueryMetadata metadata, List> sources, Expression projection) { + public Evaluator create(QueryMetadata metadata, List> sources, + Expression projection) { ColQuerySerializer serializer = new ColQuerySerializer(templates); serializer.handle(projection); @@ -106,7 +107,8 @@ public class DefaultEvaluatorFactory { javaSource = "("+com.mysema.codegen.support.ClassUtils.getName(projection.getType())+")(" + javaSource+")"; } - return factory.createEvaluator("return " + javaSource +";", projection.getType(), names, types, constants); + return factory.createEvaluator("return " + javaSource +";", projection.getType(), names, + types, constants); } /** @@ -117,7 +119,8 @@ public class DefaultEvaluatorFactory { * @param filter * @return */ - public Evaluator> createEvaluator(QueryMetadata metadata, Expression source, Predicate filter){ + public Evaluator> createEvaluator(QueryMetadata metadata, + Expression source, Predicate filter){ String typeName = com.mysema.codegen.support.ClassUtils.getName(source.getType()); ColQuerySerializer ser = new ColQuerySerializer(templates); ser.append("java.util.List<"+typeName+"> rv = new java.util.ArrayList<"+typeName+">();\n"); @@ -151,7 +154,8 @@ public class DefaultEvaluatorFactory { * @return */ @SuppressWarnings("unchecked") - public Evaluator> createEvaluator(QueryMetadata metadata, List joins, @Nullable Predicate filter){ + public Evaluator> createEvaluator(QueryMetadata metadata, + List joins, @Nullable Predicate filter){ List sourceNames = new ArrayList(); List sourceTypes = new ArrayList(); List sourceClasses = new ArrayList(); @@ -186,7 +190,8 @@ public class DefaultEvaluatorFactory { ser.append("for ( " + typeName + " " + alias.getArg(1) + " : "); if (colAnyJoin) { Context context = new Context(); - Expression replacement = (Expression) alias.getArg(0).accept(CollectionAnyVisitor.DEFAULT, context); + Expression replacement = (Expression) alias.getArg(0) + .accept(CollectionAnyVisitor.DEFAULT, context); ser.handle(replacement); } else { ser.handle(alias.getArg(0)); @@ -237,7 +242,8 @@ public class DefaultEvaluatorFactory { constants); } - private Map getConstants(QueryMetadata metadata, Map constantToLabel) { + private Map getConstants(QueryMetadata metadata, + Map constantToLabel) { Map constants = new HashMap(); for (Map.Entry entry : constantToLabel.entrySet()) { if (entry.getKey() instanceof ParamExpression) { diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultQueryEngine.java b/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultQueryEngine.java index dc3229cb3..0dfe04da8 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultQueryEngine.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultQueryEngine.java @@ -76,7 +76,8 @@ public class DefaultQueryEngine implements QueryEngine { } @Override - public List list(QueryMetadata metadata, Map, Iterable> iterables, Expression projection){ + public List list(QueryMetadata metadata, Map, Iterable> iterables, + Expression projection){ if (metadata.getJoins().size() == 1) { return evaluateSingleSource(metadata, iterables, false); } else { @@ -104,7 +105,8 @@ public class DefaultQueryEngine implements QueryEngine { return rv; } - private List evaluateMultipleSources(QueryMetadata metadata, Map, Iterable> iterables, boolean count) { + private List evaluateMultipleSources(QueryMetadata metadata, Map, + Iterable> iterables, boolean count) { // from where Evaluator> ev = evaluatorFactory.createEvaluator(metadata, metadata.getJoins(), metadata.getWhere()); List> iterableList = new ArrayList>(metadata.getJoins().size()); @@ -148,7 +150,8 @@ public class DefaultQueryEngine implements QueryEngine { return list; } - private List evaluateSingleSource(QueryMetadata metadata, Map, Iterable> iterables, boolean count) { + private List evaluateSingleSource(QueryMetadata metadata, Map, + Iterable> iterables, boolean count) { Expression source = metadata.getJoins().get(0).getTarget(); List> sources = Collections.>singletonList(source); Iterable iterable = iterables.values().iterator().next(); @@ -161,7 +164,8 @@ public class DefaultQueryEngine implements QueryEngine { // from & where if (metadata.getWhere() != null) { - Evaluator> evaluator = (Evaluator)evaluatorFactory.createEvaluator(metadata, source, metadata.getWhere()); + Evaluator> evaluator = (Evaluator)evaluatorFactory + .createEvaluator(metadata, source, metadata.getWhere()); list = evaluator.evaluate(list); } diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/QueryEngine.java b/querydsl-collections/src/main/java/com/mysema/query/collections/QueryEngine.java index 1ee2720f9..cd220f643 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/QueryEngine.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/QueryEngine.java @@ -48,7 +48,8 @@ public interface QueryEngine { * @param iterables * @return */ - List list(QueryMetadata metadata, Map, Iterable> iterables, Expression projection); + List list(QueryMetadata metadata, Map, Iterable> iterables, + Expression projection); /** * @param metadata diff --git a/querydsl-core/src/main/java/com/mysema/query/Projectable.java b/querydsl-core/src/main/java/com/mysema/query/Projectable.java index 3a4cd176f..79be0a321 100644 --- a/querydsl-core/src/main/java/com/mysema/query/Projectable.java +++ b/querydsl-core/src/main/java/com/mysema/query/Projectable.java @@ -61,7 +61,8 @@ public interface Projectable { * @param rest * @return an Iterator over the projection */ - CloseableIterator iterate(Expression first, Expression second, Expression... rest); + CloseableIterator iterate(Expression first, Expression second, + Expression... rest); /** * iterate over the results for the given projection @@ -89,7 +90,8 @@ public interface Projectable { * @param rest * @return an Iterator over the projection */ - CloseableIterator iterateDistinct(Expression first, Expression second, Expression... rest); + CloseableIterator iterateDistinct(Expression first, Expression second, + Expression... rest); /** * iterate over the distinct results for the given projection diff --git a/querydsl-core/src/main/java/com/mysema/query/alias/PropertyAccessInvocationHandler.java b/querydsl-core/src/main/java/com/mysema/query/alias/PropertyAccessInvocationHandler.java index 8c7032c02..79f606bd3 100644 --- a/querydsl-core/src/main/java/com/mysema/query/alias/PropertyAccessInvocationHandler.java +++ b/querydsl-core/src/main/java/com/mysema/query/alias/PropertyAccessInvocationHandler.java @@ -143,7 +143,8 @@ public class PropertyAccessInvocationHandler implements MethodInterceptor { @SuppressWarnings({ "unchecked"}) @Nullable - protected T newInstance(Class type, Type genericType, Object parent, Object propKey, PathMetadata metadata) { + protected T newInstance(Class type, Type genericType, Object parent, Object propKey, + PathMetadata metadata) { Expression path; Object rv; diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java b/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java index e7bf8f350..12e92d0bc 100644 --- a/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java +++ b/querydsl-core/src/main/java/com/mysema/query/codegen/EntitySerializer.java @@ -102,12 +102,14 @@ public class EntitySerializer implements Serializer{ this.keywords = Assert.notNull(keywords,"keywords"); } - protected void constructors(EntityType model, SerializerConfig config, CodeWriter writer) throws IOException { + protected void constructors(EntityType model, SerializerConfig config, + CodeWriter writer) throws IOException { String localName = writer.getRawName(model); String genericName = writer.getGenericName(true, model); boolean hasEntityFields = model.hasEntityFields(); - boolean stringOrBoolean = model.getOriginalCategory() == TypeCategory.STRING || model.getOriginalCategory() == TypeCategory.BOOLEAN; + boolean stringOrBoolean = model.getOriginalCategory() == TypeCategory.STRING + || model.getOriginalCategory() == TypeCategory.BOOLEAN; String thisOrSuper = hasEntityFields ? THIS : SUPER; String additionalParams = getAdditionalConstructorParameter(model); @@ -185,7 +187,8 @@ public class EntitySerializer implements Serializer{ String localName = writer.getRawName(model); String genericName = writer.getGenericName(true, model); - boolean stringOrBoolean = model.getOriginalCategory() == TypeCategory.STRING || model.getOriginalCategory() == TypeCategory.BOOLEAN; + boolean stringOrBoolean = model.getOriginalCategory() == TypeCategory.STRING + || model.getOriginalCategory() == TypeCategory.BOOLEAN; boolean hasEntityFields = model.hasEntityFields(); String thisOrSuper = hasEntityFields ? THIS : SUPER; String additionalParams = hasEntityFields ? "" : getAdditionalConstructorParameter(model); @@ -208,7 +211,8 @@ public class EntitySerializer implements Serializer{ Type queryType = typeMappings.getPathType(field.getType(), model, false); writer.beginPublicMethod(queryType, field.getEscapedName()); writer.line("if (", field.getEscapedName(), " == null){"); - writer.line(" ", field.getEscapedName(), " = new ", writer.getRawName(queryType), "(forProperty(\"", field.getName(), "\"));"); + writer.line(" ", field.getEscapedName(), " = new ", writer.getRawName(queryType), + "(forProperty(\"", field.getName(), "\"));"); writer.line("}"); writer.line(RETURN, field.getEscapedName(), SEMICOLON); writer.end(); @@ -263,7 +267,8 @@ public class EntitySerializer implements Serializer{ Property field) throws IOException { Type queryType = typeMappings.getPathType(field.getType(), model, false); if (!field.isInherited()) { - boolean hasEntityFields = field.getType() instanceof EntityType && ((EntityType)field.getType()).hasEntityFields(); + boolean hasEntityFields = field.getType() instanceof EntityType + && ((EntityType)field.getType()).hasEntityFields(); writer.line("this." + field.getEscapedName() + ASSIGN, "inits.isInitialized(\""+field.getName()+"\") ? ", NEW + writer.getRawName(queryType) + "(forProperty(\"" + field.getName() + "\")", @@ -356,7 +361,8 @@ public class EntitySerializer implements Serializer{ writer.suppressWarnings(UNCHECKED); } Type returnType = new ClassType(ConstructorExpression.class, model); - writer.beginStaticMethod(returnType, "create", c.getParameters(), new Transformer() { + writer.beginStaticMethod(returnType, "create", c.getParameters(), + new Transformer() { @Override public Parameter transform(Parameter p) { return new Parameter(p.getName(), typeMappings.getExprType( @@ -513,7 +519,8 @@ public class EntitySerializer implements Serializer{ writer.beginPublicMethod(queryType, escapedName, new Parameter("index", Types.INT)); writer.line(RETURN + escapedName + ".get(index);").end(); - writer.beginPublicMethod(queryType, escapedName, new Parameter("index", new ClassType(Expression.class, Types.INTEGER))); + writer.beginPublicMethod(queryType, escapedName, new Parameter("index", + new ClassType(Expression.class, Types.INTEGER))); writer.line(RETURN + escapedName +".get(index);").end(); } @@ -524,7 +531,8 @@ public class EntitySerializer implements Serializer{ writer.beginPublicMethod(queryType, escapedName, new Parameter("key", field.getParameter(0))); writer.line(RETURN + escapedName + ".get(key);").end(); - writer.beginPublicMethod(queryType, escapedName, new Parameter("key", new ClassType(Expression.class, field.getParameter(0)))); + writer.beginPublicMethod(queryType, escapedName, new Parameter("key", + new ClassType(Expression.class, field.getParameter(0)))); writer.line(RETURN + escapedName + ".get(key);").end(); } @@ -739,8 +747,10 @@ public class EntitySerializer implements Serializer{ String valueType = writer.getRawName(property.getParameter(1)); queryType = typeMappings.getPathType(property.getParameter(1), model, true); - serialize(model, property, new ClassType(MapPath.class, getRaw(property.getParameter(0)), getRaw(property.getParameter(1)), genericQueryType), - writer, "this.<" + genericKey + COMMA + genericValue + COMMA + writer.getGenericName(true, genericQueryType) + ">createMap", + serialize(model, property, new ClassType(MapPath.class, getRaw(property.getParameter(0)), + getRaw(property.getParameter(1)), genericQueryType), + writer, "this.<" + genericKey + COMMA + genericValue + COMMA + + writer.getGenericName(true, genericQueryType) + ">createMap", keyType+DOT_CLASS, valueType+DOT_CLASS, writer.getRawName(queryType)+DOT_CLASS); break; diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeMappings.java b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeMappings.java index b27cf5c45..6e773fe87 100644 --- a/querydsl-core/src/main/java/com/mysema/query/codegen/TypeMappings.java +++ b/querydsl-core/src/main/java/com/mysema/query/codegen/TypeMappings.java @@ -123,7 +123,8 @@ public final class TypeMappings { } } - private Type getQueryType(Map types, Type type, EntityType model, boolean raw, boolean rawParameters, boolean extend){ + private Type getQueryType(Map types, Type type, EntityType model, boolean raw, + boolean rawParameters, boolean extend){ Type exprType = types.get(type.getCategory()); if (type.getCategory() == TypeCategory.ARRAY && types == pathTypes) { return getQueryType(type.getComponentType(), model, exprType, raw, rawParameters, extend); @@ -132,7 +133,8 @@ public final class TypeMappings { } } - public Type getQueryType(Type type, EntityType model, Type exprType, boolean raw, boolean rawParameters, boolean extend){ + public Type getQueryType(Type type, EntityType model, Type exprType, boolean raw, + boolean rawParameters, boolean extend){ TypeCategory category = type.getCategory(); if (raw && category != TypeCategory.ENTITY && category != TypeCategory.CUSTOM) { return exprType; diff --git a/querydsl-core/src/main/java/com/mysema/query/support/CollectionAnyVisitor.java b/querydsl-core/src/main/java/com/mysema/query/support/CollectionAnyVisitor.java index c0c85f714..fb32db954 100644 --- a/querydsl-core/src/main/java/com/mysema/query/support/CollectionAnyVisitor.java +++ b/querydsl-core/src/main/java/com/mysema/query/support/CollectionAnyVisitor.java @@ -35,7 +35,8 @@ public class CollectionAnyVisitor implements Visitor,Context>{ @SuppressWarnings("unchecked") private static Path replaceParent(Path path, Path parent) { - PathMetadata metadata = new PathMetadata(parent, path.getMetadata().getExpression(), path.getMetadata().getPathType()); + PathMetadata metadata = new PathMetadata(parent, path.getMetadata().getExpression(), + path.getMetadata().getPathType()); return new PathImpl(path.getType(), metadata); } diff --git a/querydsl-core/src/main/java/com/mysema/query/support/DetachableAdapter.java b/querydsl-core/src/main/java/com/mysema/query/support/DetachableAdapter.java index 065da090d..4ab83b9a1 100644 --- a/querydsl-core/src/main/java/com/mysema/query/support/DetachableAdapter.java +++ b/querydsl-core/src/main/java/com/mysema/query/support/DetachableAdapter.java @@ -55,7 +55,8 @@ public class DetachableAdapter implements Detachable{ return detachable; } - public ListSubQuery list(Expression first, Expression second, Expression... rest) { + public ListSubQuery list(Expression first, Expression second, + Expression... rest) { return detachable.list(first, second, rest); } diff --git a/querydsl-core/src/main/java/com/mysema/query/support/DetachableMixin.java b/querydsl-core/src/main/java/com/mysema/query/support/DetachableMixin.java index bed527cd1..cc5f42253 100644 --- a/querydsl-core/src/main/java/com/mysema/query/support/DetachableMixin.java +++ b/querydsl-core/src/main/java/com/mysema/query/support/DetachableMixin.java @@ -59,7 +59,8 @@ public class DetachableMixin implements Detachable{ } @Override - public ListSubQuery list(Expression first, Expression second, Expression... rest) { + public ListSubQuery list(Expression first, Expression second, + Expression... rest) { return new ListSubQuery(Object[].class, projection(first, second, rest)); } @@ -144,7 +145,8 @@ public class DetachableMixin implements Detachable{ } @Override - public SimpleSubQuery unique(Expression first, Expression second, Expression... rest) { + public SimpleSubQuery unique(Expression first, Expression second, + Expression... rest) { return new SimpleSubQuery(Object[].class, uniqueProjection(first, second, rest)); } @@ -188,7 +190,8 @@ public class DetachableMixin implements Detachable{ return metadata; } - private QueryMetadata uniqueProjection(Expression first, Expression second, Expression[] rest) { + private QueryMetadata uniqueProjection(Expression first, Expression second, + Expression[] rest) { QueryMetadata metadata = projection(first, second, rest); metadata.setUnique(true); return metadata; diff --git a/querydsl-core/src/main/java/com/mysema/query/support/DetachableQuery.java b/querydsl-core/src/main/java/com/mysema/query/support/DetachableQuery.java index 5836893d3..9dc47315c 100644 --- a/querydsl-core/src/main/java/com/mysema/query/support/DetachableQuery.java +++ b/querydsl-core/src/main/java/com/mysema/query/support/DetachableQuery.java @@ -51,7 +51,8 @@ public class DetachableQuery > extends QueryBase } @Override - public ListSubQuery list(Expression first, Expression second, Expression... rest) { + public ListSubQuery list(Expression first, Expression second, + Expression... rest) { return detachableMixin.list(first, second, rest); } @@ -91,7 +92,8 @@ public class DetachableQuery > extends QueryBase } @Override - public SimpleSubQuery unique(Expression first, Expression second, Expression... rest) { + public SimpleSubQuery unique(Expression first, Expression second, + Expression... rest) { return detachableMixin.unique(first, second, rest); } diff --git a/querydsl-core/src/main/java/com/mysema/query/support/Expressions.java b/querydsl-core/src/main/java/com/mysema/query/support/Expressions.java index c4805be97..b08d558aa 100644 --- a/querydsl-core/src/main/java/com/mysema/query/support/Expressions.java +++ b/querydsl-core/src/main/java/com/mysema/query/support/Expressions.java @@ -85,11 +85,13 @@ public final class Expressions { return SimpleTemplate.create(cl, template, args); } - public static > ComparableExpression comparableTemplate(Class cl, String template, Expression... args) { + public static > ComparableExpression comparableTemplate(Class cl, + String template, Expression... args) { return ComparableTemplate.create(cl, template, args); } - public static > NumberExpression numberTemplate(Class cl, String template, Expression... args) { + public static > NumberExpression numberTemplate(Class cl, + String template, Expression... args) { return NumberTemplate.create(cl, template, args); } @@ -109,7 +111,8 @@ public final class Expressions { return BooleanOperation.create(operation, args); } - public static SimpleExpression operation(Class type, Operator operator, Expression... args) { + public static SimpleExpression operation(Class type, Operator operator, + Expression... args) { return SimpleOperation.create(type, operator, args); } @@ -117,23 +120,28 @@ public final class Expressions { return predicate(operation, args); } - public static > ComparableExpression comparableOperation(Class type, Operator operator, Expression... args) { + public static > ComparableExpression comparableOperation(Class type, + Operator operator, Expression... args) { return ComparableOperation.create(type, operator, args); } - public static > DateExpression dateOperation(Class type, Operator operator, Expression... args) { + public static > DateExpression dateOperation(Class type, + Operator operator, Expression... args) { return DateOperation.create(type, operator, args); } - public static > DateTimeExpression dateTimeOperation(Class type, Operator operator, Expression... args) { + public static > DateTimeExpression dateTimeOperation(Class type, + Operator operator, Expression... args) { return DateTimeOperation.create(type, operator, args); } - public static > TimeExpression timeOperation(Class type, Operator operator, Expression... args) { + public static > TimeExpression timeOperation(Class type, + Operator operator, Expression... args) { return TimeOperation.create(type, operator, args); } - public static > NumberExpression numberOperation(Class type, Operator operator, Expression... args) { + public static > NumberExpression numberOperation(Class type, + Operator operator, Expression... args) { return NumberOperation.create(type, operator, args); } @@ -149,11 +157,13 @@ public final class Expressions { return new SimplePath(type, PathMetadataFactory.forProperty(parent, property)); } - public static > ComparablePath comparablePath(Class type, String variable) { + public static > ComparablePath comparablePath(Class type, + String variable) { return new ComparablePath(type, PathMetadataFactory.forVariable(variable)); } - public static > ComparablePath comparablePath(Class type, Path parent, String property) { + public static > ComparablePath comparablePath(Class type, + Path parent, String property) { return new ComparablePath(type, PathMetadataFactory.forProperty(parent, property)); } @@ -161,7 +171,8 @@ public final class Expressions { return new DatePath(type, PathMetadataFactory.forVariable(variable)); } - public static > DatePath datePath(Class type, Path parent, String property) { + public static > DatePath datePath(Class type, Path parent, + String property) { return new DatePath(type, PathMetadataFactory.forProperty(parent, property)); } @@ -169,7 +180,8 @@ public final class Expressions { return new DateTimePath(type, PathMetadataFactory.forVariable(variable)); } - public static > DateTimePath dateTimePath(Class type, Path parent, String property) { + public static > DateTimePath dateTimePath(Class type, Path parent, + String property) { return new DateTimePath(type, PathMetadataFactory.forProperty(parent, property)); } @@ -177,15 +189,18 @@ public final class Expressions { return new TimePath(type, PathMetadataFactory.forVariable(variable)); } - public static > TimePath timePath(Class type, Path parent, String property) { + public static > TimePath timePath(Class type, Path parent, + String property) { return new TimePath(type, PathMetadataFactory.forProperty(parent, property)); } - public static > NumberPath numberPath(Class type, String variable) { + public static > NumberPath numberPath(Class type, + String variable) { return new NumberPath(type, PathMetadataFactory.forVariable(variable)); } - public static > NumberPath numberPath(Class type, Path parent, String property) { + public static > NumberPath numberPath(Class type, + Path parent, String property) { return new NumberPath(type, PathMetadataFactory.forProperty(parent, property)); } diff --git a/querydsl-core/src/main/java/com/mysema/query/support/ListAccessVisitor.java b/querydsl-core/src/main/java/com/mysema/query/support/ListAccessVisitor.java index 476ec5a41..f28c47dce 100644 --- a/querydsl-core/src/main/java/com/mysema/query/support/ListAccessVisitor.java +++ b/querydsl-core/src/main/java/com/mysema/query/support/ListAccessVisitor.java @@ -36,7 +36,8 @@ public class ListAccessVisitor implements Visitor,Context>{ @SuppressWarnings("unchecked") private static Path replaceParent(Path path, Path parent) { - PathMetadata metadata = new PathMetadata(parent, path.getMetadata().getExpression(), path.getMetadata().getPathType()); + PathMetadata metadata = new PathMetadata(parent, path.getMetadata().getExpression(), + path.getMetadata().getPathType()); return new PathImpl(path.getType(), metadata); } diff --git a/querydsl-core/src/main/java/com/mysema/query/support/ProjectableAdapter.java b/querydsl-core/src/main/java/com/mysema/query/support/ProjectableAdapter.java index 8baa5a2b0..36dc58cf6 100644 --- a/querydsl-core/src/main/java/com/mysema/query/support/ProjectableAdapter.java +++ b/querydsl-core/src/main/java/com/mysema/query/support/ProjectableAdapter.java @@ -61,7 +61,8 @@ public class ProjectableAdapter

implements Projectable { } @Override - public CloseableIterator iterate(Expression first, Expression second, Expression... rest) { + public CloseableIterator iterate(Expression first, Expression second, + Expression... rest) { return projectable.iterate(first, second, rest); } @@ -76,7 +77,8 @@ public class ProjectableAdapter

implements Projectable { } @Override - public CloseableIterator iterateDistinct(Expression first, Expression second, Expression... rest) { + public CloseableIterator iterateDistinct(Expression first, Expression second, + Expression... rest) { return projectable.iterateDistinct(first, second, rest); } @@ -106,7 +108,8 @@ public class ProjectableAdapter

implements Projectable { } @Override - public List listDistinct(Expression first, Expression second, Expression... rest) { + public List listDistinct(Expression first, Expression second, + Expression... rest) { return projectable.listDistinct(first, second, rest); } diff --git a/querydsl-core/src/main/java/com/mysema/query/support/ProjectableQuery.java b/querydsl-core/src/main/java/com/mysema/query/support/ProjectableQuery.java index 8925a8728..118149ec3 100644 --- a/querydsl-core/src/main/java/com/mysema/query/support/ProjectableQuery.java +++ b/querydsl-core/src/main/java/com/mysema/query/support/ProjectableQuery.java @@ -48,12 +48,14 @@ public abstract class ProjectableQuery> } @Override - public final CloseableIterator iterate(Expression first, Expression second, Expression... rest) { + public final CloseableIterator iterate(Expression first, Expression second, + Expression... rest) { return iterate(merge(first, second, rest)); } @Override - public final CloseableIterator iterateDistinct(Expression first, Expression second, Expression... rest) { + public final CloseableIterator iterateDistinct(Expression first, Expression second, + Expression... rest) { queryMixin.setDistinct(true); return iterate(first, second, rest); } @@ -86,7 +88,8 @@ public abstract class ProjectableQuery> } @Override - public final List listDistinct(Expression first, Expression second, Expression... rest) { + public final List listDistinct(Expression first, Expression second, + Expression... rest) { queryMixin.setDistinct(true); return list(first, second, rest); } @@ -133,7 +136,8 @@ public abstract class ProjectableQuery> } @Override - public final Object[] singleResult(Expression first, Expression second, Expression... rest) { + public final Object[] singleResult(Expression first, Expression second, + Expression... rest) { return singleResult(merge(first, second, rest)); } @@ -154,7 +158,8 @@ public abstract class ProjectableQuery> @Override - public final Object[] uniqueResult(Expression first, Expression second, Expression... rest) { + public final Object[] uniqueResult(Expression first, Expression second, + Expression... rest) { return uniqueResult(merge(first, second, rest)); } diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQueryImpl.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQueryImpl.java index 35f633a41..564d46036 100644 --- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQueryImpl.java +++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLQueryImpl.java @@ -75,7 +75,8 @@ public final class JDOQLQueryImpl extends AbstractJDOQLQuery imp * @param metadata * @param detach */ - protected JDOQLQueryImpl(PersistenceManager persistenceManager, JDOQLTemplates templates, QueryMetadata metadata, boolean detach) { + protected JDOQLQueryImpl(PersistenceManager persistenceManager, JDOQLTemplates templates, + QueryMetadata metadata, boolean detach) { super(persistenceManager, templates, metadata, detach); } @@ -86,7 +87,8 @@ public final class JDOQLQueryImpl extends AbstractJDOQLQuery imp * @return */ public JDOQLQueryImpl clone(PersistenceManager persistenceManager) { - JDOQLQueryImpl query = new JDOQLQueryImpl(persistenceManager, getTemplates(), getMetadata().clone(), isDetach()); + JDOQLQueryImpl query = new JDOQLQueryImpl(persistenceManager, getTemplates(), + getMetadata().clone(), isDetach()); query.fetchGroups.addAll(fetchGroups); query.maxFetchDepth = maxFetchDepth; return query; diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLSerializer.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLSerializer.java index f9ecc0724..741c81bfc 100644 --- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLSerializer.java +++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLSerializer.java @@ -342,7 +342,8 @@ public final class JDOQLSerializer extends SerializerBase { append(") > 0"); // not exists - } else if (operator.equals(Ops.NOT) && args.get(0) instanceof Operation && ((Operation)args.get(0)).getOperator().equals(Ops.EXISTS)) { + } else if (operator.equals(Ops.NOT) && args.get(0) instanceof Operation + && ((Operation)args.get(0)).getOperator().equals(Ops.EXISTS)) { SubQueryExpression subQuery = (SubQueryExpression) ((Operation)args.get(0)).getArg(0); append("("); serialize(subQuery.getMetadata(), true, true); diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOQLDeleteClause.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOQLDeleteClause.java index 087f8c10f..e3831fa72 100644 --- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOQLDeleteClause.java +++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOQLDeleteClause.java @@ -49,7 +49,8 @@ public class JDOQLDeleteClause implements DeleteClause{ this(pm, entity, JDOQLTemplates.DEFAULT); } - public JDOQLDeleteClause(PersistenceManager persistenceManager, EntityPath entity, JDOQLTemplates templates) { + public JDOQLDeleteClause(PersistenceManager persistenceManager, EntityPath entity, + JDOQLTemplates templates) { this.entity = entity; this.persistenceManager = persistenceManager; this.templates = templates; diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOQLUpdateClause.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOQLUpdateClause.java index 45aa7201d..def967025 100644 --- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOQLUpdateClause.java +++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/dml/JDOQLUpdateClause.java @@ -61,7 +61,8 @@ public class JDOQLUpdateClause implements UpdateClause{ if (values.get(i) != null) { metadata.addProjection(ExpressionUtils.eqConst(((Expression)paths.get(i)), values.get(i))); } else { - metadata.addProjection(ExpressionUtils.eq(((Expression)paths.get(i)), new NullExpression(paths.get(i).getType()))); + metadata.addProjection(ExpressionUtils.eq(((Expression)paths.get(i)), + new NullExpression(paths.get(i).getType()))); } } return this; diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateDomainExporter.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateDomainExporter.java index 5cb9419d3..64271b8aa 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateDomainExporter.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateDomainExporter.java @@ -94,15 +94,18 @@ public class HibernateDomainExporter { this(namePrefix, "", targetFolder, SimpleSerializerConfig.DEFAULT, configuration); } - public HibernateDomainExporter(String namePrefix, String nameSuffix, File targetFolder, Configuration configuration) { + public HibernateDomainExporter(String namePrefix, String nameSuffix, File targetFolder, + Configuration configuration) { this(namePrefix, nameSuffix, targetFolder, SimpleSerializerConfig.DEFAULT, configuration); } - public HibernateDomainExporter(String namePrefix, File targetFolder, SerializerConfig serializerConfig, Configuration configuration) { + public HibernateDomainExporter(String namePrefix, File targetFolder, + SerializerConfig serializerConfig, Configuration configuration) { this(namePrefix, "", targetFolder, serializerConfig, configuration); } - public HibernateDomainExporter(String namePrefix, String nameSuffix, File targetFolder, SerializerConfig serializerConfig, Configuration configuration) { + public HibernateDomainExporter(String namePrefix, String nameSuffix, File targetFolder, + SerializerConfig serializerConfig, Configuration configuration) { this.targetFolder = targetFolder; this.serializerConfig = serializerConfig; this.configuration = configuration; @@ -150,7 +153,8 @@ public class HibernateDomainExporter { serialize(entityTypes, entitySerializer); } - private void addSupertypeFields(EntityType model, Map superTypes, Set handled) { + private void addSupertypeFields(EntityType model, Map superTypes, + Set handled) { if (handled.add(model)) { for (Supertype supertype : model.getSuperTypes()) { EntityType entityType = superTypes.get(supertype.getType().getFullName()); @@ -164,7 +168,8 @@ public class HibernateDomainExporter { } - private void collectTypes() throws IOException, XMLStreamException, ClassNotFoundException, SecurityException, NoSuchMethodException { + private void collectTypes() throws IOException, XMLStreamException, ClassNotFoundException, + SecurityException, NoSuchMethodException { // super classes Iterator superClassMappings = configuration.getMappedSuperclassMappings(); while (superClassMappings.hasNext()) { @@ -197,7 +202,8 @@ public class HibernateDomainExporter { } } - private void handleProperty(EntityType entityType, Class cl, org.hibernate.mapping.Property p) throws NoSuchMethodException, ClassNotFoundException { + private void handleProperty(EntityType entityType, Class cl, org.hibernate.mapping.Property p) + throws NoSuchMethodException, ClassNotFoundException { Type propertyType = getType(cl, p.getName()); if (p.isComposite()) { Class embeddedClass = Class.forName(propertyType.getFullName()); @@ -216,7 +222,8 @@ public class HibernateDomainExporter { } @Nullable - private Property createProperty(EntityType entityType, String propertyName, Type propertyType, AnnotatedElement annotated) { + private Property createProperty(EntityType entityType, String propertyName, Type propertyType, + AnnotatedElement annotated) { String[] inits = new String[0]; if (annotated.isAnnotationPresent(QueryInit.class)) { inits = annotated.getAnnotation(QueryInit.class).value(); @@ -267,7 +274,8 @@ public class HibernateDomainExporter { String getter = "get"+BeanUtils.capitalize(propertyName); String bgetter = "is"+BeanUtils.capitalize(propertyName); for (Method method : cl.getDeclaredMethods()) { - if ((method.getName().equals(getter) || method.getName().equals(bgetter)) && method.getParameterTypes().length == 0) { + if ((method.getName().equals(getter) || method.getName().equals(bgetter)) + && method.getParameterTypes().length == 0) { return typeFactory.create(method.getReturnType(), method.getGenericReturnType()); } } @@ -287,7 +295,8 @@ public class HibernateDomainExporter { String getter = "get"+BeanUtils.capitalize(propertyName); String bgetter = "is"+BeanUtils.capitalize(propertyName); for (Method method : cl.getDeclaredMethods()) { - if ((method.getName().equals(getter) || method.getName().equals(bgetter)) && method.getParameterTypes().length == 0) { + if ((method.getName().equals(getter) || method.getName().equals(bgetter)) + && method.getParameterTypes().length == 0) { return method; } } diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java index deaaceef2..f85d484b8 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java @@ -103,7 +103,8 @@ public final class HibernateQuery extends AbstractHibernateQuery * @return */ public HibernateQuery clone(Session session) { - HibernateQuery q = new HibernateQuery(new DefaultSessionHolder(session), getTemplates(), getMetadata().clone()); + HibernateQuery q = new HibernateQuery(new DefaultSessionHolder(session), + getTemplates(), getMetadata().clone()); q.cacheable = cacheable; q.cacheRegion = cacheRegion; q.fetchSize = fetchSize; diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUpdateClause.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUpdateClause.java index 597cf98e6..4b8eb7be5 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUpdateClause.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUpdateClause.java @@ -61,7 +61,8 @@ public class HibernateUpdateClause implements this(new DefaultSessionHolder(session), entity, templates); } - public HibernateUpdateClause(SessionHolder session, EntityPath entity, JPQLTemplates templates) { + public HibernateUpdateClause(SessionHolder session, EntityPath entity, + JPQLTemplates templates) { this.session = session; this.templates = templates; metadata.addJoin(JoinType.DEFAULT, entity); @@ -107,7 +108,8 @@ public class HibernateUpdateClause implements if (values.get(i) != null) { metadata.addProjection(ExpressionUtils.eqConst((Expression)paths.get(i), values.get(i))); } else { - metadata.addProjection(ExpressionUtils.eq(((Expression)paths.get(i)), new NullExpression(paths.get(i).getType()))); + metadata.addProjection(ExpressionUtils.eq(((Expression)paths.get(i)), + new NullExpression(paths.get(i).getType()))); } } diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUtil.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUtil.java index a35d21bad..b2067afb9 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUtil.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateUtil.java @@ -57,7 +57,8 @@ public final class HibernateUtil { private HibernateUtil() {} - public static void setConstants(Query query, Map constants, Map, Object> params) { + public static void setConstants(Query query, Map constants, + Map, Object> params) { for (Map.Entry entry : constants.entrySet()) { String key = entry.getValue(); Object val = entry.getKey(); diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUpdateClause.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUpdateClause.java index 628585409..3c8fc92fa 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUpdateClause.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUpdateClause.java @@ -97,7 +97,8 @@ public class JPAUpdateClause implements UpdateClause{ if (values.get(i) != null) { metadata.addProjection(ExpressionUtils.eqConst((Expression)paths.get(i), values.get(i))); } else { - metadata.addProjection(ExpressionUtils.eq((Expression)paths.get(i), new NullExpression(paths.get(i).getType()))); + metadata.addProjection(ExpressionUtils.eq((Expression)paths.get(i), + new NullExpression(paths.get(i).getType()))); } } return this;