diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/AbstractProcessorTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/AbstractProcessorTest.java index 8c0e8d251..4f8e425d1 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/apt/AbstractProcessorTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/apt/AbstractProcessorTest.java @@ -13,8 +13,6 @@ */ package com.mysema.query.apt; -import javax.annotation.processing.AbstractProcessor; -import javax.tools.JavaCompiler; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -23,9 +21,13 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import javax.annotation.processing.AbstractProcessor; +import javax.tools.JavaCompiler; + +import org.junit.Assert; + import com.mysema.codegen.SimpleCompiler; import com.mysema.util.FileUtils; -import junit.framework.Assert; public abstract class AbstractProcessorTest { diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/DateExtensionsTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/DateExtensionsTest.java index 45a856917..5014c532a 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/apt/DateExtensionsTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/apt/DateExtensionsTest.java @@ -13,8 +13,8 @@ */ package com.mysema.query.apt; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/EclipseCompilationTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/EclipseCompilationTest.java index 85839086a..099ae4925 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/apt/EclipseCompilationTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/apt/EclipseCompilationTest.java @@ -23,9 +23,8 @@ import java.util.List; import javax.tools.JavaCompiler; -import junit.framework.Assert; - import org.eclipse.jdt.internal.compiler.tool.EclipseCompiler; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/EntityExtensionsTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/EntityExtensionsTest.java index 0cded84ad..b68a09e1d 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/apt/EntityExtensionsTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/apt/EntityExtensionsTest.java @@ -13,8 +13,8 @@ */ package com.mysema.query.apt; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/IncrementalCompilationTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/IncrementalCompilationTest.java index 8220935b3..0befa3501 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/apt/IncrementalCompilationTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/apt/IncrementalCompilationTest.java @@ -13,8 +13,8 @@ */ package com.mysema.query.apt; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryTemplates.java b/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryTemplates.java index c3315761b..08d3985e8 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryTemplates.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/CollQueryTemplates.java @@ -25,6 +25,7 @@ import com.mysema.query.types.PathType; */ public class CollQueryTemplates extends JavaTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //intentional public static final CollQueryTemplates DEFAULT = new CollQueryTemplates(); protected CollQueryTemplates() { diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/JodaTimeTemplates.java b/querydsl-collections/src/main/java/com/mysema/query/collections/JodaTimeTemplates.java index 4ca361786..9267fcbae 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/JodaTimeTemplates.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/JodaTimeTemplates.java @@ -24,7 +24,8 @@ import com.mysema.query.types.Ops; */ public class JodaTimeTemplates extends CollQueryTemplates { - public static final CollQueryTemplates DEFAULT = new JodaTimeTemplates(); + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final JodaTimeTemplates DEFAULT = new JodaTimeTemplates(); protected JodaTimeTemplates() { add(Ops.DateTimeOps.YEAR, "{0}.getYear()"); diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/GroupByTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/GroupByTest.java index 337de6914..2a1e75e56 100644 --- a/querydsl-collections/src/test/java/com/mysema/query/collections/GroupByTest.java +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/GroupByTest.java @@ -22,7 +22,7 @@ import static com.mysema.query.group.GroupBy.max; import static com.mysema.query.group.GroupBy.min; import static com.mysema.query.group.GroupBy.set; import static com.mysema.query.group.GroupBy.sum; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/querydsl-collections/src/test/java/com/mysema/query/collections/TemplatesTest.java b/querydsl-collections/src/test/java/com/mysema/query/collections/TemplatesTest.java new file mode 100644 index 000000000..32ac70db1 --- /dev/null +++ b/querydsl-collections/src/test/java/com/mysema/query/collections/TemplatesTest.java @@ -0,0 +1,22 @@ +/* + * Copyright 2014 Timo Westkämper. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.mysema.query.collections; + +import com.mysema.query.TemplatesTestBase; + +public class TemplatesTest extends TemplatesTestBase { + +} diff --git a/querydsl-core/src/main/java/com/mysema/query/types/JavaTemplates.java b/querydsl-core/src/main/java/com/mysema/query/types/JavaTemplates.java index bdc7fedd5..4ffdda7d8 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/JavaTemplates.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/JavaTemplates.java @@ -25,6 +25,9 @@ import java.lang.reflect.Field; */ public class JavaTemplates extends Templates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final JavaTemplates DEFAULT = new JavaTemplates(); + public JavaTemplates() { add(Ops.EQ, "{0} == {1}"); add(Ops.IS_NULL, "{0} == null"); 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 0870248e7..2fa6a52bf 100644 --- a/querydsl-core/src/test/java/com/mysema/query/QueryExecution.java +++ b/querydsl-core/src/test/java/com/mysema/query/QueryExecution.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.mysema.commons.lang.Pair; import com.mysema.query.support.QueryBase; diff --git a/querydsl-core/src/test/java/com/mysema/query/TemplatesTestBase.java b/querydsl-core/src/test/java/com/mysema/query/TemplatesTestBase.java new file mode 100644 index 000000000..fcc197440 --- /dev/null +++ b/querydsl-core/src/test/java/com/mysema/query/TemplatesTestBase.java @@ -0,0 +1,64 @@ +/* + * Copyright 2014 Timo Westkämper. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.mysema.query; + +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.reflections.ReflectionUtils.*; + +import java.util.Set; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ErrorCollector; +import org.reflections.Reflections; + +import com.google.common.base.Predicate; +import com.mysema.query.types.Templates; + +public class TemplatesTestBase { + + @Rule + public final ErrorCollector errorCollector = new ErrorCollector(); + + private final Reflections querydsl = new Reflections( + TemplatesTestBase.class.getPackage().getName()); + + private final String modulePrefix = getClass().getPackage().getName(); + + @Test + public void Default_Instance() { + Set> templates = querydsl.getSubTypesOf(Templates.class); + Set> moduleSpecific = getAll(templates, topLevelClass, + withPattern("class " + modulePrefix + ".*")); + + for (Class template : moduleSpecific) { + try { + Templates defaultInstance = (Templates) template.getField("DEFAULT").get(null); + errorCollector.checkThat(defaultInstance, instanceOf(template)); + } catch (Exception ex) { + errorCollector.addError(ex); + } + } + } + private static final Predicate> topLevelClass = new Predicate>() { + + @Override + public boolean apply(Class input) { + return !input.isAnonymousClass() + && !input.isMemberClass(); + } + }; +} diff --git a/querydsl-core/src/test/java/com/mysema/query/group/GroupByIterateTest.java b/querydsl-core/src/test/java/com/mysema/query/group/GroupByIterateTest.java index e99ecfaf0..b977106d4 100644 --- a/querydsl-core/src/test/java/com/mysema/query/group/GroupByIterateTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/group/GroupByIterateTest.java @@ -18,7 +18,7 @@ import static com.mysema.query.group.GroupBy.groupBy; import static com.mysema.query.group.GroupBy.list; import static com.mysema.query.group.GroupBy.map; import static com.mysema.query.group.GroupBy.set; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/querydsl-core/src/test/java/com/mysema/query/group/GroupByListTest.java b/querydsl-core/src/test/java/com/mysema/query/group/GroupByListTest.java index ec650e7f4..c06ab3cbb 100644 --- a/querydsl-core/src/test/java/com/mysema/query/group/GroupByListTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/group/GroupByListTest.java @@ -18,7 +18,7 @@ import static com.mysema.query.group.GroupBy.groupBy; import static com.mysema.query.group.GroupBy.list; import static com.mysema.query.group.GroupBy.map; import static com.mysema.query.group.GroupBy.set; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/querydsl-core/src/test/java/com/mysema/query/group/GroupByMapTest.java b/querydsl-core/src/test/java/com/mysema/query/group/GroupByMapTest.java index ba970b353..9adbf37a4 100644 --- a/querydsl-core/src/test/java/com/mysema/query/group/GroupByMapTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/group/GroupByMapTest.java @@ -18,7 +18,7 @@ import static com.mysema.query.group.GroupBy.groupBy; import static com.mysema.query.group.GroupBy.list; import static com.mysema.query.group.GroupBy.map; import static com.mysema.query.group.GroupBy.set; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLTemplates.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLTemplates.java index 0844765f1..8a6873860 100644 --- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLTemplates.java +++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQLTemplates.java @@ -24,6 +24,7 @@ import com.mysema.query.types.Ops; */ public final class JDOQLTemplates extends JavaTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional public static final JDOQLTemplates DEFAULT = new JDOQLTemplates(); protected JDOQLTemplates() { diff --git a/querydsl-jdo/src/test/java/com/mysema/query/jdo/TemplatesTest.java b/querydsl-jdo/src/test/java/com/mysema/query/jdo/TemplatesTest.java new file mode 100644 index 000000000..f4df55e61 --- /dev/null +++ b/querydsl-jdo/src/test/java/com/mysema/query/jdo/TemplatesTest.java @@ -0,0 +1,22 @@ +/* + * Copyright 2014 Timo Westkämper. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.mysema.query.jdo; + +import com.mysema.query.TemplatesTestBase; + +public class TemplatesTest extends TemplatesTestBase { + +} diff --git a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/codegen/CompileUtils.java b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/codegen/CompileUtils.java index c4374fa2a..07574246e 100644 --- a/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/codegen/CompileUtils.java +++ b/querydsl-jpa-codegen/src/test/java/com/mysema/query/jpa/codegen/CompileUtils.java @@ -5,8 +5,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import org.junit.Assert; + import com.mysema.codegen.SimpleCompiler; -import junit.framework.Assert; public class CompileUtils { diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/TemplatesTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/TemplatesTest.java new file mode 100644 index 000000000..55e277433 --- /dev/null +++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/TemplatesTest.java @@ -0,0 +1,22 @@ +/* + * Copyright 2014 Timo Westkämper. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.mysema.query.jpa; + +import com.mysema.query.TemplatesTestBase; + +public class TemplatesTest extends TemplatesTestBase { + +} diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/JoinTest.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/JoinTest.java index 295bf2d64..410ebc88f 100644 --- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/JoinTest.java +++ b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/JoinTest.java @@ -1,7 +1,15 @@ package com.mysema.query.mongodb; +import static org.junit.Assert.*; + import java.net.UnknownHostException; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.mongodb.morphia.Datastore; +import org.mongodb.morphia.Morphia; + import com.mongodb.Mongo; import com.mongodb.MongoException; import com.mysema.query.mongodb.domain.Item; @@ -10,13 +18,6 @@ import com.mysema.query.mongodb.domain.User; import com.mysema.query.mongodb.morphia.MorphiaQuery; import com.mysema.query.types.Predicate; import com.mysema.testutil.ExternalDB; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.mongodb.morphia.Datastore; -import org.mongodb.morphia.Morphia; -import static junit.framework.Assert.assertEquals; -import static org.junit.Assert.*; @Category(ExternalDB.class) public class JoinTest { diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbQueryTest.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbQueryTest.java index ca21b08ed..ceef48d9f 100644 --- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbQueryTest.java +++ b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbQueryTest.java @@ -13,9 +13,19 @@ */ package com.mysema.query.mongodb; +import static java.util.Arrays.asList; +import static org.junit.Assert.*; + import java.net.UnknownHostException; import java.util.*; +import org.bson.types.ObjectId; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.mongodb.morphia.Datastore; +import org.mongodb.morphia.Morphia; + import com.google.common.collect.Lists; import com.mongodb.Mongo; import com.mongodb.MongoException; @@ -30,16 +40,6 @@ import com.mysema.query.types.OrderSpecifier; import com.mysema.query.types.Predicate; import com.mysema.query.types.path.StringPath; import com.mysema.testutil.ExternalDB; -import org.bson.types.ObjectId; -import org.junit.Before; -import org.junit.Test; -import org.junit.experimental.categories.Category; -import org.mongodb.morphia.Datastore; -import org.mongodb.morphia.Morphia; -import static java.util.Arrays.asList; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static org.junit.Assert.*; @Category(ExternalDB.class) public class MongodbQueryTest { diff --git a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbSerializerTest.java b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbSerializerTest.java index eea1a9960..bcca44761 100644 --- a/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbSerializerTest.java +++ b/querydsl-mongodb/src/test/java/com/mysema/query/mongodb/MongodbSerializerTest.java @@ -13,13 +13,16 @@ */ package com.mysema.query.mongodb; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.sql.Timestamp; import java.util.Arrays; import java.util.Date; import java.util.List; +import org.junit.Before; +import org.junit.Test; + import com.mongodb.BasicDBList; import com.mongodb.BasicDBObject; import com.mongodb.DBObject; @@ -30,9 +33,6 @@ import com.mysema.query.types.Expression; import com.mysema.query.types.OrderSpecifier; import com.mysema.query.types.path.*; -import org.junit.Before; -import org.junit.Test; - public class MongodbSerializerTest { private PathBuilder entityPath; diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml index ca9835c15..ed0d6b04a 100644 --- a/querydsl-root/pom.xml +++ b/querydsl-root/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 @@ -80,6 +80,12 @@ + + org.reflections + reflections + 0.9.9 + test + @@ -575,4 +581,4 @@ - + diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataExporterTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataExporterTest.java index 23702cbe6..055fcd64a 100644 --- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataExporterTest.java +++ b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataExporterTest.java @@ -13,7 +13,8 @@ */ package com.mysema.query.sql.codegen; -import javax.tools.JavaCompiler; +import static org.junit.Assert.*; + import java.io.File; import java.io.IOException; import java.sql.*; @@ -22,13 +23,14 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import javax.tools.JavaCompiler; + +import org.junit.*; + import com.mysema.codegen.SimpleCompiler; import com.mysema.query.codegen.BeanSerializer; import com.mysema.query.codegen.Serializer; import com.mysema.util.FileUtils; -import junit.framework.Assert; -import org.junit.*; -import static org.junit.Assert.*; public class MetaDataExporterTest { diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataSerializerTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataSerializerTest.java index 09a5b71e8..861d2bb0a 100644 --- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataSerializerTest.java +++ b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataSerializerTest.java @@ -19,8 +19,7 @@ import java.util.Set; import javax.tools.JavaCompiler; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/CUBRIDTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/CUBRIDTemplates.java index 03e8b94f7..ad6a2ff7f 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/CUBRIDTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/CUBRIDTemplates.java @@ -27,6 +27,9 @@ import com.mysema.query.types.Ops; */ public class CUBRIDTemplates extends SQLTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final CUBRIDTemplates DEFAULT = new CUBRIDTemplates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/DerbyTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/DerbyTemplates.java index 30bdb54a0..105b9ffba 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/DerbyTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/DerbyTemplates.java @@ -27,6 +27,9 @@ import com.mysema.query.types.Ops; */ public class DerbyTemplates extends SQLTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final DerbyTemplates DEFAULT = new DerbyTemplates(); + private String limitOffsetTemplate = "\noffset {1s} rows fetch next {0s} rows only"; private String limitTemplate = "\nfetch first {0s} rows only"; diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/FirebirdTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/FirebirdTemplates.java index c4601b15e..9000c8eaf 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/FirebirdTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/FirebirdTemplates.java @@ -8,6 +8,9 @@ import com.mysema.query.types.Ops; public class FirebirdTemplates extends SQLTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final FirebirdTemplates DEFAULT = new FirebirdTemplates(); + private String limitOffsetTemplate = "\nrows {0} to {1}"; private String limitTemplate = "\nrows {0}"; diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/H2Templates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/H2Templates.java index 39e2bfece..d4131ae68 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/H2Templates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/H2Templates.java @@ -25,6 +25,9 @@ import com.mysema.query.types.Ops; */ public class H2Templates extends SQLTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final H2Templates DEFAULT = new H2Templates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/HSQLDBTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/HSQLDBTemplates.java index 313d4cb29..1db541789 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/HSQLDBTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/HSQLDBTemplates.java @@ -25,6 +25,9 @@ import com.mysema.query.types.Ops; */ public class HSQLDBTemplates extends SQLTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final HSQLDBTemplates DEFAULT = new HSQLDBTemplates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/MySQLTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/MySQLTemplates.java index 242b658c5..049c0340c 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/MySQLTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/MySQLTemplates.java @@ -74,6 +74,9 @@ public class MySQLTemplates extends SQLTemplates { "VARCHAR", "VARCHARACTER", "VARYING", "WHEN", "WHERE", "WHILE", "WITH", "WRITE", "XOR", "YEAR_MONTH", "ZEROFILL"); + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final MySQLTemplates DEFAULT = new MySQLTemplates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/OracleTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/OracleTemplates.java index 42d2c1231..d2871f1a7 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/OracleTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/OracleTemplates.java @@ -33,6 +33,9 @@ import com.mysema.query.types.Path; */ public class OracleTemplates extends SQLTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final OracleTemplates DEFAULT = new OracleTemplates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/PostgresTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/PostgresTemplates.java index a28dd2bd9..5dbee7332 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/PostgresTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/PostgresTemplates.java @@ -50,6 +50,9 @@ public class PostgresTemplates extends SQLTemplates { "TRAILING", "TRUE", "UNION", "UNIQUE", "USER", "USING", "VARIADIC", "VERBOSE", "WHEN", "WHERE", "WINDOW", "WITH"); + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final PostgresTemplates DEFAULT = new PostgresTemplates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java index fdb806727..4bd4ca8b9 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java @@ -13,16 +13,20 @@ */ package com.mysema.query.sql; -import javax.annotation.Nullable; import java.util.*; +import javax.annotation.Nullable; + import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.mysema.commons.lang.Pair; -import com.mysema.query.*; +import com.mysema.query.JoinExpression; +import com.mysema.query.JoinFlag; +import com.mysema.query.QueryFlag; import com.mysema.query.QueryFlag.Position; +import com.mysema.query.QueryMetadata; import com.mysema.query.sql.types.Null; import com.mysema.query.support.Expressions; import com.mysema.query.support.SerializerBase; @@ -268,7 +272,7 @@ public class SQLSerializer extends SerializerBase { append(templates.getFrom()); append("("); append(templates.getSelect()); - append("1 "); + append("1 as one "); suffix = ") internal"; } diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2005Templates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2005Templates.java index e681dba81..3777c8733 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2005Templates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2005Templates.java @@ -34,6 +34,9 @@ import com.mysema.query.types.Path; */ public class SQLServer2005Templates extends SQLServerTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final SQLServer2005Templates DEFAULT = new SQLServer2005Templates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2008Templates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2008Templates.java index e361821f2..242e63b58 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2008Templates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2008Templates.java @@ -22,6 +22,9 @@ package com.mysema.query.sql; */ public class SQLServer2008Templates extends SQLServer2005Templates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final SQLServer2008Templates DEFAULT = new SQLServer2008Templates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2012Templates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2012Templates.java index fd4e79827..8cd3315a4 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2012Templates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2012Templates.java @@ -27,6 +27,9 @@ import com.mysema.query.support.Expressions; */ public class SQLServer2012Templates extends SQLServerTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final SQLServer2012Templates DEFAULT = new SQLServer2012Templates(); + private String topTemplate = "top {0s} "; private String limitOffsetTemplate = "\noffset {1} rows fetch next {0} rows only"; diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServerTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServerTemplates.java index 782daf07c..fd2dfe5d0 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServerTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServerTemplates.java @@ -30,6 +30,9 @@ import com.mysema.query.types.Ops; */ public class SQLServerTemplates extends SQLTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final SQLServerTemplates DEFAULT = new SQLServerTemplates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLTemplates.java index cf70e77c8..20c18deb4 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLTemplates.java @@ -112,6 +112,7 @@ public class SQLTemplates extends Templates { public static final Expression RECURSIVE = TemplateExpressionImpl.create(Object.class, ""); + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional public static final SQLTemplates DEFAULT = new SQLTemplates("\"",'\\',false); private static final CharMatcher NON_UNDERSCORE_ALPHA_NUMERIC = diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLiteTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLiteTemplates.java index df5d8cca0..23da12b8f 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLiteTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLiteTemplates.java @@ -34,6 +34,9 @@ public class SQLiteTemplates extends SQLTemplates { private static final DateTimeFormatter timeFormatter = DateTimeFormat.forPattern("HH:mm:ss"); + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final SQLiteTemplates DEFAULT = new SQLiteTemplates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/TeradataTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/TeradataTemplates.java index 19938823b..aafd12a6d 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/TeradataTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/TeradataTemplates.java @@ -26,6 +26,9 @@ import com.mysema.query.types.Ops; */ public class TeradataTemplates extends SQLTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final TeradataTemplates DEFAULT = new TeradataTemplates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeoDBTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeoDBTemplates.java index ba3657e2d..fb5d08e36 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeoDBTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeoDBTemplates.java @@ -24,6 +24,9 @@ import com.mysema.query.sql.SQLTemplates; */ public class GeoDBTemplates extends H2Templates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final GeoDBTemplates DEFAULT = new GeoDBTemplates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/MySQLSpatialTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/MySQLSpatialTemplates.java index eaf2431a4..9d7ffb4d8 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/MySQLSpatialTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/MySQLSpatialTemplates.java @@ -25,6 +25,9 @@ import com.mysema.query.sql.SQLTemplates; */ public class MySQLSpatialTemplates extends MySQLTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final MySQLSpatialTemplates DEFAULT = new MySQLSpatialTemplates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/OracleSpatialTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/OracleSpatialTemplates.java index 6f7faef1e..fb752830d 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/OracleSpatialTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/OracleSpatialTemplates.java @@ -22,6 +22,9 @@ import com.mysema.query.sql.SQLTemplates; */ public class OracleSpatialTemplates extends OracleTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final OracleSpatialTemplates DEFAULT = new OracleSpatialTemplates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PostGISTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PostGISTemplates.java index 142318362..f1b9d6b56 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PostGISTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PostGISTemplates.java @@ -25,6 +25,9 @@ import com.mysema.query.sql.SQLTemplates; */ public class PostGISTemplates extends PostgresTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final PostGISTemplates DEFAULT = new PostGISTemplates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServer2008SpatialTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServer2008SpatialTemplates.java index 7c9c9dd7d..a9d3809a8 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServer2008SpatialTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/SQLServer2008SpatialTemplates.java @@ -25,6 +25,9 @@ import com.mysema.query.sql.SQLTemplates; */ public class SQLServer2008SpatialTemplates extends SQLServer2008Templates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final SQLServer2008SpatialTemplates DEFAULT = new SQLServer2008SpatialTemplates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/TeradataSpatialTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/TeradataSpatialTemplates.java index b64dc6fae..bfc7dcce4 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/TeradataSpatialTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/TeradataSpatialTemplates.java @@ -27,6 +27,9 @@ import com.mysema.query.sql.types.StringAsObjectType; */ public class TeradataSpatialTemplates extends TeradataTemplates { + @SuppressWarnings("FieldNameHidesFieldInSuperclass") //Intentional + public static final TeradataSpatialTemplates DEFAULT = new TeradataSpatialTemplates(); + public static Builder builder() { return new Builder() { @Override diff --git a/querydsl-sql/src/test/java/com/mysema/query/InsertBase.java b/querydsl-sql/src/test/java/com/mysema/query/InsertBase.java index f12b6a926..a49420a7d 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/InsertBase.java +++ b/querydsl-sql/src/test/java/com/mysema/query/InsertBase.java @@ -13,10 +13,22 @@ */ package com.mysema.query; +import static com.mysema.query.Constants.survey; +import static com.mysema.query.Constants.survey2; +import static com.mysema.query.Target.*; +import static org.junit.Assert.*; + import java.sql.ResultSet; import java.sql.SQLException; import java.util.UUID; +import org.joda.time.DateTime; +import org.joda.time.LocalDate; +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + import com.mysema.query.QueryFlag.Position; import com.mysema.query.sql.SQLSubQuery; import com.mysema.query.sql.dml.DefaultMapper; @@ -29,16 +41,6 @@ import com.mysema.query.types.PathImpl; import com.mysema.query.types.expr.Param; import com.mysema.testutil.ExcludeIn; import com.mysema.testutil.IncludeIn; -import org.joda.time.DateTime; -import org.joda.time.LocalDate; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import static com.mysema.query.Constants.survey; -import static com.mysema.query.Constants.survey2; -import static com.mysema.query.Target.*; -import static org.junit.Assert.*; public class InsertBase extends AbstractBaseTest { @@ -435,7 +437,7 @@ public class InsertBase extends AbstractBaseTest { public void XML() { delete(QXmlTest.xmlTest).execute(); QXmlTest xmlTest = QXmlTest.xmlTest; - String contents = ""; + String contents = "ab"; insert(xmlTest).set(xmlTest.col, contents).execute(); assertEquals(contents, query().from(xmlTest).singleResult(xmlTest.col)); } diff --git a/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java b/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java index ef5a65ce1..e5a872cd5 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java +++ b/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java @@ -28,6 +28,7 @@ import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.joda.time.LocalDateTime; import org.joda.time.LocalTime; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -51,8 +52,6 @@ import com.mysema.query.types.template.NumberTemplate; import com.mysema.testutil.ExcludeIn; import com.mysema.testutil.IncludeIn; -import junit.framework.Assert; - public class SelectBase extends AbstractBaseTest { private static final Expression[] NO_EXPRESSIONS = new Expression[0]; @@ -628,7 +627,7 @@ public class SelectBase extends AbstractBaseTest { } @Test - @ExcludeIn({FIREBIRD}) + @ExcludeIn({FIREBIRD, SQLSERVER}) public void GroupBy_Distinct_Count() { List ids = query().from(employee).groupBy(employee.id).distinct().list(NumberTemplate.ONE); SearchResults results = query().from(employee).groupBy(employee.id) diff --git a/querydsl-sql/src/test/java/com/mysema/query/SelectOracleBase.java b/querydsl-sql/src/test/java/com/mysema/query/SelectOracleBase.java index 42fde08d0..e58a49a3f 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/SelectOracleBase.java +++ b/querydsl-sql/src/test/java/com/mysema/query/SelectOracleBase.java @@ -1,18 +1,20 @@ package com.mysema.query; +import static com.mysema.query.Constants.employee; +import static com.mysema.query.Target.ORACLE; +import static com.mysema.query.sql.oracle.OracleGrammar.level; + import java.sql.SQLException; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + import com.mysema.query.sql.SQLExpressions; import com.mysema.query.sql.SQLSerializer; import com.mysema.query.sql.domain.QEmployee; import com.mysema.query.sql.oracle.OracleQuery; import com.mysema.testutil.IncludeIn; -import junit.framework.Assert; -import org.junit.Ignore; -import org.junit.Test; -import static com.mysema.query.Constants.employee; -import static com.mysema.query.Target.ORACLE; -import static com.mysema.query.sql.oracle.OracleGrammar.level; public class SelectOracleBase extends AbstractBaseTest { diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/TemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/TemplatesTest.java index 53c77bfef..cd5927868 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/sql/TemplatesTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/sql/TemplatesTest.java @@ -15,7 +15,9 @@ package com.mysema.query.sql; import org.junit.Test; -public class TemplatesTest { +import com.mysema.query.TemplatesTestBase; + +public class TemplatesTest extends TemplatesTestBase { @Test public void test() {