From 10edfdec866dfbc04b8c819868bc3ad0c6c18ab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Tue, 14 Sep 2010 10:20:56 +0000 Subject: [PATCH] moved contents to com.mysema.query.jpa --- .../{hql => jpa}/AbstractHQLSubQuery.java | 2 +- .../query/{hql => jpa}/AbstractSQLQuery.java | 2 +- .../{hql => jpa}/EclipseLinkTemplates.java | 2 +- .../query/{hql => jpa}/HQLCommonQuery.java | 2 +- .../mysema/query/{hql => jpa}/HQLGrammar.java | 2 +- .../mysema/query/{hql => jpa}/HQLQuery.java | 2 +- .../query/{hql => jpa}/HQLQueryBase.java | 2 +- .../query/{hql => jpa}/HQLQueryMixin.java | 2 +- .../query/{hql => jpa}/HQLSerializer.java | 5 ++--- .../query/{hql => jpa}/HQLSubQuery.java | 2 +- .../query/{hql => jpa}/HQLTemplates.java | 2 +- .../{hql => jpa}/HibernateSQLSerializer.java | 2 +- .../query/{hql => jpa}/JPQLTemplates.java | 2 +- .../hibernate/AbstractHibernateQuery.java | 8 +++---- .../hibernate/ConstructorTransformer.java | 2 +- .../hibernate/DefaultSessionHolder.java | 2 +- .../hibernate/HibernateDeleteClause.java | 8 +++---- .../hibernate/HibernateQuery.java | 8 +++---- .../hibernate/HibernateUpdateClause.java | 8 +++---- .../{hql => jpa}/hibernate/HibernateUtil.java | 2 +- .../hibernate/NoSessionHolder.java | 2 +- .../hibernate/ScrollableResultsIterator.java | 2 +- .../{hql => jpa}/hibernate/SessionHolder.java | 2 +- .../hibernate/StatelessSessionHolder.java | 2 +- .../{hql => jpa}/hibernate/package-info.java | 2 +- .../hibernate/sql/HibernateSQLQuery.java | 18 +++++++-------- .../jpa => jpa/impl}/AbstractJPAQuery.java | 8 +++---- .../impl}/DefaultSessionHolder.java | 2 +- .../jpa => jpa/impl}/JPADeleteClause.java | 8 +++---- .../query/{hql/jpa => jpa/impl}/JPAQuery.java | 8 +++---- .../jpa => jpa/impl}/JPASessionHolder.java | 2 +- .../jpa => jpa/impl}/JPAUpdateClause.java | 8 +++---- .../query/{hql/jpa => jpa/impl}/JPAUtil.java | 2 +- .../jpa => jpa/impl}/NoSessionHolder.java | 2 +- .../{hql/jpa => jpa/impl}/package-info.java | 2 +- .../query/{hql => jpa}/package-info.java | 2 +- .../query/{hql => }/jpa/sql/JPASQLQuery.java | 12 +++++----- .../src/test/java/PackagelessEntityTest.java | 2 +- .../mysema/query/AbstractHibernateTest.java | 10 ++++----- .../com/mysema/query/AbstractJPATest.java | 8 +++---- .../mysema/query/AbstractStandardTest.java | 6 ++--- .../query/HibernateQueryMutabilityTest.java | 2 +- .../mysema/query/JPAQueryMutabilityTest.java | 2 +- .../query/_derby/DerbyJPAEclipseLinkTest.java | 4 ++-- .../query/_h2/H2JPAEclipseLinkTest.java | 4 ++-- .../HSQLDBJPAEclipseLinkStandardTest.java | 4 ++-- .../query/{hql => jpa}/AbstractQueryTest.java | 5 ++++- .../query/{hql => jpa}/AggregationTest.java | 2 +- .../{hql => jpa}/BooleanOperationsTest.java | 2 +- .../mysema/query/{hql => jpa}/CastTest.java | 2 +- .../query/{hql => jpa}/CollectionTest.java | 4 ++-- .../query/{hql => jpa}/ComparableTest.java | 2 +- .../mysema/query/{hql => jpa}/Constants.java | 2 +- .../query/{hql => jpa}/ConstructorsTest.java | 10 ++++----- .../{hql => jpa}/CustomExpressionsTest.java | 2 +- .../query/{hql => jpa}/DateTimeTest.java | 2 +- .../{hql => jpa}/DummySessionHolder.java | 4 ++-- .../mysema/query/{hql => jpa}/EJBQLTest.java | 2 +- .../query/{hql => jpa}/FeaturesTest.java | 4 ++-- .../query/{hql => jpa}/HQLQueryTest.java | 5 +++-- .../query/{hql => jpa}/HQLSerializerTest.java | 4 +++- .../query/{hql => jpa}/HQLSubQueryTest.java | 3 ++- .../query/{hql => jpa}/InnerJoinTest.java | 7 ++++-- .../query/{hql => jpa}/IntegrationTest.java | 12 +++++----- .../{hql => jpa}/JPAIntegrationTest.java | 4 ++-- .../query/{hql => jpa}/JoinFlagsTest.java | 2 +- .../mysema/query/{hql => jpa}/MathTest.java | 2 +- .../{hql => jpa}/OrderExpressionsTest.java | 2 +- .../query/{hql => jpa}/ParsingTest.java | 22 +++++++++---------- .../query/{hql => jpa}/QueryHelper.java | 4 +++- .../query/{hql => jpa}/SerializationTest.java | 4 ++-- .../{hql => jpa}/StringOperationsTest.java | 2 +- .../query/{hql => jpa}/SubQueryTest.java | 4 +++- .../query/{hql => jpa}/TypeCastTest.java | 8 +++---- .../query/{hql => jpa}/UniqueResultsTest.java | 7 +++--- .../query/{hql => jpa}/domain/Account.java | 3 ++- .../query/{hql => jpa}/domain/Animal.java | 2 +- .../query/{hql => jpa}/domain/AuditLog.java | 2 +- .../mysema/query/{hql => jpa}/domain/Bar.java | 2 +- .../query/{hql => jpa}/domain/Calendar.java | 2 +- .../mysema/query/{hql => jpa}/domain/Cat.java | 2 +- .../query/{hql => jpa}/domain/Catalog.java | 2 +- .../query/{hql => jpa}/domain/Color.java | 2 +- .../query/{hql => jpa}/domain/Company.java | 2 +- .../query/{hql => jpa}/domain/Customer.java | 2 +- .../query/{hql => jpa}/domain/Department.java | 2 +- .../query/{hql => jpa}/domain/Document.java | 2 +- .../query/{hql => jpa}/domain/Domain.java | 2 +- .../{hql => jpa}/domain/DomesticCat.java | 2 +- .../{hql => jpa}/domain/EmbeddedType.java | 2 +- .../query/{hql => jpa}/domain/Employee.java | 2 +- .../query/{hql => jpa}/domain/EvilType.java | 2 +- .../query/{hql => jpa}/domain/Family.java | 2 +- .../mysema/query/{hql => jpa}/domain/Foo.java | 2 +- .../query/{hql => jpa}/domain/FooDTO.java | 2 +- .../query/{hql => jpa}/domain/Formula.java | 2 +- .../domain/InheritedProperties.java | 2 +- .../query/{hql => jpa}/domain/Item.java | 2 +- .../query/{hql => jpa}/domain/Location.java | 2 +- .../query/{hql => jpa}/domain/Name.java | 2 +- .../query/{hql => jpa}/domain/NameList.java | 2 +- .../query/{hql => jpa}/domain/Named.java | 2 +- .../{hql => jpa}/domain/Nationality.java | 2 +- .../query/{hql => jpa}/domain/Order.java | 2 +- .../query/{hql => jpa}/domain/Parameter.java | 2 +- .../query/{hql => jpa}/domain/Payment.java | 2 +- .../{hql => jpa}/domain/PaymentStatus.java | 2 +- .../query/{hql => jpa}/domain/Person.java | 2 +- .../query/{hql => jpa}/domain/PersonId.java | 2 +- .../query/{hql => jpa}/domain/Player.java | 2 +- .../query/{hql => jpa}/domain/Price.java | 2 +- .../query/{hql => jpa}/domain/Product.java | 2 +- .../query/{hql => jpa}/domain/Show.java | 2 +- .../{hql => jpa}/domain/SimpleTypes.java | 2 +- .../query/{hql => jpa}/domain/Status.java | 2 +- .../{hql => jpa}/domain/StatusChange.java | 2 +- .../query/{hql => jpa}/domain/Store.java | 2 +- .../query/{hql => jpa}/domain/Superclass.java | 2 +- .../query/{hql => jpa}/domain/User.java | 2 +- .../{hql => jpa}/domain/package-info.java | 2 +- .../{hql => jpa}/domain/sql/SAccount.java | 2 +- .../{hql => jpa}/domain/sql/SAnimal.java | 2 +- .../{hql => jpa}/domain/sql/SAuditlog.java | 2 +- .../query/{hql => jpa}/domain/sql/SBar.java | 2 +- .../{hql => jpa}/domain/sql/SCalendar.java | 2 +- .../domain/sql/SCalendarHolidays.java | 2 +- .../{hql => jpa}/domain/sql/SCatalog.java | 2 +- .../domain/sql/SCatalogPrice.java | 2 +- .../{hql => jpa}/domain/sql/SCompany.java | 2 +- .../{hql => jpa}/domain/sql/SCustomer.java | 2 +- .../{hql => jpa}/domain/sql/SDepartment.java | 2 +- .../{hql => jpa}/domain/sql/SDocument.java | 2 +- .../{hql => jpa}/domain/sql/SEmployee.java | 2 +- .../query/{hql => jpa}/domain/sql/SFoo.java | 2 +- .../{hql => jpa}/domain/sql/SFormula.java | 2 +- .../domain/sql/SInheritedproperties.java | 2 +- .../query/{hql => jpa}/domain/sql/SItem.java | 2 +- .../domain/sql/SItemStatuschange.java | 2 +- .../{hql => jpa}/domain/sql/SKittens.java | 2 +- .../domain/sql/SKittensArray.java | 2 +- .../{hql => jpa}/domain/sql/SKittensSet.java | 2 +- .../{hql => jpa}/domain/sql/SLocation.java | 2 +- .../query/{hql => jpa}/domain/sql/SName.java | 2 +- .../query/{hql => jpa}/domain/sql/SNamed.java | 2 +- .../{hql => jpa}/domain/sql/SNamelist.java | 2 +- .../domain/sql/SNamelistNames.java | 2 +- .../{hql => jpa}/domain/sql/SNationality.java | 2 +- .../query/{hql => jpa}/domain/sql/SOrder.java | 2 +- .../{hql => jpa}/domain/sql/SParameter.java | 2 +- .../{hql => jpa}/domain/sql/SPerson.java | 2 +- .../{hql => jpa}/domain/sql/SPersonid.java | 2 +- .../{hql => jpa}/domain/sql/SPlayer.java | 2 +- .../domain/sql/SPlayerScores.java | 2 +- .../query/{hql => jpa}/domain/sql/SPrice.java | 2 +- .../query/{hql => jpa}/domain/sql/SShow.java | 2 +- .../{hql => jpa}/domain/sql/SShowActs.java | 2 +- .../{hql => jpa}/domain/sql/SSimpletypes.java | 2 +- .../{hql => jpa}/domain/sql/SStatus.java | 2 +- .../domain/sql/SStatuschange.java | 2 +- .../query/{hql => jpa}/domain/sql/SStore.java | 2 +- .../domain/sql/SStoreCustomer.java | 2 +- .../query/{hql => jpa}/domain/sql/SUser.java | 2 +- .../hibernate/sql/DerbySQLTest.java | 7 +++--- .../hibernate/sql/QueryMutabilityTest.java | 5 +++-- .../{hql => }/jpa/sql/JPADerbySQLTest.java | 7 +++--- .../jpa/sql/JPAQueryMutabilityTest.java | 7 +++--- .../support/ExtendedDerbyDialect.java | 2 +- .../support/ExtendedHSQLDialect.java | 2 +- .../{hql => jpa}/support/package-info.java | 2 +- .../mysema/testutil/HibernateTestRunner.java | 2 +- 170 files changed, 278 insertions(+), 259 deletions(-) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/AbstractHQLSubQuery.java (99%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/AbstractSQLQuery.java (99%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/EclipseLinkTemplates.java (98%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/HQLCommonQuery.java (99%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/HQLGrammar.java (98%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/HQLQuery.java (94%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/HQLQueryBase.java (99%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/HQLQueryMixin.java (97%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/HQLSerializer.java (99%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/HQLSubQuery.java (93%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/HQLTemplates.java (98%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/HibernateSQLSerializer.java (98%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/JPQLTemplates.java (99%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/hibernate/AbstractHibernateQuery.java (98%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/hibernate/ConstructorTransformer.java (95%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/hibernate/DefaultSessionHolder.java (95%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/hibernate/HibernateDeleteClause.java (92%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/hibernate/HibernateQuery.java (94%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/hibernate/HibernateUpdateClause.java (94%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/hibernate/HibernateUtil.java (98%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/hibernate/NoSessionHolder.java (94%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/hibernate/ScrollableResultsIterator.java (97%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/hibernate/SessionHolder.java (93%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/hibernate/StatelessSessionHolder.java (95%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/hibernate/package-info.java (85%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/hibernate/sql/HibernateSQLQuery.java (93%) rename querydsl-hql/src/main/java/com/mysema/query/{hql/jpa => jpa/impl}/AbstractJPAQuery.java (97%) rename querydsl-hql/src/main/java/com/mysema/query/{hql/jpa => jpa/impl}/DefaultSessionHolder.java (96%) rename querydsl-hql/src/main/java/com/mysema/query/{hql/jpa => jpa/impl}/JPADeleteClause.java (91%) rename querydsl-hql/src/main/java/com/mysema/query/{hql/jpa => jpa/impl}/JPAQuery.java (92%) rename querydsl-hql/src/main/java/com/mysema/query/{hql/jpa => jpa/impl}/JPASessionHolder.java (94%) rename querydsl-hql/src/main/java/com/mysema/query/{hql/jpa => jpa/impl}/JPAUpdateClause.java (94%) rename querydsl-hql/src/main/java/com/mysema/query/{hql/jpa => jpa/impl}/JPAUtil.java (96%) rename querydsl-hql/src/main/java/com/mysema/query/{hql/jpa => jpa/impl}/NoSessionHolder.java (95%) rename querydsl-hql/src/main/java/com/mysema/query/{hql/jpa => jpa/impl}/package-info.java (86%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => jpa}/package-info.java (89%) rename querydsl-hql/src/main/java/com/mysema/query/{hql => }/jpa/sql/JPASQLQuery.java (95%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/AbstractQueryTest.java (80%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/AggregationTest.java (95%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/BooleanOperationsTest.java (98%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/CastTest.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/CollectionTest.java (94%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/ComparableTest.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/Constants.java (99%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/ConstructorsTest.java (77%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/CustomExpressionsTest.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/DateTimeTest.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/DummySessionHolder.java (84%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/EJBQLTest.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/FeaturesTest.java (98%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/HQLQueryTest.java (92%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/HQLSerializerTest.java (86%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/HQLSubQueryTest.java (86%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/InnerJoinTest.java (85%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/IntegrationTest.java (93%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/JPAIntegrationTest.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/JoinFlagsTest.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/MathTest.java (98%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/OrderExpressionsTest.java (91%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/ParsingTest.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/QueryHelper.java (94%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/SerializationTest.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/StringOperationsTest.java (95%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/SubQueryTest.java (95%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/TypeCastTest.java (92%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/UniqueResultsTest.java (88%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Account.java (92%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Animal.java (98%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/AuditLog.java (88%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Bar.java (90%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Calendar.java (92%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Cat.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Catalog.java (93%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Color.java (78%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Company.java (93%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Customer.java (89%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Department.java (93%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Document.java (91%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Domain.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/DomesticCat.java (87%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/EmbeddedType.java (87%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Employee.java (89%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/EvilType.java (94%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Family.java (87%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Foo.java (93%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/FooDTO.java (94%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Formula.java (91%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/InheritedProperties.java (86%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Item.java (88%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Location.java (86%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Name.java (87%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/NameList.java (90%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Named.java (86%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Nationality.java (91%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Order.java (95%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Parameter.java (85%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Payment.java (91%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/PaymentStatus.java (80%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Person.java (94%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/PersonId.java (90%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Player.java (90%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Price.java (89%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Product.java (85%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Show.java (90%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/SimpleTypes.java (95%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Status.java (86%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/StatusChange.java (90%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Store.java (91%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/Superclass.java (93%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/User.java (91%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/package-info.java (82%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SAccount.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SAnimal.java (98%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SAuditlog.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SBar.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SCalendar.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SCalendarHolidays.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SCatalog.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SCatalogPrice.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SCompany.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SCustomer.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SDepartment.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SDocument.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SEmployee.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SFoo.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SFormula.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SInheritedproperties.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SItem.java (98%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SItemStatuschange.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SKittens.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SKittensArray.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SKittensSet.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SLocation.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SName.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SNamed.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SNamelist.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SNamelistNames.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SNationality.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SOrder.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SParameter.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SPerson.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SPersonid.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SPlayer.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SPlayerScores.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SPrice.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SShow.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SShowActs.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SSimpletypes.java (98%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SStatus.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SStatuschange.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SStore.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SStoreCustomer.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/domain/sql/SUser.java (97%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/hibernate/sql/DerbySQLTest.java (95%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/hibernate/sql/QueryMutabilityTest.java (91%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => }/jpa/sql/JPADerbySQLTest.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => }/jpa/sql/JPAQueryMutabilityTest.java (91%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/support/ExtendedDerbyDialect.java (96%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/support/ExtendedHSQLDialect.java (91%) rename querydsl-hql/src/test/java/com/mysema/query/{hql => jpa}/support/package-info.java (85%) diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/AbstractHQLSubQuery.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/AbstractHQLSubQuery.java similarity index 99% rename from querydsl-hql/src/main/java/com/mysema/query/hql/AbstractHQLSubQuery.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/AbstractHQLSubQuery.java index 88fbee857..91f374407 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/AbstractHQLSubQuery.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/AbstractHQLSubQuery.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import java.util.Collection; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/AbstractSQLQuery.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/AbstractSQLQuery.java similarity index 99% rename from querydsl-hql/src/main/java/com/mysema/query/hql/AbstractSQLQuery.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/AbstractSQLQuery.java index c9304f2cf..2e20d0a11 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/AbstractSQLQuery.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/AbstractSQLQuery.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import com.mysema.query.QueryMetadata; import com.mysema.query.sql.ForeignKey; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/EclipseLinkTemplates.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/EclipseLinkTemplates.java similarity index 98% rename from querydsl-hql/src/main/java/com/mysema/query/hql/EclipseLinkTemplates.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/EclipseLinkTemplates.java index 3e69829fc..83f66e38b 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/EclipseLinkTemplates.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/EclipseLinkTemplates.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import com.mysema.query.types.Ops; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLCommonQuery.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLCommonQuery.java similarity index 99% rename from querydsl-hql/src/main/java/com/mysema/query/hql/HQLCommonQuery.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/HQLCommonQuery.java index 477a9d094..87ccb1565 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLCommonQuery.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLCommonQuery.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql; +package com.mysema.query.jpa; import java.util.Collection; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLGrammar.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLGrammar.java similarity index 98% rename from querydsl-hql/src/main/java/com/mysema/query/hql/HQLGrammar.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/HQLGrammar.java index ed5389936..a4ee62699 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLGrammar.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLGrammar.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import com.mysema.query.types.Expression; import com.mysema.query.types.Ops; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLQuery.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLQuery.java similarity index 94% rename from querydsl-hql/src/main/java/com/mysema/query/hql/HQLQuery.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/HQLQuery.java index 25c0e8257..85179aa82 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLQuery.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLQuery.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import com.mysema.query.Projectable; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLQueryBase.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLQueryBase.java similarity index 99% rename from querydsl-hql/src/main/java/com/mysema/query/hql/HQLQueryBase.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/HQLQueryBase.java index fbec3e560..632372c23 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLQueryBase.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLQueryBase.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import java.util.Collection; import java.util.Map; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLQueryMixin.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLQueryMixin.java similarity index 97% rename from querydsl-hql/src/main/java/com/mysema/query/hql/HQLQueryMixin.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/HQLQueryMixin.java index a15e62ce0..db27fcf4e 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLQueryMixin.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLQueryMixin.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import java.util.List; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLSerializer.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLSerializer.java similarity index 99% rename from querydsl-hql/src/main/java/com/mysema/query/hql/HQLSerializer.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/HQLSerializer.java index cc1c2d644..889466155 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLSerializer.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLSerializer.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import java.util.ArrayList; import java.util.Arrays; @@ -22,11 +22,10 @@ import com.mysema.query.JoinExpression; import com.mysema.query.JoinType; import com.mysema.query.QueryMetadata; import com.mysema.query.types.*; -import com.mysema.query.types.expr.BooleanExpression; import com.mysema.query.types.expr.ConstructorExpression; -import com.mysema.query.types.expr.StringConstant; import com.mysema.query.types.expr.SimpleConstant; import com.mysema.query.types.expr.SimpleOperation; +import com.mysema.query.types.expr.StringConstant; import com.mysema.util.MathUtils; /** diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLSubQuery.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLSubQuery.java similarity index 93% rename from querydsl-hql/src/main/java/com/mysema/query/hql/HQLSubQuery.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/HQLSubQuery.java index e88ba13d8..58dfb1f08 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLSubQuery.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLSubQuery.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import com.mysema.query.QueryMetadata; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLTemplates.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLTemplates.java similarity index 98% rename from querydsl-hql/src/main/java/com/mysema/query/hql/HQLTemplates.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/HQLTemplates.java index 3d2d90c92..2981e1b80 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/HQLTemplates.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/HQLTemplates.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql; +package com.mysema.query.jpa; import java.util.Arrays; import java.util.Collection; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/HibernateSQLSerializer.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/HibernateSQLSerializer.java similarity index 98% rename from querydsl-hql/src/main/java/com/mysema/query/hql/HibernateSQLSerializer.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/HibernateSQLSerializer.java index 4a5d9fe23..8774207f7 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/HibernateSQLSerializer.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/HibernateSQLSerializer.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import java.util.ArrayList; import java.util.List; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/JPQLTemplates.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/JPQLTemplates.java similarity index 99% rename from querydsl-hql/src/main/java/com/mysema/query/hql/JPQLTemplates.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/JPQLTemplates.java index 523c89775..e71e486fe 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/JPQLTemplates.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/JPQLTemplates.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import com.mysema.query.types.Constant; import com.mysema.query.types.Operator; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/AbstractHibernateQuery.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/AbstractHibernateQuery.java similarity index 98% rename from querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/AbstractHibernateQuery.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/AbstractHibernateQuery.java index 6b1036ce9..bc7df17cb 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/AbstractHibernateQuery.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/AbstractHibernateQuery.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.hibernate; +package com.mysema.query.jpa.hibernate; import java.util.HashMap; import java.util.List; @@ -26,9 +26,9 @@ import com.mysema.query.QueryException; import com.mysema.query.QueryMetadata; import com.mysema.query.QueryModifiers; import com.mysema.query.SearchResults; -import com.mysema.query.hql.HQLQueryBase; -import com.mysema.query.hql.HQLTemplates; -import com.mysema.query.hql.JPQLTemplates; +import com.mysema.query.jpa.HQLQueryBase; +import com.mysema.query.jpa.HQLTemplates; +import com.mysema.query.jpa.JPQLTemplates; import com.mysema.query.types.Expression; import com.mysema.query.types.FactoryExpression; import com.mysema.query.types.Path; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/ConstructorTransformer.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/ConstructorTransformer.java similarity index 95% rename from querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/ConstructorTransformer.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/ConstructorTransformer.java index 6a27bd3a3..66315a4d3 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/ConstructorTransformer.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/ConstructorTransformer.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.hibernate; +package com.mysema.query.jpa.hibernate; import java.util.List; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/DefaultSessionHolder.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/DefaultSessionHolder.java similarity index 95% rename from querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/DefaultSessionHolder.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/DefaultSessionHolder.java index e980ee50e..f77a3d4a6 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/DefaultSessionHolder.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/DefaultSessionHolder.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.hibernate; +package com.mysema.query.jpa.hibernate; import org.hibernate.Query; import org.hibernate.SQLQuery; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/HibernateDeleteClause.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateDeleteClause.java similarity index 92% rename from querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/HibernateDeleteClause.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateDeleteClause.java index 7f19d88cd..29d394fd2 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/HibernateDeleteClause.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateDeleteClause.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.hibernate; +package com.mysema.query.jpa.hibernate; import java.util.Map; @@ -15,9 +15,9 @@ import com.mysema.query.DefaultQueryMetadata; import com.mysema.query.JoinType; import com.mysema.query.QueryMetadata; import com.mysema.query.dml.DeleteClause; -import com.mysema.query.hql.HQLSerializer; -import com.mysema.query.hql.HQLTemplates; -import com.mysema.query.hql.JPQLTemplates; +import com.mysema.query.jpa.HQLSerializer; +import com.mysema.query.jpa.HQLTemplates; +import com.mysema.query.jpa.JPQLTemplates; import com.mysema.query.types.EntityPath; import com.mysema.query.types.Predicate; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/HibernateQuery.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java similarity index 94% rename from querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/HibernateQuery.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java index 154b23cb6..19dfe829d 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/HibernateQuery.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java @@ -3,16 +3,16 @@ * All rights reserved. * */ -package com.mysema.query.hql.hibernate; +package com.mysema.query.jpa.hibernate; import org.hibernate.Session; import org.hibernate.StatelessSession; import com.mysema.query.DefaultQueryMetadata; import com.mysema.query.QueryMetadata; -import com.mysema.query.hql.HQLQuery; -import com.mysema.query.hql.HQLTemplates; -import com.mysema.query.hql.JPQLTemplates; +import com.mysema.query.jpa.HQLQuery; +import com.mysema.query.jpa.HQLTemplates; +import com.mysema.query.jpa.JPQLTemplates; /** * HibernateQuery is the default implementation of the HQLQuery interface for Hibernate diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/HibernateUpdateClause.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateUpdateClause.java similarity index 94% rename from querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/HibernateUpdateClause.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateUpdateClause.java index 1805e33a7..f34b78ed8 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/HibernateUpdateClause.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateUpdateClause.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.hibernate; +package com.mysema.query.jpa.hibernate; import java.util.List; import java.util.Map; @@ -16,9 +16,9 @@ import com.mysema.query.DefaultQueryMetadata; import com.mysema.query.JoinType; import com.mysema.query.QueryMetadata; import com.mysema.query.dml.UpdateClause; -import com.mysema.query.hql.HQLSerializer; -import com.mysema.query.hql.HQLTemplates; -import com.mysema.query.hql.JPQLTemplates; +import com.mysema.query.jpa.HQLSerializer; +import com.mysema.query.jpa.HQLTemplates; +import com.mysema.query.jpa.JPQLTemplates; import com.mysema.query.types.EntityPath; import com.mysema.query.types.Expression; import com.mysema.query.types.ExpressionUtils; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/HibernateUtil.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateUtil.java similarity index 98% rename from querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/HibernateUtil.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateUtil.java index de2b61c63..074db89d8 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/HibernateUtil.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateUtil.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.hibernate; +package com.mysema.query.jpa.hibernate; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/NoSessionHolder.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/NoSessionHolder.java similarity index 94% rename from querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/NoSessionHolder.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/NoSessionHolder.java index f36216405..1110eaf4d 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/NoSessionHolder.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/NoSessionHolder.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.hibernate; +package com.mysema.query.jpa.hibernate; import org.hibernate.Query; import org.hibernate.SQLQuery; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/ScrollableResultsIterator.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/ScrollableResultsIterator.java similarity index 97% rename from querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/ScrollableResultsIterator.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/ScrollableResultsIterator.java index d8ec51509..d186d5bfd 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/ScrollableResultsIterator.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/ScrollableResultsIterator.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.hibernate; +package com.mysema.query.jpa.hibernate; import java.io.IOException; import java.util.NoSuchElementException; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/SessionHolder.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/SessionHolder.java similarity index 93% rename from querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/SessionHolder.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/SessionHolder.java index a674251a0..bf782b599 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/SessionHolder.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/SessionHolder.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.hibernate; +package com.mysema.query.jpa.hibernate; import org.hibernate.Query; import org.hibernate.SQLQuery; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/StatelessSessionHolder.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/StatelessSessionHolder.java similarity index 95% rename from querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/StatelessSessionHolder.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/StatelessSessionHolder.java index 461c84ae6..fe779f619 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/StatelessSessionHolder.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/StatelessSessionHolder.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.hibernate; +package com.mysema.query.jpa.hibernate; import org.hibernate.Query; import org.hibernate.SQLQuery; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/package-info.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/package-info.java similarity index 85% rename from querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/package-info.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/package-info.java index 601d7f9fd..40fa5b08b 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/package-info.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/package-info.java @@ -8,7 +8,7 @@ * HQL for Hibernate */ @DefaultAnnotation( { Nonnull.class }) -package com.mysema.query.hql.hibernate; +package com.mysema.query.jpa.hibernate; import javax.annotation.Nonnull; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/sql/HibernateSQLQuery.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java similarity index 93% rename from querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/sql/HibernateSQLQuery.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java index 8740b239b..8e2210ad0 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/hibernate/sql/HibernateSQLQuery.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.hibernate.sql; +package com.mysema.query.jpa.hibernate.sql; import java.util.List; import java.util.Map; @@ -20,14 +20,14 @@ import com.mysema.query.DefaultQueryMetadata; import com.mysema.query.QueryMetadata; import com.mysema.query.QueryModifiers; import com.mysema.query.SearchResults; -import com.mysema.query.hql.AbstractSQLQuery; -import com.mysema.query.hql.HibernateSQLSerializer; -import com.mysema.query.hql.hibernate.ConstructorTransformer; -import com.mysema.query.hql.hibernate.DefaultSessionHolder; -import com.mysema.query.hql.hibernate.HibernateQuery; -import com.mysema.query.hql.hibernate.HibernateUtil; -import com.mysema.query.hql.hibernate.SessionHolder; -import com.mysema.query.hql.hibernate.StatelessSessionHolder; +import com.mysema.query.jpa.AbstractSQLQuery; +import com.mysema.query.jpa.HibernateSQLSerializer; +import com.mysema.query.jpa.hibernate.ConstructorTransformer; +import com.mysema.query.jpa.hibernate.DefaultSessionHolder; +import com.mysema.query.jpa.hibernate.HibernateQuery; +import com.mysema.query.jpa.hibernate.HibernateUtil; +import com.mysema.query.jpa.hibernate.SessionHolder; +import com.mysema.query.jpa.hibernate.StatelessSessionHolder; import com.mysema.query.sql.SQLCommonQuery; import com.mysema.query.sql.SQLTemplates; import com.mysema.query.types.Expression; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/AbstractJPAQuery.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java similarity index 97% rename from querydsl-hql/src/main/java/com/mysema/query/hql/jpa/AbstractJPAQuery.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java index da31e0294..01e3a9c75 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/AbstractJPAQuery.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/AbstractJPAQuery.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.jpa; +package com.mysema.query.jpa.impl; import java.util.List; @@ -21,9 +21,9 @@ import com.mysema.query.DefaultQueryMetadata; import com.mysema.query.QueryMetadata; import com.mysema.query.QueryModifiers; import com.mysema.query.SearchResults; -import com.mysema.query.hql.HQLQueryBase; -import com.mysema.query.hql.HQLTemplates; -import com.mysema.query.hql.JPQLTemplates; +import com.mysema.query.jpa.HQLQueryBase; +import com.mysema.query.jpa.HQLTemplates; +import com.mysema.query.jpa.JPQLTemplates; import com.mysema.query.types.Expression; /** diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/DefaultSessionHolder.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/DefaultSessionHolder.java similarity index 96% rename from querydsl-hql/src/main/java/com/mysema/query/hql/jpa/DefaultSessionHolder.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/impl/DefaultSessionHolder.java index 5a8c8fe6f..8221f8642 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/DefaultSessionHolder.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/DefaultSessionHolder.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.jpa; +package com.mysema.query.jpa.impl; import javax.persistence.EntityManager; import javax.persistence.Query; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPADeleteClause.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPADeleteClause.java similarity index 91% rename from querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPADeleteClause.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPADeleteClause.java index c0abd8a05..596b8aaf3 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPADeleteClause.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPADeleteClause.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.jpa; +package com.mysema.query.jpa.impl; import java.util.Map; @@ -14,9 +14,9 @@ import com.mysema.query.DefaultQueryMetadata; import com.mysema.query.JoinType; import com.mysema.query.QueryMetadata; import com.mysema.query.dml.DeleteClause; -import com.mysema.query.hql.HQLSerializer; -import com.mysema.query.hql.HQLTemplates; -import com.mysema.query.hql.JPQLTemplates; +import com.mysema.query.jpa.HQLSerializer; +import com.mysema.query.jpa.HQLTemplates; +import com.mysema.query.jpa.JPQLTemplates; import com.mysema.query.types.EntityPath; import com.mysema.query.types.Predicate; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAQuery.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPAQuery.java similarity index 92% rename from querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAQuery.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPAQuery.java index 1fdc9017b..438ae3645 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAQuery.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPAQuery.java @@ -3,15 +3,15 @@ * All rights reserved. * */ -package com.mysema.query.hql.jpa; +package com.mysema.query.jpa.impl; import javax.persistence.EntityManager; import com.mysema.query.DefaultQueryMetadata; import com.mysema.query.QueryMetadata; -import com.mysema.query.hql.HQLQuery; -import com.mysema.query.hql.HQLTemplates; -import com.mysema.query.hql.JPQLTemplates; +import com.mysema.query.jpa.HQLQuery; +import com.mysema.query.jpa.HQLTemplates; +import com.mysema.query.jpa.JPQLTemplates; /** * JPAQuery is the default implementation of the HQLQuery interface for JPA diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPASessionHolder.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPASessionHolder.java similarity index 94% rename from querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPASessionHolder.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPASessionHolder.java index 2f0ea0723..1db0c1919 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPASessionHolder.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPASessionHolder.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.jpa; +package com.mysema.query.jpa.impl; import javax.persistence.Query; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAUpdateClause.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPAUpdateClause.java similarity index 94% rename from querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAUpdateClause.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPAUpdateClause.java index 64a41525f..525fc1209 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAUpdateClause.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPAUpdateClause.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.jpa; +package com.mysema.query.jpa.impl; import java.util.List; import java.util.Map; @@ -15,9 +15,9 @@ import com.mysema.query.DefaultQueryMetadata; import com.mysema.query.JoinType; import com.mysema.query.QueryMetadata; import com.mysema.query.dml.UpdateClause; -import com.mysema.query.hql.HQLSerializer; -import com.mysema.query.hql.HQLTemplates; -import com.mysema.query.hql.JPQLTemplates; +import com.mysema.query.jpa.HQLSerializer; +import com.mysema.query.jpa.HQLTemplates; +import com.mysema.query.jpa.JPQLTemplates; import com.mysema.query.types.EntityPath; import com.mysema.query.types.Expression; import com.mysema.query.types.ExpressionUtils; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAUtil.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPAUtil.java similarity index 96% rename from querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAUtil.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPAUtil.java index 933af0afe..67ecb771c 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/JPAUtil.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPAUtil.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.jpa; +package com.mysema.query.jpa.impl; import java.util.Map; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/NoSessionHolder.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/NoSessionHolder.java similarity index 95% rename from querydsl-hql/src/main/java/com/mysema/query/hql/jpa/NoSessionHolder.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/impl/NoSessionHolder.java index e31f34afa..103029f02 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/NoSessionHolder.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/NoSessionHolder.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.jpa; +package com.mysema.query.jpa.impl; import javax.persistence.Query; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/package-info.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/package-info.java similarity index 86% rename from querydsl-hql/src/main/java/com/mysema/query/hql/jpa/package-info.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/impl/package-info.java index 199550365..011afd290 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/package-info.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/package-info.java @@ -8,7 +8,7 @@ * HQL Support classes */ @DefaultAnnotation( { Nonnull.class }) -package com.mysema.query.hql.jpa; +package com.mysema.query.jpa.impl; import javax.annotation.Nonnull; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/package-info.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/package-info.java similarity index 89% rename from querydsl-hql/src/main/java/com/mysema/query/hql/package-info.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/package-info.java index 5f0633fcd..749d3278b 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/package-info.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/package-info.java @@ -8,7 +8,7 @@ * Query implementations for HQL and JPAQL */ @DefaultAnnotation( { Nonnull.class }) -package com.mysema.query.hql; +package com.mysema.query.jpa; import javax.annotation.Nonnull; diff --git a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/sql/JPASQLQuery.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java similarity index 95% rename from querydsl-hql/src/main/java/com/mysema/query/hql/jpa/sql/JPASQLQuery.java rename to querydsl-hql/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java index 92086b8ea..18ac37448 100644 --- a/querydsl-hql/src/main/java/com/mysema/query/hql/jpa/sql/JPASQLQuery.java +++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.jpa.sql; +package com.mysema.query.jpa.sql; import java.util.List; import java.util.Map; @@ -21,11 +21,11 @@ import com.mysema.query.DefaultQueryMetadata; import com.mysema.query.QueryMetadata; import com.mysema.query.QueryModifiers; import com.mysema.query.SearchResults; -import com.mysema.query.hql.AbstractSQLQuery; -import com.mysema.query.hql.HibernateSQLSerializer; -import com.mysema.query.hql.jpa.DefaultSessionHolder; -import com.mysema.query.hql.jpa.JPASessionHolder; -import com.mysema.query.hql.jpa.JPAUtil; +import com.mysema.query.jpa.AbstractSQLQuery; +import com.mysema.query.jpa.HibernateSQLSerializer; +import com.mysema.query.jpa.impl.DefaultSessionHolder; +import com.mysema.query.jpa.impl.JPASessionHolder; +import com.mysema.query.jpa.impl.JPAUtil; import com.mysema.query.sql.SQLCommonQuery; import com.mysema.query.sql.SQLTemplates; import com.mysema.query.types.EntityPath; diff --git a/querydsl-hql/src/test/java/PackagelessEntityTest.java b/querydsl-hql/src/test/java/PackagelessEntityTest.java index 34e82c1d4..92134d7d4 100644 --- a/querydsl-hql/src/test/java/PackagelessEntityTest.java +++ b/querydsl-hql/src/test/java/PackagelessEntityTest.java @@ -2,7 +2,7 @@ import static org.junit.Assert.*; import org.junit.Test; -import com.mysema.query.hql.HQLSubQuery; +import com.mysema.query.jpa.HQLSubQuery; import com.mysema.query.types.path.PathBuilder; diff --git a/querydsl-hql/src/test/java/com/mysema/query/AbstractHibernateTest.java b/querydsl-hql/src/test/java/com/mysema/query/AbstractHibernateTest.java index efd667e8b..3e72ca218 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/AbstractHibernateTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/AbstractHibernateTest.java @@ -18,12 +18,12 @@ import org.hibernate.Session; import org.junit.Test; import com.mysema.commons.lang.CloseableIterator; -import com.mysema.query.hql.HQLTemplates; -import com.mysema.query.hql.JPQLTemplates; -import com.mysema.query.hql.domain.Cat; import com.mysema.query.hql.domain.QCat; -import com.mysema.query.hql.hibernate.HibernateQuery; -import com.mysema.query.hql.hibernate.ScrollableResultsIterator; +import com.mysema.query.jpa.HQLTemplates; +import com.mysema.query.jpa.JPQLTemplates; +import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.hibernate.HibernateQuery; +import com.mysema.query.jpa.hibernate.ScrollableResultsIterator; /** * @author tiwe diff --git a/querydsl-hql/src/test/java/com/mysema/query/AbstractJPATest.java b/querydsl-hql/src/test/java/com/mysema/query/AbstractJPATest.java index c8b72976c..5b3272b0b 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/AbstractJPATest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/AbstractJPATest.java @@ -14,11 +14,11 @@ import javax.persistence.EntityManager; import org.junit.Test; -import com.mysema.query.hql.HQLTemplates; -import com.mysema.query.hql.JPQLTemplates; -import com.mysema.query.hql.domain.Cat; import com.mysema.query.hql.domain.QCat; -import com.mysema.query.hql.jpa.JPAQuery; +import com.mysema.query.jpa.HQLTemplates; +import com.mysema.query.jpa.JPQLTemplates; +import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.impl.JPAQuery; /** * @author tiwe diff --git a/querydsl-hql/src/test/java/com/mysema/query/AbstractStandardTest.java b/querydsl-hql/src/test/java/com/mysema/query/AbstractStandardTest.java index befcfc4a2..4797caaf3 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/AbstractStandardTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/AbstractStandardTest.java @@ -23,10 +23,10 @@ import org.junit.Before; import org.junit.Test; import com.mysema.commons.lang.Pair; -import com.mysema.query.hql.HQLQuery; -import com.mysema.query.hql.domain.Cat; -import com.mysema.query.hql.domain.DomesticCat; import com.mysema.query.hql.domain.QCat; +import com.mysema.query.jpa.HQLQuery; +import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.domain.DomesticCat; import com.mysema.query.types.Expression; import com.mysema.query.types.Param; import com.mysema.query.types.ParamNotSetException; diff --git a/querydsl-hql/src/test/java/com/mysema/query/HibernateQueryMutabilityTest.java b/querydsl-hql/src/test/java/com/mysema/query/HibernateQueryMutabilityTest.java index ea8b5c4d2..af49c3dc8 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/HibernateQueryMutabilityTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/HibernateQueryMutabilityTest.java @@ -15,7 +15,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import com.mysema.query.hql.domain.QCat; -import com.mysema.query.hql.hibernate.HibernateQuery; +import com.mysema.query.jpa.hibernate.HibernateQuery; import com.mysema.testutil.HibernateConfig; import com.mysema.testutil.HibernateTestRunner; diff --git a/querydsl-hql/src/test/java/com/mysema/query/JPAQueryMutabilityTest.java b/querydsl-hql/src/test/java/com/mysema/query/JPAQueryMutabilityTest.java index 6cd834d84..b7e5dae7d 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/JPAQueryMutabilityTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/JPAQueryMutabilityTest.java @@ -14,7 +14,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import com.mysema.query.hql.domain.QCat; -import com.mysema.query.hql.jpa.JPAQuery; +import com.mysema.query.jpa.impl.JPAQuery; import com.mysema.testutil.JPAConfig; import com.mysema.testutil.JPATestRunner; diff --git a/querydsl-hql/src/test/java/com/mysema/query/_derby/DerbyJPAEclipseLinkTest.java b/querydsl-hql/src/test/java/com/mysema/query/_derby/DerbyJPAEclipseLinkTest.java index 94e20804c..d21e810a4 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/_derby/DerbyJPAEclipseLinkTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/_derby/DerbyJPAEclipseLinkTest.java @@ -9,8 +9,8 @@ import org.junit.runner.RunWith; import com.mysema.query.AbstractJPATest; import com.mysema.query.Target; -import com.mysema.query.hql.EclipseLinkTemplates; -import com.mysema.query.hql.JPQLTemplates; +import com.mysema.query.jpa.EclipseLinkTemplates; +import com.mysema.query.jpa.JPQLTemplates; import com.mysema.testutil.JPAConfig; import com.mysema.testutil.JPATestRunner; diff --git a/querydsl-hql/src/test/java/com/mysema/query/_h2/H2JPAEclipseLinkTest.java b/querydsl-hql/src/test/java/com/mysema/query/_h2/H2JPAEclipseLinkTest.java index da13c3c5a..dd117cdf7 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/_h2/H2JPAEclipseLinkTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/_h2/H2JPAEclipseLinkTest.java @@ -10,8 +10,8 @@ import org.junit.runner.RunWith; import com.mysema.query.AbstractJPATest; import com.mysema.query.Target; -import com.mysema.query.hql.EclipseLinkTemplates; -import com.mysema.query.hql.JPQLTemplates; +import com.mysema.query.jpa.EclipseLinkTemplates; +import com.mysema.query.jpa.JPQLTemplates; import com.mysema.testutil.JPAConfig; import com.mysema.testutil.JPATestRunner; diff --git a/querydsl-hql/src/test/java/com/mysema/query/_hsqldb/HSQLDBJPAEclipseLinkStandardTest.java b/querydsl-hql/src/test/java/com/mysema/query/_hsqldb/HSQLDBJPAEclipseLinkStandardTest.java index 9c6851a03..8b0238226 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/_hsqldb/HSQLDBJPAEclipseLinkStandardTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/_hsqldb/HSQLDBJPAEclipseLinkStandardTest.java @@ -9,8 +9,8 @@ import org.junit.runner.RunWith; import com.mysema.query.AbstractJPATest; import com.mysema.query.Target; -import com.mysema.query.hql.EclipseLinkTemplates; -import com.mysema.query.hql.JPQLTemplates; +import com.mysema.query.jpa.EclipseLinkTemplates; +import com.mysema.query.jpa.JPQLTemplates; import com.mysema.testutil.JPAConfig; import com.mysema.testutil.JPATestRunner; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/AbstractQueryTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/AbstractQueryTest.java similarity index 80% rename from querydsl-hql/src/test/java/com/mysema/query/hql/AbstractQueryTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/AbstractQueryTest.java index dffa2df47..a321dc187 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/AbstractQueryTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/AbstractQueryTest.java @@ -3,10 +3,13 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import static org.junit.Assert.assertEquals; +import com.mysema.query.jpa.HQLSerializer; +import com.mysema.query.jpa.HQLSubQuery; +import com.mysema.query.jpa.HQLTemplates; import com.mysema.query.types.Expression; public abstract class AbstractQueryTest implements Constants{ diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/AggregationTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/AggregationTest.java similarity index 95% rename from querydsl-hql/src/test/java/com/mysema/query/hql/AggregationTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/AggregationTest.java index 8e3c82de9..f2c92dcc7 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/AggregationTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/AggregationTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import org.junit.Test; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/BooleanOperationsTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/BooleanOperationsTest.java similarity index 98% rename from querydsl-hql/src/test/java/com/mysema/query/hql/BooleanOperationsTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/BooleanOperationsTest.java index aac138be5..415520b76 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/BooleanOperationsTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/BooleanOperationsTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import static org.junit.Assert.assertEquals; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/CastTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/CastTest.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/CastTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/CastTest.java index 403abd3d9..c7503afc1 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/CastTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/CastTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import static org.junit.Assert.assertEquals; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/CollectionTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/CollectionTest.java similarity index 94% rename from querydsl-hql/src/test/java/com/mysema/query/hql/CollectionTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/CollectionTest.java index 0ee4ddc20..8dc3b8bf2 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/CollectionTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/CollectionTest.java @@ -3,11 +3,11 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import org.junit.Test; -import com.mysema.query.hql.domain.Cat; +import com.mysema.query.jpa.domain.Cat; public class CollectionTest extends AbstractQueryTest{ diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/ComparableTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/ComparableTest.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/ComparableTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/ComparableTest.java index 5c16611f0..25863f9e8 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/ComparableTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/ComparableTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import org.junit.Test; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/Constants.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/Constants.java similarity index 99% rename from querydsl-hql/src/test/java/com/mysema/query/hql/Constants.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/Constants.java index 26fb11bc8..321d694fb 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/Constants.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/Constants.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import com.mysema.query.hql.domain.QAccount; import com.mysema.query.hql.domain.QAnimal; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/ConstructorsTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/ConstructorsTest.java similarity index 77% rename from querydsl-hql/src/test/java/com/mysema/query/hql/ConstructorsTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/ConstructorsTest.java index 8caf18ef4..fdd74cfae 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/ConstructorsTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/ConstructorsTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import org.junit.Ignore; import org.junit.Test; @@ -29,12 +29,12 @@ public class ConstructorsTest extends AbstractQueryTest{ @Test @Ignore public void testConstructors() { - ConstructorExpression c = - new ConstructorExpression( - com.mysema.query.hql.domain.Cat.class, + ConstructorExpression c = + new ConstructorExpression( + com.mysema.query.jpa.domain.Cat.class, new Class[]{String.class}, cat.name); - assertToString("new " + com.mysema.query.hql.domain.Cat.class.getName()+ "(cat.name)", c); + assertToString("new " + com.mysema.query.jpa.domain.Cat.class.getName()+ "(cat.name)", c); assertToString("new " + getClass().getName() + "$BookmarkDTO(cat.name)",new _BookmarkDTO(cat.name)); } diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/CustomExpressionsTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/CustomExpressionsTest.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/CustomExpressionsTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/CustomExpressionsTest.java index ef521e66d..65f1d607f 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/CustomExpressionsTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/CustomExpressionsTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import java.util.Arrays; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/DateTimeTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/DateTimeTest.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/DateTimeTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/DateTimeTest.java index c95a6a2be..545b4aad2 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/DateTimeTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/DateTimeTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import org.junit.Test; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/DummySessionHolder.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/DummySessionHolder.java similarity index 84% rename from querydsl-hql/src/test/java/com/mysema/query/hql/DummySessionHolder.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/DummySessionHolder.java index b40d6252b..22d30e9d3 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/DummySessionHolder.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/DummySessionHolder.java @@ -3,12 +3,12 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import org.hibernate.Query; import org.hibernate.SQLQuery; -import com.mysema.query.hql.hibernate.SessionHolder; +import com.mysema.query.jpa.hibernate.SessionHolder; public class DummySessionHolder implements SessionHolder{ diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/EJBQLTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/EJBQLTest.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/EJBQLTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/EJBQLTest.java index e71e29e89..6cdc8c28b 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/EJBQLTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/EJBQLTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import org.junit.Test; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/FeaturesTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/FeaturesTest.java similarity index 98% rename from querydsl-hql/src/test/java/com/mysema/query/hql/FeaturesTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/FeaturesTest.java index fa9788b09..2ce4758d9 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/FeaturesTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/FeaturesTest.java @@ -3,9 +3,9 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; -import static com.mysema.query.hql.HQLGrammar.sum; +import static com.mysema.query.jpa.HQLGrammar.sum; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/HQLQueryTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/HQLQueryTest.java similarity index 92% rename from querydsl-hql/src/test/java/com/mysema/query/hql/HQLQueryTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/HQLQueryTest.java index af3b7aae2..baa01aae4 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/HQLQueryTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/HQLQueryTest.java @@ -1,10 +1,11 @@ -package com.mysema.query.hql; +package com.mysema.query.jpa; import org.junit.Before; import org.junit.Test; import com.mysema.query.hql.domain.QCat; -import com.mysema.query.hql.hibernate.HibernateQuery; +import com.mysema.query.jpa.HQLQuery; +import com.mysema.query.jpa.hibernate.HibernateQuery; public class HQLQueryTest { diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/HQLSerializerTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/HQLSerializerTest.java similarity index 86% rename from querydsl-hql/src/test/java/com/mysema/query/hql/HQLSerializerTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/HQLSerializerTest.java index 00c7a08ad..cb2a0d2e0 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/HQLSerializerTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/HQLSerializerTest.java @@ -3,12 +3,14 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.mysema.query.jpa.HQLSerializer; +import com.mysema.query.jpa.HQLTemplates; import com.mysema.query.types.path.NumberPath; public class HQLSerializerTest { diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/HQLSubQueryTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/HQLSubQueryTest.java similarity index 86% rename from querydsl-hql/src/test/java/com/mysema/query/hql/HQLSubQueryTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/HQLSubQueryTest.java index 7c04f63b2..986fa8210 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/HQLSubQueryTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/HQLSubQueryTest.java @@ -1,10 +1,11 @@ -package com.mysema.query.hql; +package com.mysema.query.jpa; import static org.junit.Assert.*; import org.junit.Test; import com.mysema.query.hql.domain.QCat; +import com.mysema.query.jpa.HQLSubQuery; public class HQLSubQueryTest { diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/InnerJoinTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/InnerJoinTest.java similarity index 85% rename from querydsl-hql/src/test/java/com/mysema/query/hql/InnerJoinTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/InnerJoinTest.java index dea8a90ef..7165f9803 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/InnerJoinTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/InnerJoinTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import static com.mysema.query.alias.Alias.$; @@ -12,7 +12,10 @@ import java.util.List; import org.junit.Test; import com.mysema.query.alias.Alias; -import com.mysema.query.hql.hibernate.HibernateQuery; +import com.mysema.query.jpa.HQLQuery; +import com.mysema.query.jpa.HQLSubQuery; +import com.mysema.query.jpa.HQLTemplates; +import com.mysema.query.jpa.hibernate.HibernateQuery; import com.mysema.query.types.path.StringPath; public class InnerJoinTest { diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/IntegrationTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/IntegrationTest.java similarity index 93% rename from querydsl-hql/src/test/java/com/mysema/query/hql/IntegrationTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/IntegrationTest.java index f4c784423..31c1abc39 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/IntegrationTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/IntegrationTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import static org.junit.Assert.assertEquals; @@ -20,12 +20,12 @@ import org.junit.runner.RunWith; import antlr.RecognitionException; import antlr.TokenStreamException; -import com.mysema.query.hql.domain.Cat; import com.mysema.query.hql.domain.QCat; -import com.mysema.query.hql.hibernate.HibernateDeleteClause; -import com.mysema.query.hql.hibernate.HibernateQuery; -import com.mysema.query.hql.hibernate.HibernateUpdateClause; -import com.mysema.query.hql.hibernate.HibernateUtil; +import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.hibernate.HibernateDeleteClause; +import com.mysema.query.jpa.hibernate.HibernateQuery; +import com.mysema.query.jpa.hibernate.HibernateUpdateClause; +import com.mysema.query.jpa.hibernate.HibernateUtil; import com.mysema.query.types.EntityPath; import com.mysema.testutil.HibernateConfig; import com.mysema.testutil.HibernateTestRunner; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/JPAIntegrationTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/JPAIntegrationTest.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/JPAIntegrationTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/JPAIntegrationTest.java index 98f571055..44ca4b554 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/JPAIntegrationTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/JPAIntegrationTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import javax.persistence.EntityManager; import javax.persistence.Query; @@ -14,7 +14,7 @@ import org.junit.runner.RunWith; import antlr.RecognitionException; import antlr.TokenStreamException; -import com.mysema.query.hql.jpa.JPAUtil; +import com.mysema.query.jpa.impl.JPAUtil; import com.mysema.testutil.JPAConfig; import com.mysema.testutil.JPATestRunner; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/JoinFlagsTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/JoinFlagsTest.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/JoinFlagsTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/JoinFlagsTest.java index a8a8a2a5d..2b41d1de7 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/JoinFlagsTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/JoinFlagsTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import static org.junit.Assert.assertEquals; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/MathTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/MathTest.java similarity index 98% rename from querydsl-hql/src/test/java/com/mysema/query/hql/MathTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/MathTest.java index b1eb0130a..6a946c735 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/MathTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/MathTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import org.junit.Test; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/OrderExpressionsTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/OrderExpressionsTest.java similarity index 91% rename from querydsl-hql/src/test/java/com/mysema/query/hql/OrderExpressionsTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/OrderExpressionsTest.java index 1a7697847..9eda76d5f 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/OrderExpressionsTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/OrderExpressionsTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import org.junit.Test; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/ParsingTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/ParsingTest.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/ParsingTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/ParsingTest.java index af290b108..af8e389c0 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/ParsingTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/ParsingTest.java @@ -3,13 +3,13 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import static com.mysema.query.alias.Alias.$; import static com.mysema.query.alias.Alias.alias; -import static com.mysema.query.hql.HQLGrammar.all; -import static com.mysema.query.hql.HQLGrammar.some; -import static com.mysema.query.hql.HQLGrammar.sum; +import static com.mysema.query.jpa.HQLGrammar.all; +import static com.mysema.query.jpa.HQLGrammar.some; +import static com.mysema.query.jpa.HQLGrammar.sum; import static org.junit.Assert.assertEquals; import org.junit.Ignore; @@ -18,17 +18,17 @@ import org.junit.Test; import antlr.RecognitionException; import antlr.TokenStreamException; -import com.mysema.query.hql.domain.Cat; -import com.mysema.query.hql.domain.Catalog; -import com.mysema.query.hql.domain.Color; -import com.mysema.query.hql.domain.Customer; -import com.mysema.query.hql.domain.DomesticCat; -import com.mysema.query.hql.domain.Payment; -import com.mysema.query.hql.domain.Product; import com.mysema.query.hql.domain.QFamily; import com.mysema.query.hql.domain.QFooDTO; import com.mysema.query.hql.domain.QItem; import com.mysema.query.hql.domain.QProduct; +import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.domain.Catalog; +import com.mysema.query.jpa.domain.Color; +import com.mysema.query.jpa.domain.Customer; +import com.mysema.query.jpa.domain.DomesticCat; +import com.mysema.query.jpa.domain.Payment; +import com.mysema.query.jpa.domain.Product; import com.mysema.query.types.expr.ComparableExpression; import com.mysema.query.types.expr.DateExpression; import com.mysema.query.types.expr.NumberExpression; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/QueryHelper.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/QueryHelper.java similarity index 94% rename from querydsl-hql/src/test/java/com/mysema/query/hql/QueryHelper.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/QueryHelper.java index c2ce02ed9..fc3a168c4 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/QueryHelper.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/QueryHelper.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import static org.junit.Assert.assertEquals; @@ -21,6 +21,8 @@ import antlr.collections.AST; import com.mysema.commons.lang.CloseableIterator; import com.mysema.query.DefaultQueryMetadata; import com.mysema.query.SearchResults; +import com.mysema.query.jpa.HQLQueryBase; +import com.mysema.query.jpa.HQLTemplates; import com.mysema.query.types.Expression; class QueryHelper extends HQLQueryBase { diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/SerializationTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/SerializationTest.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/SerializationTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/SerializationTest.java index 641f89021..dbb9e9130 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/SerializationTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/SerializationTest.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql; +package com.mysema.query.jpa; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -17,7 +17,7 @@ import org.junit.runner.RunWith; import com.mysema.query.QueryMetadata; import com.mysema.query.hql.domain.QCat; -import com.mysema.query.hql.jpa.JPAQuery; +import com.mysema.query.jpa.impl.JPAQuery; import com.mysema.testutil.JPAConfig; import com.mysema.testutil.JPATestRunner; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/StringOperationsTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/StringOperationsTest.java similarity index 95% rename from querydsl-hql/src/test/java/com/mysema/query/hql/StringOperationsTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/StringOperationsTest.java index 90f9784b9..00663e414 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/StringOperationsTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/StringOperationsTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import org.junit.Test; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/SubQueryTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/SubQueryTest.java similarity index 95% rename from querydsl-hql/src/test/java/com/mysema/query/hql/SubQueryTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/SubQueryTest.java index 9ce18582a..1274ae512 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/SubQueryTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/SubQueryTest.java @@ -3,12 +3,14 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import static org.junit.Assert.assertEquals; import org.junit.Test; +import com.mysema.query.jpa.HQLSubQuery; + public class SubQueryTest extends AbstractQueryTest{ @Test(expected=IllegalArgumentException.class) diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/TypeCastTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/TypeCastTest.java similarity index 92% rename from querydsl-hql/src/test/java/com/mysema/query/hql/TypeCastTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/TypeCastTest.java index 9a2ce8203..09f152038 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/TypeCastTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/TypeCastTest.java @@ -3,19 +3,19 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.mysema.query.hql.domain.Animal; -import com.mysema.query.hql.domain.Cat; -import com.mysema.query.hql.domain.InheritedProperties; import com.mysema.query.hql.domain.QAnimal; import com.mysema.query.hql.domain.QCat; import com.mysema.query.hql.domain.QInheritedProperties; import com.mysema.query.hql.domain.QSuperclass; +import com.mysema.query.jpa.domain.Animal; +import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.domain.InheritedProperties; public class TypeCastTest { diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/UniqueResultsTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/UniqueResultsTest.java similarity index 88% rename from querydsl-hql/src/test/java/com/mysema/query/hql/UniqueResultsTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/UniqueResultsTest.java index b703adaa0..a4c2561ec 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/UniqueResultsTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/UniqueResultsTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql; +package com.mysema.query.jpa; import static com.mysema.query.hql.domain.QCat.cat; import static org.junit.Assert.assertEquals; @@ -12,8 +12,9 @@ import org.hibernate.Session; import org.junit.Test; import org.junit.runner.RunWith; -import com.mysema.query.hql.domain.Cat; -import com.mysema.query.hql.hibernate.HibernateQuery; +import com.mysema.query.jpa.HQLQuery; +import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.hibernate.HibernateQuery; import com.mysema.testutil.HibernateConfig; import com.mysema.testutil.HibernateTestRunner; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Account.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Account.java similarity index 92% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Account.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Account.java index a59d7f86b..0089afba3 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Account.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Account.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import static org.junit.Assert.fail; @@ -18,6 +18,7 @@ import javax.persistence.Transient; import org.junit.Test; import com.mysema.query.annotations.QueryInit; +import com.mysema.query.hql.domain.QAccount; /** * The Class Account. diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Animal.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Animal.java similarity index 98% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Animal.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Animal.java index eb5fc0ddd..a235d013f 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Animal.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Animal.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/AuditLog.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/AuditLog.java similarity index 88% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/AuditLog.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/AuditLog.java index 4579c4b00..b43d00819 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/AuditLog.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/AuditLog.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Bar.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Bar.java similarity index 90% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Bar.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Bar.java index 1049e12c6..41e2eccda 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Bar.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Bar.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Calendar.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Calendar.java similarity index 92% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Calendar.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Calendar.java index aa2ec9076..2d5030bc6 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Calendar.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Calendar.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.io.Serializable; import java.util.Map; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Cat.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Cat.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Cat.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Cat.java index 387a2420e..e9062454d 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Cat.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Cat.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.util.ArrayList; import java.util.List; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Catalog.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Catalog.java similarity index 93% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Catalog.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Catalog.java index 1fd099381..57fe67703 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Catalog.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Catalog.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.util.Date; import java.util.Set; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Color.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Color.java similarity index 78% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Color.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Color.java index 274ccb503..725b3768c 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Color.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Color.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; /** * The Enum Color. diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Company.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Company.java similarity index 93% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Company.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Company.java index e1660e0b7..038857f1a 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Company.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Company.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.util.List; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Customer.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Customer.java similarity index 89% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Customer.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Customer.java index 2baff58b1..95b73d095 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Customer.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Customer.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Department.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Department.java similarity index 93% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Department.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Department.java index 2c5af3fb4..34845d960 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Department.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Department.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.util.List; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Document.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Document.java similarity index 91% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Document.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Document.java index f65ff5e07..af844bcfb 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Document.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Document.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.util.Date; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Domain.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Domain.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Domain.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Domain.java index e55727d19..ad0c15811 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Domain.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Domain.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.util.Arrays; import java.util.List; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/DomesticCat.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/DomesticCat.java similarity index 87% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/DomesticCat.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/DomesticCat.java index b5a99477a..d40fbd248 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/DomesticCat.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/DomesticCat.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/EmbeddedType.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/EmbeddedType.java similarity index 87% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/EmbeddedType.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/EmbeddedType.java index fd1e97b76..7beaf20fa 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/EmbeddedType.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/EmbeddedType.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.io.Serializable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Employee.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Employee.java similarity index 89% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Employee.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Employee.java index 6f579446a..c43ec9022 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Employee.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Employee.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/EvilType.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/EvilType.java similarity index 94% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/EvilType.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/EvilType.java index 20c0bd516..ebc0743b6 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/EvilType.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/EvilType.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Family.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Family.java similarity index 87% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Family.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Family.java index 3e094cf61..93a8d6846 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Family.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Family.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import com.mysema.query.annotations.QueryProjection; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Foo.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Foo.java similarity index 93% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Foo.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Foo.java index ed54df0bf..ad5e68d81 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Foo.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Foo.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.util.List; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/FooDTO.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/FooDTO.java similarity index 94% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/FooDTO.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/FooDTO.java index c9aba245b..a0f79045c 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/FooDTO.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/FooDTO.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.util.List; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Formula.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Formula.java similarity index 91% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Formula.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Formula.java index cf2008802..5cca877af 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Formula.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Formula.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/InheritedProperties.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/InheritedProperties.java similarity index 86% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/InheritedProperties.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/InheritedProperties.java index ec26d3623..160ba43ce 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/InheritedProperties.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/InheritedProperties.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Item.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Item.java similarity index 88% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Item.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Item.java index 0cb0f4875..75ad60eb0 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Item.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Item.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Location.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Location.java similarity index 86% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Location.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Location.java index 2b282d67d..33a5c12f6 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Location.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Location.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Name.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Name.java similarity index 87% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Name.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Name.java index a75b767f4..c0d09b113 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Name.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Name.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/NameList.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/NameList.java similarity index 90% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/NameList.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/NameList.java index 4d340d884..678a3b27c 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/NameList.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/NameList.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.util.Collection; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Named.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Named.java similarity index 86% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Named.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Named.java index 7677f02fe..b03bbbaa3 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Named.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Named.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Nationality.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Nationality.java similarity index 91% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Nationality.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Nationality.java index 7f988d508..3213dd490 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Nationality.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Nationality.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.io.Serializable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Order.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Order.java similarity index 95% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Order.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Order.java index 43c3b0f66..ed93c2cce 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Order.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Order.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.util.List; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Parameter.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Parameter.java similarity index 85% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Parameter.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Parameter.java index d9853bb85..c17dea877 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Parameter.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Parameter.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Payment.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Payment.java similarity index 91% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Payment.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Payment.java index 7543c077a..c4c1e5715 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Payment.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Payment.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.util.Collection; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/PaymentStatus.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/PaymentStatus.java similarity index 80% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/PaymentStatus.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/PaymentStatus.java index befa7bfe2..de2def6d7 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/PaymentStatus.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/PaymentStatus.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; /** * The Enum PaymentStatus. diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Person.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Person.java similarity index 94% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Person.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Person.java index 34429d61a..9b323a38c 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Person.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Person.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.io.Serializable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/PersonId.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/PersonId.java similarity index 90% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/PersonId.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/PersonId.java index 256bfcbe3..a9cba5086 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/PersonId.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/PersonId.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.io.Serializable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Player.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Player.java similarity index 90% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Player.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Player.java index b293a8ec3..1eba0ffa7 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Player.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Player.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.util.List; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Price.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Price.java similarity index 89% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Price.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Price.java index e9b2fbd9d..d9342ca88 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Price.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Price.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Product.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Product.java similarity index 85% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Product.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Product.java index 16c8f5a8b..e52257fce 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Product.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Product.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Show.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Show.java similarity index 90% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Show.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Show.java index e9b4558fb..e040f1ca9 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Show.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Show.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.util.Map; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/SimpleTypes.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/SimpleTypes.java similarity index 95% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/SimpleTypes.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/SimpleTypes.java index bf3bb46ba..276bf9c6f 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/SimpleTypes.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/SimpleTypes.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.math.BigDecimal; import java.util.Date; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Status.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Status.java similarity index 86% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Status.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Status.java index b8212521b..c759ecdad 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Status.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Status.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/StatusChange.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/StatusChange.java similarity index 90% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/StatusChange.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/StatusChange.java index eb75878f5..6ca73566c 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/StatusChange.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/StatusChange.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Store.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Store.java similarity index 91% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Store.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Store.java index dde30759f..c7474ceb1 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Store.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Store.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import java.util.List; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Superclass.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Superclass.java similarity index 93% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/Superclass.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Superclass.java index 1433aa304..49a73f614 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/Superclass.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/Superclass.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.MappedSuperclass; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/User.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/User.java similarity index 91% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/User.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/User.java index 6bc427b9d..4c37bdf09 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/User.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/User.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/package-info.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/package-info.java similarity index 82% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/package-info.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/package-info.java index 36334a78c..df6a7fa97 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/package-info.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/package-info.java @@ -4,6 +4,6 @@ * */ @QuerydslConfig(listAccessors=true, mapAccessors=true) -package com.mysema.query.hql.domain; +package com.mysema.query.jpa.domain; import com.mysema.query.annotations.QuerydslConfig; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SAccount.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SAccount.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SAccount.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SAccount.java index 2187d23c0..6fcaf1c95 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SAccount.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SAccount.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SAnimal.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SAnimal.java similarity index 98% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SAnimal.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SAnimal.java index 31660458d..739f13b14 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SAnimal.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SAnimal.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SAuditlog.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SAuditlog.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SAuditlog.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SAuditlog.java index ad10b83e6..1aeab3667 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SAuditlog.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SAuditlog.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SBar.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SBar.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SBar.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SBar.java index 3481c7c9f..8107865a9 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SBar.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SBar.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCalendar.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCalendar.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCalendar.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCalendar.java index 094ebe627..1bbdf3e12 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCalendar.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCalendar.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCalendarHolidays.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCalendarHolidays.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCalendarHolidays.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCalendarHolidays.java index a63d173e3..55c535422 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCalendarHolidays.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCalendarHolidays.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCatalog.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCatalog.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCatalog.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCatalog.java index fd1107814..9a093c08b 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCatalog.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCatalog.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCatalogPrice.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCatalogPrice.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCatalogPrice.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCatalogPrice.java index 17119d2a1..3f2be6b67 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCatalogPrice.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCatalogPrice.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCompany.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCompany.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCompany.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCompany.java index b2a2d8575..db1d65bdd 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCompany.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCompany.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCustomer.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCustomer.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCustomer.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCustomer.java index 58e096b68..dc499fd7b 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SCustomer.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SCustomer.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SDepartment.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SDepartment.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SDepartment.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SDepartment.java index 29085b927..019b31dc1 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SDepartment.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SDepartment.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SDocument.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SDocument.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SDocument.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SDocument.java index c7e7750b0..d4386e8dd 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SDocument.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SDocument.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SEmployee.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SEmployee.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SEmployee.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SEmployee.java index 3d455bd97..b1ac24d20 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SEmployee.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SEmployee.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SFoo.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SFoo.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SFoo.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SFoo.java index d87f6f94b..7e0487386 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SFoo.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SFoo.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SFormula.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SFormula.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SFormula.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SFormula.java index e7234dbbb..ab245cb13 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SFormula.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SFormula.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SInheritedproperties.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SInheritedproperties.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SInheritedproperties.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SInheritedproperties.java index 825be5a28..41a63b825 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SInheritedproperties.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SInheritedproperties.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SItem.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SItem.java similarity index 98% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SItem.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SItem.java index b066d7f4a..a40640940 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SItem.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SItem.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SItemStatuschange.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SItemStatuschange.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SItemStatuschange.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SItemStatuschange.java index 23038b90b..64aab80a1 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SItemStatuschange.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SItemStatuschange.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SKittens.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SKittens.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SKittens.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SKittens.java index ef568398c..9647f0748 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SKittens.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SKittens.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SKittensArray.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SKittensArray.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SKittensArray.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SKittensArray.java index 157fafcb6..0884c5e1b 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SKittensArray.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SKittensArray.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SKittensSet.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SKittensSet.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SKittensSet.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SKittensSet.java index 725bb84c3..1733a2eef 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SKittensSet.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SKittensSet.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SLocation.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SLocation.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SLocation.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SLocation.java index 1468b9d44..683c6c3ed 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SLocation.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SLocation.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SName.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SName.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SName.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SName.java index 00fdf5d84..e37025c9f 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SName.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SName.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SNamed.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SNamed.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SNamed.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SNamed.java index 4cffb53ad..8d8a90db1 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SNamed.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SNamed.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SNamelist.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SNamelist.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SNamelist.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SNamelist.java index 7aa6b0a67..1caf6cfe3 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SNamelist.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SNamelist.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SNamelistNames.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SNamelistNames.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SNamelistNames.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SNamelistNames.java index ff8a66270..7e89acb6b 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SNamelistNames.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SNamelistNames.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SNationality.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SNationality.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SNationality.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SNationality.java index 229f46d97..fef1551ba 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SNationality.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SNationality.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SOrder.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SOrder.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SOrder.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SOrder.java index fccbfc6a3..6658d9c21 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SOrder.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SOrder.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SParameter.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SParameter.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SParameter.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SParameter.java index a8ed508f6..af9350155 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SParameter.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SParameter.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPerson.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPerson.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPerson.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPerson.java index 779dbf4d1..43fb24da1 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPerson.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPerson.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPersonid.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPersonid.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPersonid.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPersonid.java index 513f457d4..e6aca4e56 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPersonid.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPersonid.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPlayer.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPlayer.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPlayer.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPlayer.java index 6f7ecc863..33382dbe4 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPlayer.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPlayer.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPlayerScores.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPlayerScores.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPlayerScores.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPlayerScores.java index addeb6068..079139c48 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPlayerScores.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPlayerScores.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPrice.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPrice.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPrice.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPrice.java index 5f30e8153..ef6d1d231 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SPrice.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SPrice.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SShow.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SShow.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SShow.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SShow.java index d13d1fe53..c32bf63a8 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SShow.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SShow.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SShowActs.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SShowActs.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SShowActs.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SShowActs.java index d20cfcdae..9b973975c 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SShowActs.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SShowActs.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SSimpletypes.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SSimpletypes.java similarity index 98% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SSimpletypes.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SSimpletypes.java index 22e1bf342..9618f7471 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SSimpletypes.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SSimpletypes.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SStatus.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SStatus.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SStatus.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SStatus.java index 45c67bf1d..5f081f50e 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SStatus.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SStatus.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SStatuschange.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SStatuschange.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SStatuschange.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SStatuschange.java index 7f534cb8a..f1a437054 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SStatuschange.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SStatuschange.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SStore.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SStore.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SStore.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SStore.java index c1ffa1b66..8e7c5bab4 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SStore.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SStore.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SStoreCustomer.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SStoreCustomer.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SStoreCustomer.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SStoreCustomer.java index 8dab0ed61..40691ccc6 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SStoreCustomer.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SStoreCustomer.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SUser.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SUser.java similarity index 97% rename from querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SUser.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SUser.java index 8a1baea0c..ed72385bb 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/domain/sql/SUser.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/domain/sql/SUser.java @@ -1,4 +1,4 @@ -package com.mysema.query.hql.domain.sql; +package com.mysema.query.jpa.domain.sql; import static com.mysema.query.types.path.PathMetadataFactory.forVariable; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/hibernate/sql/DerbySQLTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/hibernate/sql/DerbySQLTest.java similarity index 95% rename from querydsl-hql/src/test/java/com/mysema/query/hql/hibernate/sql/DerbySQLTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/hibernate/sql/DerbySQLTest.java index 99c64a03b..4f51af47e 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/hibernate/sql/DerbySQLTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/hibernate/sql/DerbySQLTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.hibernate.sql; +package com.mysema.query.jpa.hibernate.sql; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -17,9 +17,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import com.mysema.query.SearchResults; -import com.mysema.query.hql.domain.Cat; import com.mysema.query.hql.domain.QCat; -import com.mysema.query.hql.domain.sql.SAnimal; +import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.domain.sql.SAnimal; +import com.mysema.query.jpa.hibernate.sql.HibernateSQLQuery; import com.mysema.query.sql.DerbyTemplates; import com.mysema.query.sql.SQLTemplates; import com.mysema.query.types.expr.ConstructorExpression; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/hibernate/sql/QueryMutabilityTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/hibernate/sql/QueryMutabilityTest.java similarity index 91% rename from querydsl-hql/src/test/java/com/mysema/query/hql/hibernate/sql/QueryMutabilityTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/hibernate/sql/QueryMutabilityTest.java index b4235cffb..b49e03f58 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/hibernate/sql/QueryMutabilityTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/hibernate/sql/QueryMutabilityTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.hibernate.sql; +package com.mysema.query.jpa.hibernate.sql; import static org.junit.Assert.assertEquals; @@ -15,7 +15,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import com.mysema.query.QueryMutability; -import com.mysema.query.hql.domain.sql.SAnimal; +import com.mysema.query.jpa.domain.sql.SAnimal; +import com.mysema.query.jpa.hibernate.sql.HibernateSQLQuery; import com.mysema.query.sql.DerbyTemplates; import com.mysema.query.sql.SQLTemplates; import com.mysema.testutil.HibernateConfig; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/jpa/sql/JPADerbySQLTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/sql/JPADerbySQLTest.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/jpa/sql/JPADerbySQLTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/sql/JPADerbySQLTest.java index dd2bec864..faf1deedb 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/jpa/sql/JPADerbySQLTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/sql/JPADerbySQLTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.jpa.sql; +package com.mysema.query.jpa.sql; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -21,9 +21,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import com.mysema.query.SearchResults; -import com.mysema.query.hql.domain.Cat; import com.mysema.query.hql.domain.QCat; -import com.mysema.query.hql.domain.sql.SAnimal; +import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.domain.sql.SAnimal; +import com.mysema.query.jpa.sql.JPASQLQuery; import com.mysema.query.sql.DerbyTemplates; import com.mysema.query.sql.SQLTemplates; import com.mysema.query.types.expr.ConstructorExpression; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/jpa/sql/JPAQueryMutabilityTest.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/sql/JPAQueryMutabilityTest.java similarity index 91% rename from querydsl-hql/src/test/java/com/mysema/query/hql/jpa/sql/JPAQueryMutabilityTest.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/sql/JPAQueryMutabilityTest.java index cb9b560ad..82fb01c0b 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/jpa/sql/JPAQueryMutabilityTest.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/sql/JPAQueryMutabilityTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.jpa.sql; +package com.mysema.query.jpa.sql; import static org.junit.Assert.assertEquals; @@ -16,8 +16,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import com.mysema.query.QueryMutability; -import com.mysema.query.hql.domain.Cat; -import com.mysema.query.hql.domain.sql.SAnimal; +import com.mysema.query.jpa.domain.Cat; +import com.mysema.query.jpa.domain.sql.SAnimal; +import com.mysema.query.jpa.sql.JPASQLQuery; import com.mysema.query.sql.DerbyTemplates; import com.mysema.query.sql.SQLTemplates; import com.mysema.testutil.JPAConfig; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/support/ExtendedDerbyDialect.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/support/ExtendedDerbyDialect.java similarity index 96% rename from querydsl-hql/src/test/java/com/mysema/query/hql/support/ExtendedDerbyDialect.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/support/ExtendedDerbyDialect.java index 5bbdc5ba1..8ba801d59 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/support/ExtendedDerbyDialect.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/support/ExtendedDerbyDialect.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.support; +package com.mysema.query.jpa.support; import java.util.Arrays; import java.util.List; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/support/ExtendedHSQLDialect.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/support/ExtendedHSQLDialect.java similarity index 91% rename from querydsl-hql/src/test/java/com/mysema/query/hql/support/ExtendedHSQLDialect.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/support/ExtendedHSQLDialect.java index 71070b7c0..6790b9f97 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/support/ExtendedHSQLDialect.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/support/ExtendedHSQLDialect.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.hql.support; +package com.mysema.query.jpa.support; import org.hibernate.Hibernate; import org.hibernate.dialect.HSQLDialect; diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/support/package-info.java b/querydsl-hql/src/test/java/com/mysema/query/jpa/support/package-info.java similarity index 85% rename from querydsl-hql/src/test/java/com/mysema/query/hql/support/package-info.java rename to querydsl-hql/src/test/java/com/mysema/query/jpa/support/package-info.java index 039e41383..097905940 100644 --- a/querydsl-hql/src/test/java/com/mysema/query/hql/support/package-info.java +++ b/querydsl-hql/src/test/java/com/mysema/query/jpa/support/package-info.java @@ -8,7 +8,7 @@ * HQL for JPA */ @DefaultAnnotation( { Nonnull.class }) -package com.mysema.query.hql.support; +package com.mysema.query.jpa.support; import javax.annotation.Nonnull; diff --git a/querydsl-hql/src/test/java/com/mysema/testutil/HibernateTestRunner.java b/querydsl-hql/src/test/java/com/mysema/testutil/HibernateTestRunner.java index 4f441ac01..4d25b2ec4 100644 --- a/querydsl-hql/src/test/java/com/mysema/testutil/HibernateTestRunner.java +++ b/querydsl-hql/src/test/java/com/mysema/testutil/HibernateTestRunner.java @@ -16,7 +16,7 @@ import org.junit.internal.runners.InitializationError; import org.junit.internal.runners.JUnit4ClassRunner; import org.junit.runner.notification.RunNotifier; -import com.mysema.query.hql.domain.Domain; +import com.mysema.query.jpa.domain.Domain; /** * HibernateTestRunner provides.