diff --git a/querydsl-jpa-codegen/pom.xml b/querydsl-jpa-codegen/pom.xml index 6d62423f01..dccd5681cb 100644 --- a/querydsl-jpa-codegen/pom.xml +++ b/querydsl-jpa-codegen/pom.xml @@ -68,7 +68,12 @@ querydsl-codegen ${project.parent.version} - + + com.mysema.querydsl + querydsl-jpa + ${project.parent.version} + + com.mysema.querydsl querydsl-jpa ${project.parent.version} diff --git a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractMetaDataExportMojo.java b/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractMetaDataExportMojo.java index df70c1f614..75a11eec0f 100644 --- a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractMetaDataExportMojo.java +++ b/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractMetaDataExportMojo.java @@ -23,6 +23,8 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; +import com.mysema.query.codegen.*; +import com.mysema.query.sql.codegen.*; import com.mysema.query.sql.Configuration; import com.mysema.query.sql.SQLTemplates; import com.mysema.query.sql.types.Type; diff --git a/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/Serializers.scala b/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/Serializers.scala index 748c2b0616..86ec3f3b1e 100644 --- a/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/Serializers.scala +++ b/querydsl-scala/src/main/scala/com/mysema/query/scala/sql/Serializers.scala @@ -20,6 +20,7 @@ import com.mysema.codegen.model._ import com.mysema.query.codegen._ import com.mysema.query.scala.ScalaEntitySerializer import com.mysema.query.sql._ +import com.mysema.query.sql.codegen._ import com.mysema.query.sql.support._ import java.util._ import scala.collection.JavaConversions._ diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/JDBCIntegrationTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/JDBCIntegrationTest.scala index 2ec7257607..f7f6887771 100644 --- a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/JDBCIntegrationTest.scala +++ b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/JDBCIntegrationTest.scala @@ -20,6 +20,7 @@ import com.mysema.query.scala.CompileTestUtils import com.mysema.query.scala.ScalaBeanSerializer import com.mysema.query.scala.ScalaTypeMappings +import com.mysema.query.sql.codegen._ import com.mysema.query.sql.dml._ import com.mysema.query.scala.Helpers._ diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/MetaDataExporterTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/MetaDataExporterTest.scala index 8fd48c73d1..00b6916218 100644 --- a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/MetaDataExporterTest.scala +++ b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/MetaDataExporterTest.scala @@ -1,11 +1,12 @@ package com.mysema.query.scala.sql import org.apache.commons.lang3.StringUtils -import com.mysema.codegen._; -import com.mysema.codegen.model._; +import com.mysema.codegen._ +import com.mysema.codegen.model._ -import com.mysema.query.codegen._; +import com.mysema.query.codegen._ import com.mysema.query.sql._ +import com.mysema.query.sql.codegen._ import java.io.StringWriter; diff --git a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/MetaDataSerializerTest.scala b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/MetaDataSerializerTest.scala index e434e526e3..81be6e97c2 100644 --- a/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/MetaDataSerializerTest.scala +++ b/querydsl-scala/src/test/scala/com/mysema/query/scala/sql/MetaDataSerializerTest.scala @@ -6,6 +6,7 @@ import com.mysema.codegen.model._; import com.mysema.query.codegen._; import com.mysema.query.sql._ +import com.mysema.query.sql.codegen._ import java.io.StringWriter; diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ant/AntMetaDataExporter.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ant/AntMetaDataExporter.java index 06df3a0993..056a428e43 100644 --- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ant/AntMetaDataExporter.java +++ b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ant/AntMetaDataExporter.java @@ -22,9 +22,9 @@ import org.apache.tools.ant.Task; import com.mysema.query.codegen.BeanSerializer; -import com.mysema.query.sql.DefaultNamingStrategy; -import com.mysema.query.sql.MetaDataExporter; -import com.mysema.query.sql.NamingStrategy; +import com.mysema.query.sql.codegen.DefaultNamingStrategy; +import com.mysema.query.sql.codegen.MetaDataExporter; +import com.mysema.query.sql.codegen.NamingStrategy; /** * AntMetaDataExporter exports JDBC metadata to Querydsl query types diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/AbstractNamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/AbstractNamingStrategy.java similarity index 98% rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/AbstractNamingStrategy.java rename to querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/AbstractNamingStrategy.java index f14cb4da4a..03d5d01a87 100644 --- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/AbstractNamingStrategy.java +++ b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/AbstractNamingStrategy.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import com.mysema.query.codegen.EntityType; import com.mysema.util.JavaSyntaxUtils; diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/DefaultNamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/DefaultNamingStrategy.java similarity index 99% rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/DefaultNamingStrategy.java rename to querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/DefaultNamingStrategy.java index 4bff810a29..238d58fffa 100644 --- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/DefaultNamingStrategy.java +++ b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/DefaultNamingStrategy.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import java.util.Locale; diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ExtendedBeanSerializer.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/ExtendedBeanSerializer.java similarity index 99% rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ExtendedBeanSerializer.java rename to querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/ExtendedBeanSerializer.java index 452cb758ef..f7ac7b1f68 100644 --- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ExtendedBeanSerializer.java +++ b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/ExtendedBeanSerializer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import java.io.IOException; import java.util.ArrayList; diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ExtendedNamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/ExtendedNamingStrategy.java similarity index 98% rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ExtendedNamingStrategy.java rename to querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/ExtendedNamingStrategy.java index 4e781cb8f5..b3bf96f9a8 100644 --- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ExtendedNamingStrategy.java +++ b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/ExtendedNamingStrategy.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import java.util.regex.Pattern; diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/KeyDataFactory.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/KeyDataFactory.java similarity index 99% rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/KeyDataFactory.java rename to querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/KeyDataFactory.java index 0c06c9e2e7..44b3fe8c2a 100644 --- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/KeyDataFactory.java +++ b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/KeyDataFactory.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import java.sql.DatabaseMetaData; import java.sql.ResultSet; diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/MetaDataExporter.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/MetaDataExporter.java similarity index 99% rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/MetaDataExporter.java rename to querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/MetaDataExporter.java index 76066b9d19..d1b479b04c 100644 --- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/MetaDataExporter.java +++ b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/MetaDataExporter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import java.io.File; import java.io.IOException; diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/MetaDataSerializer.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/MetaDataSerializer.java similarity index 99% rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/MetaDataSerializer.java rename to querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/MetaDataSerializer.java index 59d1daf37a..1026766543 100644 --- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/MetaDataSerializer.java +++ b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/MetaDataSerializer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import static com.mysema.codegen.Symbols.NEW; diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/NamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/NamingStrategy.java similarity index 98% rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/NamingStrategy.java rename to querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/NamingStrategy.java index 34afc03a8f..aa2faa759c 100644 --- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/NamingStrategy.java +++ b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/NamingStrategy.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import com.mysema.query.codegen.EntityType; diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/OriginalNamingStrategy.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/OriginalNamingStrategy.java similarity index 98% rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/OriginalNamingStrategy.java rename to querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/OriginalNamingStrategy.java index 0ad083d547..3b877bc81a 100644 --- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/OriginalNamingStrategy.java +++ b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/OriginalNamingStrategy.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import org.apache.commons.lang3.StringUtils; diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/SQLCodegenModule.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SQLCodegenModule.java similarity index 98% rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/SQLCodegenModule.java rename to querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SQLCodegenModule.java index ac465d571f..6802922761 100644 --- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/SQLCodegenModule.java +++ b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SQLCodegenModule.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import com.mysema.query.codegen.CodegenModule; import com.mysema.query.codegen.QueryTypeFactory; diff --git a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/SQLQueryTypeFactory.java b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SQLQueryTypeFactory.java similarity index 97% rename from querydsl-sql-codegen/src/main/java/com/mysema/query/sql/SQLQueryTypeFactory.java rename to querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SQLQueryTypeFactory.java index c996c98e35..0754c88330 100644 --- a/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/SQLQueryTypeFactory.java +++ b/querydsl-sql-codegen/src/main/java/com/mysema/query/sql/codegen/SQLQueryTypeFactory.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import javax.inject.Inject; import javax.inject.Named; diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportBaseTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportBaseTest.java index 0f49d74333..ca0a8eb84e 100644 --- a/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportBaseTest.java +++ b/querydsl-sql-codegen/src/test/java/com/mysema/query/ExportBaseTest.java @@ -20,9 +20,9 @@ import org.junit.Test; import org.junit.runner.RunWith; -import com.mysema.query.sql.DefaultNamingStrategy; -import com.mysema.query.sql.MetaDataExporter; -import com.mysema.query.sql.NamingStrategy; +import com.mysema.query.sql.codegen.DefaultNamingStrategy; +import com.mysema.query.sql.codegen.MetaDataExporter; +import com.mysema.query.sql.codegen.NamingStrategy; import com.mysema.testutil.FilteringTestRunner; @RunWith(FilteringTestRunner.class) diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/CustomTypesTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/CustomTypesTest.java similarity index 89% rename from querydsl-sql-codegen/src/test/java/com/mysema/query/sql/CustomTypesTest.java rename to querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/CustomTypesTest.java index 119c19663b..d4b3926108 100644 --- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/CustomTypesTest.java +++ b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/CustomTypesTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -26,6 +26,15 @@ import com.mysema.query.AbstractJDBCTest; import com.mysema.query.alias.Gender; +import com.mysema.query.sql.Configuration; +import com.mysema.query.sql.EncryptedString; +import com.mysema.query.sql.HSQLDBTemplates; +import com.mysema.query.sql.QPerson; +import com.mysema.query.sql.SQLQuery; +import com.mysema.query.sql.SQLQueryImpl; +import com.mysema.query.sql.codegen.DefaultNamingStrategy; +import com.mysema.query.sql.codegen.MetaDataExporter; +import com.mysema.query.sql.codegen.NamingStrategy; import com.mysema.query.sql.dml.SQLInsertClause; import com.mysema.query.sql.dml.SQLUpdateClause; import com.mysema.query.sql.types.EnumByNameType; diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/DefaultNamingStrategyTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/DefaultNamingStrategyTest.java similarity index 95% rename from querydsl-sql-codegen/src/test/java/com/mysema/query/sql/DefaultNamingStrategyTest.java rename to querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/DefaultNamingStrategyTest.java index ff51a9d7ab..a9fe5d0198 100644 --- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/DefaultNamingStrategyTest.java +++ b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/DefaultNamingStrategyTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import static org.junit.Assert.assertEquals; @@ -20,6 +20,8 @@ import com.mysema.codegen.model.Types; import com.mysema.query.codegen.EntityType; +import com.mysema.query.sql.codegen.DefaultNamingStrategy; +import com.mysema.query.sql.codegen.NamingStrategy; public class DefaultNamingStrategyTest { diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/ExtendedNamingStrategyTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/ExtendedNamingStrategyTest.java similarity index 95% rename from querydsl-sql-codegen/src/test/java/com/mysema/query/sql/ExtendedNamingStrategyTest.java rename to querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/ExtendedNamingStrategyTest.java index f4f36038ed..29092cd163 100644 --- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/ExtendedNamingStrategyTest.java +++ b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/ExtendedNamingStrategyTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import static org.junit.Assert.assertEquals; @@ -20,6 +20,8 @@ import com.mysema.codegen.model.Types; import com.mysema.query.codegen.EntityType; +import com.mysema.query.sql.codegen.ExtendedNamingStrategy; +import com.mysema.query.sql.codegen.NamingStrategy; public class ExtendedNamingStrategyTest { diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/KeyDataFactoryTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/KeyDataFactoryTest.java similarity index 95% rename from querydsl-sql-codegen/src/test/java/com/mysema/query/sql/KeyDataFactoryTest.java rename to querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/KeyDataFactoryTest.java index cff8100921..dc5b4e0f29 100644 --- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/KeyDataFactoryTest.java +++ b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/KeyDataFactoryTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -23,6 +23,8 @@ import org.junit.Test; import com.mysema.query.AbstractJDBCTest; +import com.mysema.query.sql.codegen.DefaultNamingStrategy; +import com.mysema.query.sql.codegen.KeyDataFactory; import com.mysema.query.sql.support.ForeignKeyData; import com.mysema.query.sql.support.InverseForeignKeyData; import com.mysema.query.sql.support.PrimaryKeyData; diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/MetaDataExporterTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataExporterTest.java similarity index 97% rename from querydsl-sql-codegen/src/test/java/com/mysema/query/sql/MetaDataExporterTest.java rename to querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataExporterTest.java index 8de44e3c61..da948d88c6 100644 --- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/MetaDataExporterTest.java +++ b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataExporterTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -40,6 +40,10 @@ import com.mysema.codegen.SimpleCompiler; import com.mysema.query.codegen.BeanSerializer; import com.mysema.query.codegen.Serializer; +import com.mysema.query.sql.codegen.DefaultNamingStrategy; +import com.mysema.query.sql.codegen.MetaDataExporter; +import com.mysema.query.sql.codegen.NamingStrategy; +import com.mysema.query.sql.codegen.OriginalNamingStrategy; public class MetaDataExporterTest { diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/MetaDataSerializerTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataSerializerTest.java similarity index 94% rename from querydsl-sql-codegen/src/test/java/com/mysema/query/sql/MetaDataSerializerTest.java rename to querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataSerializerTest.java index 8a13d71845..4bedfc1afb 100644 --- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/MetaDataSerializerTest.java +++ b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataSerializerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import java.io.File; import java.sql.SQLException; @@ -26,6 +26,9 @@ import com.mysema.codegen.SimpleCompiler; import com.mysema.query.AbstractJDBCTest; +import com.mysema.query.sql.codegen.DefaultNamingStrategy; +import com.mysema.query.sql.codegen.MetaDataExporter; +import com.mysema.query.sql.codegen.NamingStrategy; public class MetaDataSerializerTest extends AbstractJDBCTest{ diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/MetaDataTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataTest.java similarity index 92% rename from querydsl-sql-codegen/src/test/java/com/mysema/query/sql/MetaDataTest.java rename to querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataTest.java index d3dd5694c4..a78067bfab 100644 --- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/MetaDataTest.java +++ b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/MetaDataTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import static org.junit.Assert.assertEquals; @@ -22,6 +22,8 @@ import com.mysema.codegen.model.Type; import com.mysema.codegen.model.TypeCategory; import com.mysema.query.codegen.EntityType; +import com.mysema.query.sql.codegen.DefaultNamingStrategy; +import com.mysema.query.sql.codegen.NamingStrategy; public class MetaDataTest { diff --git a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/OriginalNamingStrategyTest.java b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/OriginalNamingStrategyTest.java similarity index 94% rename from querydsl-sql-codegen/src/test/java/com/mysema/query/sql/OriginalNamingStrategyTest.java rename to querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/OriginalNamingStrategyTest.java index c354b51095..3df66c0005 100644 --- a/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/OriginalNamingStrategyTest.java +++ b/querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/OriginalNamingStrategyTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.mysema.query.sql; +package com.mysema.query.sql.codegen; import static org.junit.Assert.assertEquals; @@ -19,6 +19,8 @@ import com.mysema.codegen.model.Types; import com.mysema.query.codegen.EntityType; +import com.mysema.query.sql.codegen.NamingStrategy; +import com.mysema.query.sql.codegen.OriginalNamingStrategy; public class OriginalNamingStrategyTest { diff --git a/querydsl-sql/src/test/java/com/mysema/query/Connections.java b/querydsl-sql/src/test/java/com/mysema/query/Connections.java index 642ef09b2e..73db2e2800 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/Connections.java +++ b/querydsl-sql/src/test/java/com/mysema/query/Connections.java @@ -120,12 +120,12 @@ private static Connection getSQLServer() throws ClassNotFoundException, SQLExcep return DriverManager.getConnection(url, "querydsl","querydsl"); } - private static CreateTableClause createTable(SQLTemplates templates, String table){ - return new CreateTableClause(connHolder.get(), templates, table); - } +// private static CreateTableClause createTable(SQLTemplates templates, String table){ +// return new CreateTableClause(connHolder.get(), templates, table); +// } private static void dropTable(SQLTemplates templates, String table){ - new DropTableClause(connHolder.get(), templates, table).execute(); +// new DropTableClause(connHolder.get(), templates, table).execute(); } public static Statement getStatement(){ @@ -133,17 +133,17 @@ public static Statement getStatement(){ } private static void createEmployeeTable(SQLTemplates templates) { - createTable(templates, "EMPLOYEE") - .column("ID", Integer.class) - .column("FIRSTNAME", String.class).size(50) - .column("LASTNAME", String.class).size(50) - .column("SALARY",Double.class) - .column("DATEFIELD",Date.class) - .column("TIMEFIELD",Time.class) - .column("SUPERIOR_ID",Integer.class) - .primaryKey("PK_EMPLOYEE", "ID") - .foreignKey("FK_SUPERIOR","SUPERIOR_ID").references("EMPLOYEE","ID") - .execute(); +// createTable(templates, "EMPLOYEE") +// .column("ID", Integer.class) +// .column("FIRSTNAME", String.class).size(50) +// .column("LASTNAME", String.class).size(50) +// .column("SALARY",Double.class) +// .column("DATEFIELD",Date.class) +// .column("TIMEFIELD",Time.class) +// .column("SUPERIOR_ID",Integer.class) +// .primaryKey("PK_EMPLOYEE", "ID") +// .foreignKey("FK_SUPERIOR","SUPERIOR_ID").references("EMPLOYEE","ID") +// .execute(); } public static void initDerby() throws SQLException, ClassNotFoundException{ diff --git a/querydsl-sql/src/test/java/com/mysema/query/_derby/CreateTableDerbyTest.java b/querydsl-sql/src/test/java/com/mysema/query/_derby/CreateTableDerbyTest.java deleted file mode 100644 index a3152cb997..0000000000 --- a/querydsl-sql/src/test/java/com/mysema/query/_derby/CreateTableDerbyTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2011, Mysema Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mysema.query._derby; - -import java.sql.SQLException; - -import org.junit.Before; -import org.junit.BeforeClass; - -import com.mysema.query.Connections; -import com.mysema.query.CreateTableBaseTest; -import com.mysema.query.Target; -import com.mysema.query.sql.DerbyTemplates; -import com.mysema.testutil.Label; - -@Label(Target.DERBY) -public class CreateTableDerbyTest extends CreateTableBaseTest{ - - @BeforeClass - public static void setUpClass() throws Exception { - Connections.initDerby(); - } - - @Before - public void setUp() throws SQLException { - super.setUp(); - templates = new DerbyTemplates(){{ - newLineToSingleSpace(); - }}; - } - -} diff --git a/querydsl-sql/src/test/java/com/mysema/query/_h2/CreateTableH2Test.java b/querydsl-sql/src/test/java/com/mysema/query/_h2/CreateTableH2Test.java deleted file mode 100644 index 884681d074..0000000000 --- a/querydsl-sql/src/test/java/com/mysema/query/_h2/CreateTableH2Test.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2011, Mysema Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mysema.query._h2; - -import java.sql.SQLException; - -import org.junit.Before; -import org.junit.BeforeClass; - -import com.mysema.query.Connections; -import com.mysema.query.CreateTableBaseTest; -import com.mysema.query.Target; -import com.mysema.query.sql.H2Templates; -import com.mysema.testutil.Label; - -@Label(Target.H2) -public class CreateTableH2Test extends CreateTableBaseTest{ - - @BeforeClass - public static void setUpClass() throws Exception { - Connections.initH2(); - } - - @Before - public void setUp() throws SQLException { - super.setUp(); - templates = new H2Templates(){{ - newLineToSingleSpace(); - }}; - } - -} diff --git a/querydsl-sql/src/test/java/com/mysema/query/_hsqldb/CreateTableHsqldbTest.java b/querydsl-sql/src/test/java/com/mysema/query/_hsqldb/CreateTableHsqldbTest.java deleted file mode 100644 index 6e8d370225..0000000000 --- a/querydsl-sql/src/test/java/com/mysema/query/_hsqldb/CreateTableHsqldbTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2011, Mysema Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mysema.query._hsqldb; - -import java.sql.SQLException; - -import org.junit.Before; -import org.junit.BeforeClass; - -import com.mysema.query.Connections; -import com.mysema.query.CreateTableBaseTest; -import com.mysema.query.Target; -import com.mysema.query.sql.HSQLDBTemplates; -import com.mysema.testutil.Label; - -@Label(Target.HSQLDB) -public class CreateTableHsqldbTest extends CreateTableBaseTest{ - - @BeforeClass - public static void setUpClass() throws Exception { - Connections.initHSQL(); - } - - @Before - public void setUp() throws SQLException { - super.setUp(); - templates = new HSQLDBTemplates(){{ - newLineToSingleSpace(); - }}; - } - -} diff --git a/querydsl-sql/src/test/java/com/mysema/query/_mysql/CreateTableMySQLTest.java b/querydsl-sql/src/test/java/com/mysema/query/_mysql/CreateTableMySQLTest.java deleted file mode 100644 index 9eacaddcf0..0000000000 --- a/querydsl-sql/src/test/java/com/mysema/query/_mysql/CreateTableMySQLTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2011, Mysema Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mysema.query._mysql; - -import java.sql.SQLException; - -import org.junit.Before; -import org.junit.BeforeClass; - -import com.mysema.query.Connections; -import com.mysema.query.CreateTableBaseTest; -import com.mysema.query.Target; -import com.mysema.query.sql.MySQLTemplates; -import com.mysema.testutil.Label; - -@Label(Target.MYSQL) -public class CreateTableMySQLTest extends CreateTableBaseTest{ - - @BeforeClass - public static void setUpClass() throws Exception { - Connections.initMySQL(); - } - - @Before - public void setUp() throws SQLException { - super.setUp(); - templates = new MySQLTemplates(true){{ - newLineToSingleSpace(); - }}; - } - -} \ No newline at end of file diff --git a/querydsl-sql/src/test/java/com/mysema/query/_postgres/CreateTablePostgresTest.java b/querydsl-sql/src/test/java/com/mysema/query/_postgres/CreateTablePostgresTest.java deleted file mode 100644 index 063834ee94..0000000000 --- a/querydsl-sql/src/test/java/com/mysema/query/_postgres/CreateTablePostgresTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2011, Mysema Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mysema.query._postgres; - -import java.sql.SQLException; - -import org.junit.Before; -import org.junit.BeforeClass; - -import com.mysema.query.Connections; -import com.mysema.query.CreateTableBaseTest; -import com.mysema.query.Target; -import com.mysema.query.sql.PostgresTemplates; -import com.mysema.testutil.Label; - -@Label(Target.POSTGRES) -public class CreateTablePostgresTest extends CreateTableBaseTest{ - - @BeforeClass - public static void setUpClass() throws Exception { - Connections.initPostgres(); - } - - @Before - public void setUp() throws SQLException { - super.setUp(); - templates = new PostgresTemplates(true){{ - newLineToSingleSpace(); - }}; - } - -} \ No newline at end of file