From 52102dbb8bb46166a3715cb2c41a8aad1589915c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Mon, 2 Aug 2010 20:32:23 +0000 Subject: [PATCH] organized imports --- .../java/com/mysema/query/alias/Alias.java | 17 +------------- .../PropertyAccessInvocationHandler.java | 15 +------------ .../com/mysema/query/codegen/ClassType.java | 17 +++++++++++++- .../query/serialization/SerializerBase.java | 13 +---------- .../query/support/DetachableAdapter.java | 11 +--------- .../mysema/query/support/DetachableMixin.java | 11 +--------- .../mysema/query/support/DetachableQuery.java | 11 +--------- .../com/mysema/query/MatchingFilters.java | 17 +------------- .../java/com/mysema/query/QueryExecution.java | 11 +--------- .../com/mysema/query/QueryModifiersTest.java | 5 ++++- .../query/codegen/BeanSerializerTest.java | 22 +++++++++++++++++-- .../mysema/query/codegen/ClassTypeTest.java | 18 +++++++-------- .../mysema/query/codegen/ConstructorTest.java | 2 +- .../com/mysema/query/codegen/MethodTest.java | 17 +++++++------- .../mysema/query/codegen/PropertyTest.java | 14 ++++++------ .../query/functions/MathFunctionsTest.java | 2 +- .../query/paging/SimpleListSourceTest.java | 3 ++- .../serialization/JavaTemplatesTest.java | 1 - .../mysema/query/types/custom/CustomTest.java | 2 +- .../types/expr/EArrayConstructorTest.java | 2 +- .../query/types/expr/EStringEscapeTest.java | 2 +- .../mysema/query/types/expr/QTupleTest.java | 2 +- .../query/types/query/SubQueryTest.java | 3 ++- 23 files changed, 83 insertions(+), 135 deletions(-) diff --git a/querydsl-core/src/main/java/com/mysema/query/alias/Alias.java b/querydsl-core/src/main/java/com/mysema/query/alias/Alias.java index 72e4743c0..f8092cf3e 100644 --- a/querydsl-core/src/main/java/com/mysema/query/alias/Alias.java +++ b/querydsl-core/src/main/java/com/mysema/query/alias/Alias.java @@ -19,22 +19,7 @@ import javax.annotation.Nullable; import org.apache.commons.lang.StringUtils; import com.mysema.query.types.Expr; -import com.mysema.query.types.path.PArray; -import com.mysema.query.types.path.PBoolean; -import com.mysema.query.types.path.PCollection; -import com.mysema.query.types.path.PComparable; -import com.mysema.query.types.path.PDate; -import com.mysema.query.types.path.PDateTime; -import com.mysema.query.types.path.PEntity; -import com.mysema.query.types.path.PList; -import com.mysema.query.types.path.PMap; -import com.mysema.query.types.path.PNumber; -import com.mysema.query.types.path.PSet; -import com.mysema.query.types.path.PSimple; -import com.mysema.query.types.path.PString; -import com.mysema.query.types.path.PTime; -import com.mysema.query.types.path.PathBuilder; -import com.mysema.query.types.path.PathMetadataFactory; +import com.mysema.query.types.path.*; /** * Alias provides alias factory methods 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 fe73ab0c1..60a79004f 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 @@ -32,20 +32,7 @@ import com.mysema.query.types.Path; import com.mysema.query.types.PathMetadata; import com.mysema.query.types.expr.ECollection; import com.mysema.query.types.expr.EMap; -import com.mysema.query.types.path.PArray; -import com.mysema.query.types.path.PBoolean; -import com.mysema.query.types.path.PCollection; -import com.mysema.query.types.path.PComparable; -import com.mysema.query.types.path.PDate; -import com.mysema.query.types.path.PDateTime; -import com.mysema.query.types.path.PEntity; -import com.mysema.query.types.path.PList; -import com.mysema.query.types.path.PMap; -import com.mysema.query.types.path.PNumber; -import com.mysema.query.types.path.PSet; -import com.mysema.query.types.path.PString; -import com.mysema.query.types.path.PTime; -import com.mysema.query.types.path.PathMetadataFactory; +import com.mysema.query.types.path.*; import com.mysema.util.ReflectionUtils; /** diff --git a/querydsl-core/src/main/java/com/mysema/query/codegen/ClassType.java b/querydsl-core/src/main/java/com/mysema/query/codegen/ClassType.java index b6598e4c0..560e9ac77 100644 --- a/querydsl-core/src/main/java/com/mysema/query/codegen/ClassType.java +++ b/querydsl-core/src/main/java/com/mysema/query/codegen/ClassType.java @@ -90,8 +90,23 @@ public final class ClassType extends AbstractType{ } @Override - public void appendLocalGenericName(Type context, Appendable builder, boolean asArgType) throws IOException { + public void appendLocalGenericName(Type context, Appendable builder, boolean asArgType) throws IOException { appendLocalRawName(context, builder); + if (!parameters.isEmpty()){ + String fullName = clazz.getName(); + builder.append("<"); + for (int i = 0; i < parameters.size(); i++){ + if (i > 0){ + builder.append(","); + } + if (parameters.get(i) != null && !parameters.get(i).getFullName().equals(fullName)){ + parameters.get(i).appendLocalGenericName(context, builder, false); + }else{ + builder.append("?"); + } + } + builder.append(">"); + } } @Override diff --git a/querydsl-core/src/main/java/com/mysema/query/serialization/SerializerBase.java b/querydsl-core/src/main/java/com/mysema/query/serialization/SerializerBase.java index 2995f0a24..a8593eb3a 100644 --- a/querydsl-core/src/main/java/com/mysema/query/serialization/SerializerBase.java +++ b/querydsl-core/src/main/java/com/mysema/query/serialization/SerializerBase.java @@ -16,18 +16,7 @@ import com.mysema.query.BooleanBuilder; import com.mysema.query.JoinFlag; import com.mysema.query.QueryFlag; import com.mysema.query.QueryFlag.Position; -import com.mysema.query.types.Constant; -import com.mysema.query.types.Custom; -import com.mysema.query.types.EConstructor; -import com.mysema.query.types.Expr; -import com.mysema.query.types.Operation; -import com.mysema.query.types.Operator; -import com.mysema.query.types.Param; -import com.mysema.query.types.Path; -import com.mysema.query.types.PathType; -import com.mysema.query.types.Template; -import com.mysema.query.types.Templates; -import com.mysema.query.types.Visitor; +import com.mysema.query.types.*; /** * SerializerBase is a stub for Serializer implementations 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 c1fd17ff4..fb59ee3c0 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 @@ -13,16 +13,7 @@ import com.mysema.query.types.expr.EDateTime; import com.mysema.query.types.expr.ENumber; import com.mysema.query.types.expr.EString; import com.mysema.query.types.expr.ETime; -import com.mysema.query.types.query.BooleanSubQuery; -import com.mysema.query.types.query.ComparableSubQuery; -import com.mysema.query.types.query.DateSubQuery; -import com.mysema.query.types.query.DateTimeSubQuery; -import com.mysema.query.types.query.Detachable; -import com.mysema.query.types.query.ListSubQuery; -import com.mysema.query.types.query.NumberSubQuery; -import com.mysema.query.types.query.ObjectSubQuery; -import com.mysema.query.types.query.StringSubQuery; -import com.mysema.query.types.query.TimeSubQuery; +import com.mysema.query.types.query.*; /** * DetachableAdapter is an apadater implementation for the Detachable interface 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 b1ccfd34a..736326ab9 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 @@ -16,16 +16,7 @@ import com.mysema.query.types.expr.ENumber; import com.mysema.query.types.expr.EString; import com.mysema.query.types.expr.ETime; import com.mysema.query.types.expr.ONumber; -import com.mysema.query.types.query.BooleanSubQuery; -import com.mysema.query.types.query.ComparableSubQuery; -import com.mysema.query.types.query.DateSubQuery; -import com.mysema.query.types.query.DateTimeSubQuery; -import com.mysema.query.types.query.Detachable; -import com.mysema.query.types.query.ListSubQuery; -import com.mysema.query.types.query.NumberSubQuery; -import com.mysema.query.types.query.ObjectSubQuery; -import com.mysema.query.types.query.StringSubQuery; -import com.mysema.query.types.query.TimeSubQuery; +import com.mysema.query.types.query.*; /** * Mixin style implementation of the Detachable interface 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 5655139e8..8ce2b153e 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 @@ -13,16 +13,7 @@ import com.mysema.query.types.expr.EDateTime; import com.mysema.query.types.expr.ENumber; import com.mysema.query.types.expr.EString; import com.mysema.query.types.expr.ETime; -import com.mysema.query.types.query.BooleanSubQuery; -import com.mysema.query.types.query.ComparableSubQuery; -import com.mysema.query.types.query.DateSubQuery; -import com.mysema.query.types.query.DateTimeSubQuery; -import com.mysema.query.types.query.Detachable; -import com.mysema.query.types.query.ListSubQuery; -import com.mysema.query.types.query.NumberSubQuery; -import com.mysema.query.types.query.ObjectSubQuery; -import com.mysema.query.types.query.StringSubQuery; -import com.mysema.query.types.query.TimeSubQuery; +import com.mysema.query.types.query.*; /** * DetachableQuery is a base class for queries which implement the Query and Detachable interfaces diff --git a/querydsl-core/src/test/java/com/mysema/query/MatchingFilters.java b/querydsl-core/src/test/java/com/mysema/query/MatchingFilters.java index d9bc001e9..a7b78c26b 100644 --- a/querydsl-core/src/test/java/com/mysema/query/MatchingFilters.java +++ b/querydsl-core/src/test/java/com/mysema/query/MatchingFilters.java @@ -9,22 +9,7 @@ import java.util.Collection; import java.util.HashSet; import com.mysema.query.types.Expr; -import com.mysema.query.types.expr.EArray; -import com.mysema.query.types.expr.EBoolean; -import com.mysema.query.types.expr.ECollection; -import com.mysema.query.types.expr.EComparable; -import com.mysema.query.types.expr.EDate; -import com.mysema.query.types.expr.EDateConst; -import com.mysema.query.types.expr.EDateTime; -import com.mysema.query.types.expr.EDateTimeConst; -import com.mysema.query.types.expr.EList; -import com.mysema.query.types.expr.EMap; -import com.mysema.query.types.expr.ENumber; -import com.mysema.query.types.expr.ENumberConst; -import com.mysema.query.types.expr.EString; -import com.mysema.query.types.expr.EStringConst; -import com.mysema.query.types.expr.ETime; -import com.mysema.query.types.expr.ETimeConst; +import com.mysema.query.types.expr.*; /** * @author tiwe diff --git a/querydsl-core/src/test/java/com/mysema/query/QueryExecution.java b/querydsl-core/src/test/java/com/mysema/query/QueryExecution.java index fd647a852..2b92ede49 100644 --- a/querydsl-core/src/test/java/com/mysema/query/QueryExecution.java +++ b/querydsl-core/src/test/java/com/mysema/query/QueryExecution.java @@ -15,16 +15,7 @@ import junit.framework.Assert; import com.mysema.commons.lang.Pair; import com.mysema.query.types.Expr; -import com.mysema.query.types.expr.EArray; -import com.mysema.query.types.expr.EBoolean; -import com.mysema.query.types.expr.ECollection; -import com.mysema.query.types.expr.EDate; -import com.mysema.query.types.expr.EDateTime; -import com.mysema.query.types.expr.EList; -import com.mysema.query.types.expr.EMap; -import com.mysema.query.types.expr.ENumber; -import com.mysema.query.types.expr.EString; -import com.mysema.query.types.expr.ETime; +import com.mysema.query.types.expr.*; /** * The Class StandardTest. diff --git a/querydsl-core/src/test/java/com/mysema/query/QueryModifiersTest.java b/querydsl-core/src/test/java/com/mysema/query/QueryModifiersTest.java index 9b72faeca..cbe4a8b0b 100644 --- a/querydsl-core/src/test/java/com/mysema/query/QueryModifiersTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/QueryModifiersTest.java @@ -5,7 +5,10 @@ */ package com.mysema.query; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import org.junit.Test; diff --git a/querydsl-core/src/test/java/com/mysema/query/codegen/BeanSerializerTest.java b/querydsl-core/src/test/java/com/mysema/query/codegen/BeanSerializerTest.java index b7b11e8c8..fdab0b73f 100644 --- a/querydsl-core/src/test/java/com/mysema/query/codegen/BeanSerializerTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/codegen/BeanSerializerTest.java @@ -1,5 +1,7 @@ package com.mysema.query.codegen; +import static org.junit.Assert.assertTrue; + import java.io.IOException; import java.io.StringWriter; import java.io.Writer; @@ -35,7 +37,7 @@ public class BeanSerializerTest { type.addProperty(new Property(type, "collection", new ClassType(TypeCategory.COLLECTION, Collection.class, typeModel), new String[0])); type.addProperty(new Property(type, "listField", new ClassType(TypeCategory.LIST, List.class, typeModel), new String[0])); type.addProperty(new Property(type, "setField", new ClassType(TypeCategory.SET, Set.class, typeModel), new String[0])); - type.addProperty(new Property(type, "arrayField", new ClassType(TypeCategory.ARRAY, String[].class, typeModel), new String[0])); + type.addProperty(new Property(type, "arrayField", new ClassType(TypeCategory.ARRAY, String[].class), new String[0])); type.addProperty(new Property(type, "mapField", new ClassType(TypeCategory.MAP, List.class, typeModel, typeModel), new String[0])); type.addProperty(new Property(type, "superTypeField", new TypeExtends(new ClassType(TypeCategory.MAP, List.class, typeModel, typeModel)), new String[0])); type.addProperty(new Property(type, "extendsTypeField", new TypeSuper(new ClassType(TypeCategory.MAP, List.class, typeModel, typeModel)), new String[0])); @@ -59,7 +61,23 @@ public class BeanSerializerTest { public void test() throws IOException{ BeanSerializer serializer = new BeanSerializer(); serializer.serialize(type, SimpleSerializerConfig.DEFAULT, new JavaWriter(writer)); - System.out.println(writer); + String str = writer.toString(); + for (String prop : Arrays.asList( + "String[] arrayField;", + "Boolean boolean_;", + "java.util.Collection collection;", + "Comparable comparable;", + "java.util.Date date;", + "DomainClass entityField;", + "Object extendsTypeField;", + "Integer integer;", + "java.util.List listField;", + "java.util.List mapField;", + "java.util.Set setField;", + "java.util.List superTypeField;", + "java.sql.Time time;")){ + assertTrue(prop + " was not contained", str.contains(prop)); + } } } diff --git a/querydsl-core/src/test/java/com/mysema/query/codegen/ClassTypeTest.java b/querydsl-core/src/test/java/com/mysema/query/codegen/ClassTypeTest.java index fe1956f7f..63cbc8289 100644 --- a/querydsl-core/src/test/java/com/mysema/query/codegen/ClassTypeTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/codegen/ClassTypeTest.java @@ -5,8 +5,8 @@ */ package com.mysema.query.codegen; -import static org.junit.Assert.*; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import java.util.Map; @@ -18,22 +18,22 @@ public class ClassTypeTest { @Test public void asArrayType(){ - assertEquals(stringType, stringType.asArrayType().getParameter(0)); + assertEquals(stringType, stringType.asArrayType().getParameter(0)); } @Test public void as(){ - assertEquals(TypeCategory.COMPARABLE, stringType.as(TypeCategory.COMPARABLE).getCategory()); + assertEquals(TypeCategory.COMPARABLE, stringType.as(TypeCategory.COMPARABLE).getCategory()); } @Test public void getParameters(){ - ClassType mapType = new ClassType(TypeCategory.MAP, Map.class, stringType, stringType); - assertEquals(2, mapType.getParameterCount()); - assertEquals(stringType, mapType.getParameter(0)); - assertEquals(stringType, mapType.getParameter(1)); - assertEquals(stringType, mapType.getSelfOrValueType()); - assertFalse(mapType.isPrimitive()); + ClassType mapType = new ClassType(TypeCategory.MAP, Map.class, stringType, stringType); + assertEquals(2, mapType.getParameterCount()); + assertEquals(stringType, mapType.getParameter(0)); + assertEquals(stringType, mapType.getParameter(1)); + assertEquals(stringType, mapType.getSelfOrValueType()); + assertFalse(mapType.isPrimitive()); } } diff --git a/querydsl-core/src/test/java/com/mysema/query/codegen/ConstructorTest.java b/querydsl-core/src/test/java/com/mysema/query/codegen/ConstructorTest.java index 1da298c35..1bf761793 100644 --- a/querydsl-core/src/test/java/com/mysema/query/codegen/ConstructorTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/codegen/ConstructorTest.java @@ -5,7 +5,7 @@ */ package com.mysema.query.codegen; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.Arrays; diff --git a/querydsl-core/src/test/java/com/mysema/query/codegen/MethodTest.java b/querydsl-core/src/test/java/com/mysema/query/codegen/MethodTest.java index 2fb044506..dcec93b70 100644 --- a/querydsl-core/src/test/java/com/mysema/query/codegen/MethodTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/codegen/MethodTest.java @@ -5,7 +5,8 @@ */ package com.mysema.query.codegen; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import org.junit.Test; @@ -15,17 +16,17 @@ public class MethodTest { @Test public void test(){ - Method m1 = new Method(typeFactory.create(String.class), "method", "abc", typeFactory.create(String.class)); - Method m2 = new Method(typeFactory.create(String.class), "method", "abc", typeFactory.create(String.class)); - assertEquals(m1, m1); - assertEquals(m1, m2); - assertEquals(m1.hashCode(), m2.hashCode()); + Method m1 = new Method(typeFactory.create(String.class), "method", "abc", typeFactory.create(String.class)); + Method m2 = new Method(typeFactory.create(String.class), "method", "abc", typeFactory.create(String.class)); + assertEquals(m1, m1); + assertEquals(m1, m2); + assertEquals(m1.hashCode(), m2.hashCode()); } @Test public void createCopy(){ - Method method = new Method(typeFactory.create(String.class), "method", "abc", typeFactory.create(String.class)); - Type typeModel = new SimpleType(TypeCategory.ENTITY, "com.mysema.query.DomainClass", "com.mysema.query", "DomainClass", false); + Method method = new Method(typeFactory.create(String.class), "method", "abc", typeFactory.create(String.class)); + Type typeModel = new SimpleType(TypeCategory.ENTITY, "com.mysema.query.DomainClass", "com.mysema.query", "DomainClass", false); EntityType type = new EntityType("Q", typeModel); assertNotNull(method.createCopy(type)); } diff --git a/querydsl-core/src/test/java/com/mysema/query/codegen/PropertyTest.java b/querydsl-core/src/test/java/com/mysema/query/codegen/PropertyTest.java index c8897bd55..1f9204840 100644 --- a/querydsl-core/src/test/java/com/mysema/query/codegen/PropertyTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/codegen/PropertyTest.java @@ -5,7 +5,7 @@ */ package com.mysema.query.codegen; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; @@ -13,13 +13,13 @@ public class PropertyTest { @Test public void test(){ - Type typeModel = new SimpleType(TypeCategory.ENTITY, "com.mysema.query.DomainClass", "com.mysema.query", "DomainClass", false); + Type typeModel = new SimpleType(TypeCategory.ENTITY, "com.mysema.query.DomainClass", "com.mysema.query", "DomainClass", false); EntityType type = new EntityType("Q", typeModel); - Property p1 = new Property(type, "property", type, new String[0]); - Property p2 = new Property(type, "property", type, new String[0]); - assertEquals(p1, p1); - assertEquals(p1, p2); - assertEquals(p1.hashCode(), p2.hashCode()); + Property p1 = new Property(type, "property", type, new String[0]); + Property p2 = new Property(type, "property", type, new String[0]); + assertEquals(p1, p1); + assertEquals(p1, p2); + assertEquals(p1.hashCode(), p2.hashCode()); } } diff --git a/querydsl-core/src/test/java/com/mysema/query/functions/MathFunctionsTest.java b/querydsl-core/src/test/java/com/mysema/query/functions/MathFunctionsTest.java index 7a9d0b4a7..5c55c20d9 100644 --- a/querydsl-core/src/test/java/com/mysema/query/functions/MathFunctionsTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/functions/MathFunctionsTest.java @@ -5,7 +5,7 @@ */ package com.mysema.query.functions; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; diff --git a/querydsl-core/src/test/java/com/mysema/query/paging/SimpleListSourceTest.java b/querydsl-core/src/test/java/com/mysema/query/paging/SimpleListSourceTest.java index bc794e9ca..01733febc 100644 --- a/querydsl-core/src/test/java/com/mysema/query/paging/SimpleListSourceTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/paging/SimpleListSourceTest.java @@ -5,7 +5,8 @@ */ package com.mysema.query.paging; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import java.util.Arrays; diff --git a/querydsl-core/src/test/java/com/mysema/query/serialization/JavaTemplatesTest.java b/querydsl-core/src/test/java/com/mysema/query/serialization/JavaTemplatesTest.java index ccc34cccd..94addd285 100644 --- a/querydsl-core/src/test/java/com/mysema/query/serialization/JavaTemplatesTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/serialization/JavaTemplatesTest.java @@ -14,7 +14,6 @@ import org.junit.Test; import com.mysema.query.types.Operator; import com.mysema.query.types.Ops; -import com.mysema.query.types.path.PString; public class JavaTemplatesTest { diff --git a/querydsl-core/src/test/java/com/mysema/query/types/custom/CustomTest.java b/querydsl-core/src/test/java/com/mysema/query/types/custom/CustomTest.java index 63e11bdb5..18622e6f4 100644 --- a/querydsl-core/src/test/java/com/mysema/query/types/custom/CustomTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/types/custom/CustomTest.java @@ -5,8 +5,8 @@ */ package com.mysema.query.types.custom; -import static org.junit.Assert.*; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import java.sql.Time; diff --git a/querydsl-core/src/test/java/com/mysema/query/types/expr/EArrayConstructorTest.java b/querydsl-core/src/test/java/com/mysema/query/types/expr/EArrayConstructorTest.java index 99c4387bc..3b09d6059 100644 --- a/querydsl-core/src/test/java/com/mysema/query/types/expr/EArrayConstructorTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/types/expr/EArrayConstructorTest.java @@ -5,7 +5,7 @@ */ package com.mysema.query.types.expr; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; diff --git a/querydsl-core/src/test/java/com/mysema/query/types/expr/EStringEscapeTest.java b/querydsl-core/src/test/java/com/mysema/query/types/expr/EStringEscapeTest.java index 0cadf3987..240ecdeda 100644 --- a/querydsl-core/src/test/java/com/mysema/query/types/expr/EStringEscapeTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/types/expr/EStringEscapeTest.java @@ -5,7 +5,7 @@ */ package com.mysema.query.types.expr; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; diff --git a/querydsl-core/src/test/java/com/mysema/query/types/expr/QTupleTest.java b/querydsl-core/src/test/java/com/mysema/query/types/expr/QTupleTest.java index 0a86bce08..b5286345e 100644 --- a/querydsl-core/src/test/java/com/mysema/query/types/expr/QTupleTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/types/expr/QTupleTest.java @@ -5,7 +5,7 @@ */ package com.mysema.query.types.expr; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; diff --git a/querydsl-core/src/test/java/com/mysema/query/types/query/SubQueryTest.java b/querydsl-core/src/test/java/com/mysema/query/types/query/SubQueryTest.java index c7c56b3c9..133ac2ffc 100644 --- a/querydsl-core/src/test/java/com/mysema/query/types/query/SubQueryTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/types/query/SubQueryTest.java @@ -5,7 +5,8 @@ */ package com.mysema.query.types.query; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.util.Arrays; import java.util.Date;