Fix imports

Author: velo

querydsl-jpa/src/test/java/com/querydsl/jpa/AbstractSQLTest.java

@@ -16,7 +16,7 @@
 import com.querydsl.jpa.domain.Color;
 import com.querydsl.jpa.domain.QCat;
 import com.querydsl.jpa.domain.QCompany;
-import com.querydsl.jpa.domain.sql.SAnimal;
+import com.querydsl.jpa.domain.sql.SAnimal_;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Collections;
@@ -27,7 +27,7 @@
 
 public abstract class AbstractSQLTest {
 
-  protected static final SAnimal cat = new SAnimal("cat");
+  protected static final SAnimal_ cat = new SAnimal_("cat");
 
   protected abstract AbstractSQLQuery<?, ?> query();
 
@@ -95,7 +95,7 @@ public void entityQueries() {
 
   @Test
   public void entityQueries2() {
-    SAnimal mate = new SAnimal("mate");
+    SAnimal_ mate = new SAnimal_("mate");
     QCat catEntity = QCat.cat;
 
     List<Cat> cats =
@@ -136,7 +136,7 @@ public void entityQueries4() {
   @NoEclipseLink
   public void entityQueries5() {
     QCat catEntity = QCat.cat;
-    SAnimal otherCat = new SAnimal("otherCat");
+    SAnimal_ otherCat = new SAnimal_("otherCat");
     QCat otherCatEntity = new QCat("otherCat");
     List<Tuple> cats = query().from(cat, otherCat).select(catEntity, otherCatEntity).fetch();
     assertThat(cats).hasSize(36);
@@ -225,7 +225,7 @@ public void list_multiple() {
         query()
             .from(cat)
             .where(cat.dtype.eq("C"))
-            .select(cat.id, cat.name, cat.bodyWeight)
+            .select(cat.id, cat.name, cat.bodyweight)
             .fetch());
   }
 
@@ -301,7 +301,7 @@ private void print(Iterable<Tuple> rows) {
 
   @Test
   public void projections_duplicateColumns() {
-    SAnimal cat = new SAnimal("cat");
+    SAnimal_ cat = new SAnimal_("cat");
     assertThat(query().from(cat).select(Projections.list(cat.count(), cat.count())).fetch())
         .hasSize(1);
   }
@@ -365,7 +365,7 @@ public void union2() {
   @ExcludeIn(Target.DERBY)
   @Ignore // FIXME
   public void union3() {
-    SAnimal cat2 = new SAnimal("cat2");
+    SAnimal_ cat2 = new SAnimal_("cat2");
     List<Tuple> rows =
         query()
             .union(
@@ -402,7 +402,7 @@ public void union4() {
   @Test
   @ExcludeIn({Target.DERBY, Target.ORACLE})
   public void union5() {
-    SAnimal cat2 = new SAnimal("cat2");
+    SAnimal_ cat2 = new SAnimal_("cat2");
     List<Tuple> rows =
         query()
             .union(

querydsl-jpa/src/test/java/com/querydsl/jpa/HibernateSQLBase.java

@@ -20,7 +20,7 @@
 import com.querydsl.jpa.domain.Cat;
 import com.querydsl.jpa.domain.Color;
 import com.querydsl.jpa.domain.QCat;
-import com.querydsl.jpa.domain.sql.SAnimal;
+import com.querydsl.jpa.domain.sql.SAnimal_;
 import com.querydsl.jpa.hibernate.sql.HibernateSQLQuery;
 import com.querydsl.jpa.testutil.HibernateTestRunner;
 import com.querydsl.sql.SQLTemplates;
@@ -40,7 +40,7 @@ public class HibernateSQLBase extends AbstractSQLTest implements HibernateTest {
 
   private final SQLTemplates templates = Mode.getSQLTemplates();
 
-  private final SAnimal cat = new SAnimal("cat");
+  private final SAnimal_ cat = new SAnimal_("cat");
 
   private Session session;
 
@@ -69,7 +69,7 @@ public void setUp() {
 
   @Test
   public void entityQueries_createQuery() {
-    SAnimal cat = new SAnimal("cat");
+    SAnimal_ cat = new SAnimal_("cat");
     QCat catEntity = QCat.cat;
 
     Query query = query().from(cat).select(catEntity).createQuery();
@@ -79,7 +79,7 @@ public void entityQueries_createQuery() {
   @Test
   @ExcludeIn(Target.MYSQL)
   public void entityQueries_createQuery2() {
-    SAnimal cat = new SAnimal("CAT");
+    SAnimal_ cat = new SAnimal_("CAT");
     QCat catEntity = QCat.cat;
 
     Query query = query().from(cat).select(catEntity).createQuery();

querydsl-jpa/src/test/java/com/querydsl/jpa/JPAQueryMutabilityTest.java

@@ -18,7 +18,7 @@
 
 import com.querydsl.core.QueryMutability;
 import com.querydsl.jpa.domain.Cat;
-import com.querydsl.jpa.domain.sql.SAnimal;
+import com.querydsl.jpa.domain.sql.SAnimal_;
 import com.querydsl.jpa.sql.JPASQLQuery;
 import com.querydsl.jpa.testutil.JPATestRunner;
 import com.querydsl.sql.DerbyTemplates;
@@ -58,14 +58,14 @@ public void test()
     entityManager.persist(new Cat("Beck", 1));
     entityManager.flush();
 
-    SAnimal cat = new SAnimal("cat");
+    SAnimal_ cat = new SAnimal_("cat");
     JPASQLQuery<?> query = query().from(cat);
     new QueryMutability(query).test(cat.id, cat.name);
   }
 
   @Test
   public void clone_() {
-    SAnimal cat = new SAnimal("cat");
+    SAnimal_ cat = new SAnimal_("cat");
     JPASQLQuery<?> query = query().from(cat).where(cat.name.isNotNull());
     JPASQLQuery<?> query2 = query.clone(entityManager);
     assertThat(query2.getMetadata().getJoins()).isEqualTo(query.getMetadata().getJoins());

querydsl-jpa/src/test/java/com/querydsl/jpa/JPASQLBase.java

@@ -22,7 +22,7 @@
 import com.querydsl.jpa.domain.Cat;
 import com.querydsl.jpa.domain.Color;
 import com.querydsl.jpa.domain.QCat;
-import com.querydsl.jpa.domain.sql.SAnimal;
+import com.querydsl.jpa.domain.sql.SAnimal_;
 import com.querydsl.jpa.sql.JPASQLQuery;
 import com.querydsl.jpa.testutil.JPATestRunner;
 import com.querydsl.sql.SQLTemplates;
@@ -49,7 +49,7 @@ public class JPASQLBase extends AbstractSQLTest implements JPATest {
 
   private EntityManager entityManager;
 
-  private final SAnimal cat = new SAnimal("cat");
+  private final SAnimal_ cat = new SAnimal_("cat");
   private final QCat catEntity = QCat.cat;
 
   @Override
@@ -98,7 +98,7 @@ public void entityQueries_createQuery() {
   @Test
   @ExcludeIn(Target.MYSQL)
   public void entityQueries_createQuery2() {
-    SAnimal cat = new SAnimal("CAT");
+    SAnimal_ cat = new SAnimal_("CAT");
 
     Query query = query().from(cat).select(catEntity).createQuery();
     assertThat(query.getResultList()).hasSize(6);

querydsl-jpa/src/test/java/com/querydsl/jpa/NativeSQLSerializerTest.java

@@ -18,7 +18,7 @@
 import com.querydsl.core.DefaultQueryMetadata;
 import com.querydsl.core.JoinType;
 import com.querydsl.core.types.dsl.PathBuilder;
-import com.querydsl.jpa.domain.sql.SAnimal;
+import com.querydsl.jpa.domain.sql.SAnimal_;
 import com.querydsl.sql.Configuration;
 import com.querydsl.sql.MySQLTemplates;
 import jakarta.persistence.Column;
@@ -38,7 +38,7 @@ public void in() {
     Configuration conf = new Configuration(new MySQLTemplates());
     NativeSQLSerializer serializer = new NativeSQLSerializer(conf, true);
     DefaultQueryMetadata md = new DefaultQueryMetadata();
-    SAnimal cat = SAnimal.animal_;
+    SAnimal_ cat = SAnimal_.animal_;
     md.addJoin(JoinType.DEFAULT, cat);
     md.addWhere(cat.name.in("X", "Y"));
     md.setProjection(cat.id);

querydsl-jpa/src/test/java/com/querydsl/jpa/QueryMutabilityTest.java

@@ -17,7 +17,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.querydsl.core.QueryMutability;
-import com.querydsl.jpa.domain.sql.SAnimal;
+import com.querydsl.jpa.domain.sql.SAnimal_;
 import com.querydsl.jpa.hibernate.sql.HibernateSQLQuery;
 import com.querydsl.sql.DerbyTemplates;
 import com.querydsl.sql.SQLTemplates;
@@ -50,14 +50,14 @@ public void queryMutability()
           IllegalAccessException,
           InvocationTargetException,
           IOException {
-    SAnimal cat = new SAnimal("cat");
+    SAnimal_ cat = new SAnimal_("cat");
     HibernateSQLQuery<?> query = query().from(cat);
     new QueryMutability(query).test(cat.id, cat.name);
   }
 
   @Test
   public void clone_() {
-    SAnimal cat = new SAnimal("cat");
+    SAnimal_ cat = new SAnimal_("cat");
     HibernateSQLQuery<?> query = query().from(cat).where(cat.name.isNotNull());
     HibernateSQLQuery<?> query2 = query.clone(session);
     assertThat(query2.getMetadata().getJoins()).isEqualTo(query.getMetadata().getJoins());