#106 moving codegen logic

querydsl-jpa-codegen/pom.xml

@@ -68,7 +68,12 @@
       <artifactId>querydsl-codegen</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
-        <dependency>
+    <dependency>
+      <groupId>com.mysema.querydsl</groupId>
+      <artifactId>querydsl-jpa</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>    
+    <dependency>
       <groupId>com.mysema.querydsl</groupId>
       <artifactId>querydsl-jpa</artifactId>
       <version>${project.parent.version}</version>

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;

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._

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._
 

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;
 

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;
 

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

querydsl-sql-codegen/src/main/java/com/mysema/query/sql/AbstractNamingStrategy.java → 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;

querydsl-sql-codegen/src/main/java/com/mysema/query/sql/DefaultNamingStrategy.java → 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;
 

querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ExtendedBeanSerializer.java → 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;

querydsl-sql-codegen/src/main/java/com/mysema/query/sql/ExtendedNamingStrategy.java → 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;
 

querydsl-sql-codegen/src/main/java/com/mysema/query/sql/KeyDataFactory.java → 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;

querydsl-sql-codegen/src/main/java/com/mysema/query/sql/MetaDataExporter.java → 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;

querydsl-sql-codegen/src/main/java/com/mysema/query/sql/MetaDataSerializer.java → 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;
 

querydsl-sql-codegen/src/main/java/com/mysema/query/sql/NamingStrategy.java → 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;
 

querydsl-sql-codegen/src/main/java/com/mysema/query/sql/OriginalNamingStrategy.java → 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;
 

querydsl-sql-codegen/src/main/java/com/mysema/query/sql/SQLCodegenModule.java → 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;

querydsl-sql-codegen/src/main/java/com/mysema/query/sql/SQLQueryTypeFactory.java → 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;

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)

querydsl-sql-codegen/src/test/java/com/mysema/query/sql/CustomTypesTest.java → 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;

querydsl-sql-codegen/src/test/java/com/mysema/query/sql/DefaultNamingStrategyTest.java → 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 {
 

querydsl-sql-codegen/src/test/java/com/mysema/query/sql/ExtendedNamingStrategyTest.java → 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 {
 

querydsl-sql-codegen/src/test/java/com/mysema/query/sql/KeyDataFactoryTest.java → 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;

querydsl-sql-codegen/src/test/java/com/mysema/query/sql/MetaDataExporterTest.java → 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 {
 

querydsl-sql-codegen/src/test/java/com/mysema/query/sql/MetaDataSerializerTest.java → 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{
 

querydsl-sql-codegen/src/test/java/com/mysema/query/sql/MetaDataTest.java → 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 {
 

querydsl-sql-codegen/src/test/java/com/mysema/query/sql/OriginalNamingStrategyTest.java → querydsl-sql-codegen/src/test/java/com/mysema/query/sql/codegen/OriginalNamingStrategyTest.java

@@ -11,14 +11,16 @@
  * 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 org.junit.Test;
 
 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 {
 

querydsl-sql/src/test/java/com/mysema/query/Connections.java

@@ -120,30 +120,30 @@ 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(){
         return stmtHolder.get();
     }
 
     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{