diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/Wildcard.java b/querydsl-sql/src/main/java/com/mysema/query/sql/Wildcard.java deleted file mode 100644 index 298c4f80c..000000000 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/Wildcard.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2010 Mysema Ltd. - * All rights reserved. - * - */ -package com.mysema.query.sql; - -import com.mysema.query.types.expr.NumberExpression; -import com.mysema.query.types.expr.SimpleExpression; -import com.mysema.query.types.template.SimpleTemplate; - -/** - * Wildcard provides shortcuts for the wildcard (*) and wildcard count (count(*)) expressions - * - * @deprecated use com.mysema.query.types.expr.Wildcard instead - * - * @author sasa - * - */ -@Deprecated -public final class Wildcard { - - private static final long serialVersionUID = -675749944676437551L; - - public static final SimpleExpression all = SimpleTemplate.create(Object[].class, "*"); - - private Wildcard() {} - - public static NumberExpression count() { - return all.count(); - } - -} diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/ant/AntMetaDataExporter.java b/querydsl-sql/src/main/java/com/mysema/query/sql/ant/AntMetaDataExporter.java index 6bcf5c5c8..2de08c556 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/ant/AntMetaDataExporter.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/ant/AntMetaDataExporter.java @@ -9,10 +9,8 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import com.mysema.query.codegen.BeanSerializer; -import com.mysema.query.codegen.Serializer; import com.mysema.query.sql.DefaultNamingStrategy; import com.mysema.query.sql.MetaDataExporter; -import com.mysema.query.sql.MetaDataSerializer; import com.mysema.query.sql.NamingStrategy; /** diff --git a/querydsl-sql/src/test/java/com/mysema/query/SelectBaseTest.java b/querydsl-sql/src/test/java/com/mysema/query/SelectBaseTest.java index e87b6c1e8..413bafbf0 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/SelectBaseTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/SelectBaseTest.java @@ -43,7 +43,6 @@ import com.mysema.query.sql.SQLQuery; import com.mysema.query.sql.SQLSerializer; import com.mysema.query.sql.SQLSubQuery; import com.mysema.query.sql.SQLTemplates; -import com.mysema.query.sql.Wildcard; import com.mysema.query.sql.domain.Employee; import com.mysema.query.sql.domain.IdName; import com.mysema.query.sql.domain.QEmployee; @@ -54,6 +53,7 @@ import com.mysema.query.types.expr.BooleanExpression; import com.mysema.query.types.expr.Coalesce; import com.mysema.query.types.expr.NumberExpression; import com.mysema.query.types.expr.Param; +import com.mysema.query.types.expr.Wildcard; import com.mysema.query.types.path.NumberPath; import com.mysema.query.types.path.PathBuilder; import com.mysema.query.types.query.ListSubQuery; @@ -246,7 +246,7 @@ public abstract class SelectBaseTest extends AbstractBaseTest{ public void Count_All() { expectedQuery = "select count(*) as rowCount from EMPLOYEE2 e"; NumberPath rowCount = new NumberPath(Long.class, "rowCount"); - query().from(employee).uniqueResult(Wildcard.count().as(rowCount)); + query().from(employee).uniqueResult(Wildcard.count.as(rowCount)); } @Test