From 28073c01dba95ff525842210645922e337b8d2a0 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sun, 7 Apr 2013 22:44:29 +0200 Subject: [PATCH] [#2391] Rename dialect-specific Factories [Dialect]Factory to [Dialect]DSL --- jOOQ-test/src/org/jooq/test/MySQLTest.java | 38 ++++++------ jOOQ-test/src/org/jooq/test/OracleTest.java | 6 +- .../jooq/test/_/testcases/ExoticTests.java | 2 +- jOOQ/src/main/java/org/jooq/Field.java | 6 +- jOOQ/src/main/java/org/jooq/SQLDialect.java | 60 ++++++------------- .../org/jooq/impl/AbstractStoreQuery.java | 2 +- .../util/ase/{ASEFactory.java => ASEDSL.java} | 6 +- .../{CUBRIDFactory.java => CUBRIDDSL.java} | 6 +- .../util/db2/{DB2Factory.java => DB2DSL.java} | 6 +- .../{DerbyFactory.java => DerbyDSL.java} | 6 +- ...{FirebirdFactory.java => FirebirdDSL.java} | 6 +- .../util/h2/{H2Factory.java => H2DSL.java} | 6 +- .../{HSQLDBFactory.java => HSQLDBDSL.java} | 6 +- .../{IngresFactory.java => IngresDSL.java} | 6 +- .../{MySQLFactory.java => MySQLDSL.java} | 6 +- .../{OracleFactory.java => OracleDSL.java} | 6 +- ...{PostgresFactory.java => PostgresDSL.java} | 6 +- .../{SQLiteFactory.java => SQLiteDSL.java} | 6 +- ...QLServerFactory.java => SQLServerDSL.java} | 6 +- .../{SybaseFactory.java => SybaseDSL.java} | 6 +- 20 files changed, 86 insertions(+), 112 deletions(-) rename jOOQ/src/main/java/org/jooq/util/ase/{ASEFactory.java => ASEDSL.java} (94%) rename jOOQ/src/main/java/org/jooq/util/cubrid/{CUBRIDFactory.java => CUBRIDDSL.java} (96%) rename jOOQ/src/main/java/org/jooq/util/db2/{DB2Factory.java => DB2DSL.java} (92%) rename jOOQ/src/main/java/org/jooq/util/derby/{DerbyFactory.java => DerbyDSL.java} (92%) rename jOOQ/src/main/java/org/jooq/util/firebird/{FirebirdFactory.java => FirebirdDSL.java} (91%) rename jOOQ/src/main/java/org/jooq/util/h2/{H2Factory.java => H2DSL.java} (92%) rename jOOQ/src/main/java/org/jooq/util/hsqldb/{HSQLDBFactory.java => HSQLDBDSL.java} (91%) rename jOOQ/src/main/java/org/jooq/util/ingres/{IngresFactory.java => IngresDSL.java} (91%) rename jOOQ/src/main/java/org/jooq/util/mysql/{MySQLFactory.java => MySQLDSL.java} (95%) rename jOOQ/src/main/java/org/jooq/util/oracle/{OracleFactory.java => OracleDSL.java} (95%) rename jOOQ/src/main/java/org/jooq/util/postgres/{PostgresFactory.java => PostgresDSL.java} (91%) rename jOOQ/src/main/java/org/jooq/util/sqlite/{SQLiteFactory.java => SQLiteDSL.java} (93%) rename jOOQ/src/main/java/org/jooq/util/sqlserver/{SQLServerFactory.java => SQLServerDSL.java} (91%) rename jOOQ/src/main/java/org/jooq/util/sybase/{SybaseFactory.java => SybaseDSL.java} (93%) diff --git a/jOOQ-test/src/org/jooq/test/MySQLTest.java b/jOOQ-test/src/org/jooq/test/MySQLTest.java index 63cb4886bf..830f371378 100644 --- a/jOOQ-test/src/org/jooq/test/MySQLTest.java +++ b/jOOQ-test/src/org/jooq/test/MySQLTest.java @@ -47,18 +47,18 @@ import static org.jooq.test.mysql.generatedclasses.Tables.T_IDENTITY_PK; import static org.jooq.test.mysql.generatedclasses.Tables.T_UNSIGNED; import static org.jooq.test.mysql.generatedclasses.Tables.V_AUTHOR; import static org.jooq.test.mysql.generatedclasses.Tables.V_BOOK; -import static org.jooq.util.mysql.MySQLFactory.aesDecrypt; -import static org.jooq.util.mysql.MySQLFactory.aesEncrypt; -import static org.jooq.util.mysql.MySQLFactory.compress; -import static org.jooq.util.mysql.MySQLFactory.decode; -import static org.jooq.util.mysql.MySQLFactory.desDecrypt; -import static org.jooq.util.mysql.MySQLFactory.desEncrypt; -import static org.jooq.util.mysql.MySQLFactory.encode; -import static org.jooq.util.mysql.MySQLFactory.password; -import static org.jooq.util.mysql.MySQLFactory.sha1; -import static org.jooq.util.mysql.MySQLFactory.sha2; -import static org.jooq.util.mysql.MySQLFactory.uncompress; -import static org.jooq.util.mysql.MySQLFactory.uncompressedLength; +import static org.jooq.util.mysql.MySQLDSL.aesDecrypt; +import static org.jooq.util.mysql.MySQLDSL.aesEncrypt; +import static org.jooq.util.mysql.MySQLDSL.compress; +import static org.jooq.util.mysql.MySQLDSL.decode; +import static org.jooq.util.mysql.MySQLDSL.desDecrypt; +import static org.jooq.util.mysql.MySQLDSL.desEncrypt; +import static org.jooq.util.mysql.MySQLDSL.encode; +import static org.jooq.util.mysql.MySQLDSL.password; +import static org.jooq.util.mysql.MySQLDSL.sha1; +import static org.jooq.util.mysql.MySQLDSL.sha2; +import static org.jooq.util.mysql.MySQLDSL.uncompress; +import static org.jooq.util.mysql.MySQLDSL.uncompressedLength; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -128,7 +128,7 @@ import org.jooq.types.UInteger; import org.jooq.types.ULong; import org.jooq.types.UShort; import org.jooq.util.mysql.MySQLDataType; -import org.jooq.util.mysql.MySQLFactory; +import org.jooq.util.mysql.MySQLDSL; import org.junit.Test; @@ -843,11 +843,11 @@ public class MySQLTest extends jOOQAbstractTest< @Test public void testMySQLEnumIndex() throws Exception { - assertNull(MySQLFactory.enumType(TBookStatus.class, -1)); - assertNull(MySQLFactory.enumType(TBookStatus.class, 0)); - assertEquals(TBookStatus.SOLD_OUT, MySQLFactory.enumType(TBookStatus.class, 1)); - assertEquals(TBookStatus.ORDERED, MySQLFactory.enumType(TBookStatus.class, 2)); - assertEquals(TBookStatus.ON_STOCK, MySQLFactory.enumType(TBookStatus.class, 3)); - assertNull(MySQLFactory.enumType(TBookStatus.class, 4)); + assertNull(MySQLDSL.enumType(TBookStatus.class, -1)); + assertNull(MySQLDSL.enumType(TBookStatus.class, 0)); + assertEquals(TBookStatus.SOLD_OUT, MySQLDSL.enumType(TBookStatus.class, 1)); + assertEquals(TBookStatus.ORDERED, MySQLDSL.enumType(TBookStatus.class, 2)); + assertEquals(TBookStatus.ON_STOCK, MySQLDSL.enumType(TBookStatus.class, 3)); + assertNull(MySQLDSL.enumType(TBookStatus.class, 4)); } } diff --git a/jOOQ-test/src/org/jooq/test/OracleTest.java b/jOOQ-test/src/org/jooq/test/OracleTest.java index 010eb4b10f..9f470d1b0b 100644 --- a/jOOQ-test/src/org/jooq/test/OracleTest.java +++ b/jOOQ-test/src/org/jooq/test/OracleTest.java @@ -78,9 +78,9 @@ import static org.jooq.test.oracle.generatedclasses.test.udt.UAuthorType.load; import static org.jooq.test.oracle2.generatedclasses.Tables.DATE_AS_TIMESTAMP_T_976; import static org.jooq.test.oracle2.generatedclasses.udt.DateAsTimestampT_976ObjectType.DATE_AS_TIMESTAMP_T_976_OBJECT_TYPE; import static org.jooq.test.oracle3.generatedclasses.DefaultSchema.DEFAULT_SCHEMA; -import static org.jooq.util.oracle.OracleFactory.contains; -import static org.jooq.util.oracle.OracleFactory.score; -import static org.jooq.util.oracle.OracleFactory.sysContext; +import static org.jooq.util.oracle.OracleDSL.contains; +import static org.jooq.util.oracle.OracleDSL.score; +import static org.jooq.util.oracle.OracleDSL.sysContext; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java index 29cb4dae84..bf574aeb3d 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java @@ -58,7 +58,7 @@ import static org.jooq.impl.DSL.table; import static org.jooq.impl.DSL.trueCondition; import static org.jooq.impl.DSL.two; import static org.jooq.impl.DSL.val; -import static org.jooq.util.oracle.OracleFactory.rownum; +import static org.jooq.util.oracle.OracleDSL.rownum; import java.sql.Date; import java.util.Arrays; diff --git a/jOOQ/src/main/java/org/jooq/Field.java b/jOOQ/src/main/java/org/jooq/Field.java index 7e1d136a0c..715482e001 100644 --- a/jOOQ/src/main/java/org/jooq/Field.java +++ b/jOOQ/src/main/java/org/jooq/Field.java @@ -58,7 +58,7 @@ import java.util.Map; import org.jooq.conf.Settings; import org.jooq.impl.DSL; import org.jooq.types.Interval; -import org.jooq.util.oracle.OracleFactory; +import org.jooq.util.oracle.OracleDSL; /** * A field used in tables and conditions @@ -1002,7 +1002,7 @@ public interface Field extends GroupField { * *

* Note, this does not correspond to the Oracle Text CONTAINS() - * function. Refer to {@link OracleFactory#contains(Field, String)} instead. + * function. Refer to {@link OracleDSL#contains(Field, String)} instead. * * @see DSL#escape(String, char) * @see #like(String, char) @@ -1029,7 +1029,7 @@ public interface Field extends GroupField { * *

* Note, this does not correspond to the Oracle Text CONTAINS() - * function. Refer to {@link OracleFactory#contains(Field, String)} instead. + * function. Refer to {@link OracleDSL#contains(Field, String)} instead. * * @see DSL#escape(Field, char) * @see #like(Field, char) diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java index cf0e760f1e..095879a15e 100644 --- a/jOOQ/src/main/java/org/jooq/SQLDialect.java +++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java @@ -36,22 +36,6 @@ package org.jooq; -import org.jooq.impl.DSL; -import org.jooq.util.ase.ASEFactory; -import org.jooq.util.cubrid.CUBRIDFactory; -import org.jooq.util.db2.DB2Factory; -import org.jooq.util.derby.DerbyFactory; -import org.jooq.util.firebird.FirebirdFactory; -import org.jooq.util.h2.H2Factory; -import org.jooq.util.hsqldb.HSQLDBFactory; -import org.jooq.util.ingres.IngresFactory; -import org.jooq.util.mysql.MySQLFactory; -import org.jooq.util.oracle.OracleFactory; -import org.jooq.util.postgres.PostgresFactory; -import org.jooq.util.sqlite.SQLiteFactory; -import org.jooq.util.sqlserver.SQLServerFactory; -import org.jooq.util.sybase.SybaseFactory; - /** * This enumeration lists all supported dialects. * @@ -66,84 +50,82 @@ public enum SQLDialect { * unit testing */ @Deprecated - SQL99(null, null), + SQL99(null), /** * The Sybase Adaptive Server SQL dialect */ - ASE("ASE", ASEFactory.class), + ASE("ASE"), /** * The CUBRID SQL dialect */ - CUBRID("CUBRID", CUBRIDFactory.class), + CUBRID("CUBRID"), /** * The IBM DB2 SQL dialect */ - DB2("DB2", DB2Factory.class), + DB2("DB2"), /** * The Apache Derby SQL dialect */ - DERBY("Derby", DerbyFactory.class), + DERBY("Derby"), /** * The Firebird SQL dialect */ - FIREBIRD("Firebird", FirebirdFactory.class), + FIREBIRD("Firebird"), /** * The H2 SQL dialect */ - H2("H2", H2Factory.class), + H2("H2"), /** * The Hypersonic SQL dialect */ - HSQLDB("HSQLDB", HSQLDBFactory.class), + HSQLDB("HSQLDB"), /** * The Ingres dialect */ - INGRES("Ingres", IngresFactory.class), + INGRES("Ingres"), /** * The MySQL dialect */ - MYSQL("MySQL", MySQLFactory.class), + MYSQL("MySQL"), /** * The Oracle dialect */ - ORACLE("Oracle", OracleFactory.class), + ORACLE("Oracle"), /** * The PostGres dialect */ - POSTGRES("Postgres", PostgresFactory.class), + POSTGRES("Postgres"), /** * The SQLite dialect */ - SQLITE("SQLite", SQLiteFactory.class), + SQLITE("SQLite"), /** * The SQL Server dialect */ - SQLSERVER("SQLServer", SQLServerFactory.class), + SQLSERVER("SQLServer"), /** * The Sybase dialect */ - SYBASE("Sybase", SybaseFactory.class); + SYBASE("Sybase"); - private final String name; - private final Class sQL; + private final String name; - private SQLDialect(String name, Class sQL) { + private SQLDialect(String name) { this.name = name; - this.sQL = sQL; } /** @@ -166,12 +148,4 @@ public enum SQLDialect { public final String getNameUC() { return name.toUpperCase(); } - - /** - * A {@link DSLContext} class whose instances are pre-configured with this - * dialect. - */ - public final Class getFactory() { - return sQL; - } } diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java index 022901cb07..67dbd363aa 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java @@ -36,7 +36,7 @@ package org.jooq.impl; import static org.jooq.impl.Utils.fieldArray; -import static org.jooq.util.sqlite.SQLiteFactory.rowid; +import static org.jooq.util.sqlite.SQLiteDSL.rowid; import java.sql.Connection; import java.sql.ResultSet; diff --git a/jOOQ/src/main/java/org/jooq/util/ase/ASEFactory.java b/jOOQ/src/main/java/org/jooq/util/ase/ASEDSL.java similarity index 94% rename from jOOQ/src/main/java/org/jooq/util/ase/ASEFactory.java rename to jOOQ/src/main/java/org/jooq/util/ase/ASEDSL.java index 9e9d2ac8c5..caa1afcbcc 100644 --- a/jOOQ/src/main/java/org/jooq/util/ase/ASEFactory.java +++ b/jOOQ/src/main/java/org/jooq/util/ase/ASEDSL.java @@ -34,15 +34,15 @@ import org.jooq.SQLDialect; import org.jooq.impl.DSL; /** - * A {@link SQLDialect#ASE} specific factory + * The {@link SQLDialect#ASE} specific DSL. * * @author Lukas Eder */ -public class ASEFactory extends DSL { +public class ASEDSL extends DSL { /** * No instances */ - private ASEFactory() { + private ASEDSL() { } } diff --git a/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDFactory.java b/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDSL.java similarity index 96% rename from jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDFactory.java rename to jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDSL.java index df3d237bc3..3f3aeaba9f 100644 --- a/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDFactory.java +++ b/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDDSL.java @@ -35,16 +35,16 @@ import org.jooq.SQLDialect; import org.jooq.impl.DSL; /** - * A {@link SQLDialect#CUBRID} specific factory + * The {@link SQLDialect#CUBRID} specific DSL. * * @author Lukas Eder */ -public class CUBRIDFactory extends DSL { +public class CUBRIDDSL extends DSL { /** * No instances */ - private CUBRIDFactory() { + private CUBRIDDSL() { } // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/util/db2/DB2Factory.java b/jOOQ/src/main/java/org/jooq/util/db2/DB2DSL.java similarity index 92% rename from jOOQ/src/main/java/org/jooq/util/db2/DB2Factory.java rename to jOOQ/src/main/java/org/jooq/util/db2/DB2DSL.java index 9fcd07c17a..fc8f0edaed 100644 --- a/jOOQ/src/main/java/org/jooq/util/db2/DB2Factory.java +++ b/jOOQ/src/main/java/org/jooq/util/db2/DB2DSL.java @@ -39,15 +39,15 @@ import org.jooq.SQLDialect; import org.jooq.impl.DSL; /** - * A {@link SQLDialect#DB2} specific factory + * The {@link SQLDialect#DB2} specific DSL. * * @author Lukas Eder */ -public class DB2Factory extends DSL { +public class DB2DSL extends DSL { /** * No instances */ - private DB2Factory() { + private DB2DSL() { } } diff --git a/jOOQ/src/main/java/org/jooq/util/derby/DerbyFactory.java b/jOOQ/src/main/java/org/jooq/util/derby/DerbyDSL.java similarity index 92% rename from jOOQ/src/main/java/org/jooq/util/derby/DerbyFactory.java rename to jOOQ/src/main/java/org/jooq/util/derby/DerbyDSL.java index 0760a51d4f..633bc2a15a 100644 --- a/jOOQ/src/main/java/org/jooq/util/derby/DerbyFactory.java +++ b/jOOQ/src/main/java/org/jooq/util/derby/DerbyDSL.java @@ -39,15 +39,15 @@ import org.jooq.SQLDialect; import org.jooq.impl.DSL; /** - * A {@link SQLDialect#DERBY} specific factory + * The {@link SQLDialect#DERBY} specific DSL. * * @author Lukas Eder */ -public class DerbyFactory extends DSL { +public class DerbyDSL extends DSL { /** * No instances */ - private DerbyFactory() { + private DerbyDSL() { } } \ No newline at end of file diff --git a/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdFactory.java b/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDSL.java similarity index 91% rename from jOOQ/src/main/java/org/jooq/util/firebird/FirebirdFactory.java rename to jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDSL.java index 5bbb30b9e2..fbed52a7f2 100644 --- a/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdFactory.java +++ b/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdDSL.java @@ -39,15 +39,15 @@ import org.jooq.SQLDialect; import org.jooq.impl.DSL; /** - * A {@link SQLDialect#FIREBIRD} specific factory + * The {@link SQLDialect#FIREBIRD} specific DSL. * * @author Lukas Eder */ -public class FirebirdFactory extends DSL { +public class FirebirdDSL extends DSL { /** * No instances */ - private FirebirdFactory() { + private FirebirdDSL() { } } diff --git a/jOOQ/src/main/java/org/jooq/util/h2/H2Factory.java b/jOOQ/src/main/java/org/jooq/util/h2/H2DSL.java similarity index 92% rename from jOOQ/src/main/java/org/jooq/util/h2/H2Factory.java rename to jOOQ/src/main/java/org/jooq/util/h2/H2DSL.java index a3cf027ce6..a4c92313a1 100644 --- a/jOOQ/src/main/java/org/jooq/util/h2/H2Factory.java +++ b/jOOQ/src/main/java/org/jooq/util/h2/H2DSL.java @@ -39,15 +39,15 @@ import org.jooq.SQLDialect; import org.jooq.impl.DSL; /** - * A {@link SQLDialect#H2} specific factory + * The {@link SQLDialect#H2} specific DSL. * * @author Lukas Eder */ -public class H2Factory extends DSL { +public class H2DSL extends DSL { /** * No instances */ - private H2Factory() { + private H2DSL() { } } diff --git a/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBFactory.java b/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDSL.java similarity index 91% rename from jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBFactory.java rename to jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDSL.java index 6ab75905e4..c7605464ad 100644 --- a/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBFactory.java +++ b/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBDSL.java @@ -39,15 +39,15 @@ import org.jooq.SQLDialect; import org.jooq.impl.DSL; /** - * A {@link SQLDialect#HSQLDB} specific factory + * The {@link SQLDialect#HSQLDB} specific DSL. * * @author Lukas Eder */ -public class HSQLDBFactory extends DSL { +public class HSQLDBDSL extends DSL { /** * No instances */ - private HSQLDBFactory() { + private HSQLDBDSL() { } } diff --git a/jOOQ/src/main/java/org/jooq/util/ingres/IngresFactory.java b/jOOQ/src/main/java/org/jooq/util/ingres/IngresDSL.java similarity index 91% rename from jOOQ/src/main/java/org/jooq/util/ingres/IngresFactory.java rename to jOOQ/src/main/java/org/jooq/util/ingres/IngresDSL.java index 66ad771af3..dd9cc3f8a8 100644 --- a/jOOQ/src/main/java/org/jooq/util/ingres/IngresFactory.java +++ b/jOOQ/src/main/java/org/jooq/util/ingres/IngresDSL.java @@ -39,15 +39,15 @@ import org.jooq.SQLDialect; import org.jooq.impl.DSL; /** - * A {@link SQLDialect#INGRES} specific factory + * The {@link SQLDialect#INGRES} specific DSL. * * @author Lukas Eder */ -public class IngresFactory extends DSL { +public class IngresDSL extends DSL { /** * No instances */ - private IngresFactory() { + private IngresDSL() { } } diff --git a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDSL.java similarity index 95% rename from jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java rename to jOOQ/src/main/java/org/jooq/util/mysql/MySQLDSL.java index 534d50a43a..4b6f4d6204 100644 --- a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java +++ b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLDSL.java @@ -41,16 +41,16 @@ import org.jooq.SQLDialect; import org.jooq.impl.DSL; /** - * A {@link SQLDialect#MYSQL} specific factory + * The {@link SQLDialect#MYSQL} specific DSL. * * @author Lukas Eder */ -public class MySQLFactory extends DSL { +public class MySQLDSL extends DSL { /** * No instances */ - private MySQLFactory() { + private MySQLDSL() { } // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/util/oracle/OracleFactory.java b/jOOQ/src/main/java/org/jooq/util/oracle/OracleDSL.java similarity index 95% rename from jOOQ/src/main/java/org/jooq/util/oracle/OracleFactory.java rename to jOOQ/src/main/java/org/jooq/util/oracle/OracleDSL.java index 6ea42dbc85..35252bb38b 100644 --- a/jOOQ/src/main/java/org/jooq/util/oracle/OracleFactory.java +++ b/jOOQ/src/main/java/org/jooq/util/oracle/OracleDSL.java @@ -46,16 +46,16 @@ import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; /** - * A {@link SQLDialect#ORACLE} specific factory + * The {@link SQLDialect#ORACLE} specific DSL. * * @author Lukas Eder */ -public class OracleFactory extends DSL { +public class OracleDSL extends DSL { /** * No instances */ - private OracleFactory() { + private OracleDSL() { } // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresFactory.java b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDSL.java similarity index 91% rename from jOOQ/src/main/java/org/jooq/util/postgres/PostgresFactory.java rename to jOOQ/src/main/java/org/jooq/util/postgres/PostgresDSL.java index f9f3289272..74df43da7f 100644 --- a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresFactory.java +++ b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresDSL.java @@ -39,15 +39,15 @@ import org.jooq.SQLDialect; import org.jooq.impl.DSL; /** - * A {@link SQLDialect#POSTGRES} specific factory + * The {@link SQLDialect#POSTGRES} specific DSL. * * @author Lukas Eder */ -public class PostgresFactory extends DSL { +public class PostgresDSL extends DSL { /** * No instances */ - private PostgresFactory() { + private PostgresDSL() { } } diff --git a/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteFactory.java b/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDSL.java similarity index 93% rename from jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteFactory.java rename to jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDSL.java index 0731c5a6b8..07ba860c08 100644 --- a/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteFactory.java +++ b/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteDSL.java @@ -40,16 +40,16 @@ import org.jooq.SQLDialect; import org.jooq.impl.DSL; /** - * A {@link SQLDialect#SQLITE} specific factory + * The {@link SQLDialect#SQLITE} specific DSL. * * @author Lukas Eder */ -public class SQLiteFactory extends DSL { +public class SQLiteDSL extends DSL { /** * No instances */ - private SQLiteFactory() { + private SQLiteDSL() { } // ------------------------------------------------------------------------- diff --git a/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerFactory.java b/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerDSL.java similarity index 91% rename from jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerFactory.java rename to jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerDSL.java index d3be29073c..b6deaaad1a 100644 --- a/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerFactory.java +++ b/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerDSL.java @@ -39,15 +39,15 @@ import org.jooq.SQLDialect; import org.jooq.impl.DSL; /** - * A {@link SQLDialect#SQLSERVER} specific factory + * The {@link SQLDialect#SQLSERVER} specific DSL. * * @author Lukas Eder */ -public class SQLServerFactory extends DSL { +public class SQLServerDSL extends DSL { /** * No instances */ - private SQLServerFactory() { + private SQLServerDSL() { } } diff --git a/jOOQ/src/main/java/org/jooq/util/sybase/SybaseFactory.java b/jOOQ/src/main/java/org/jooq/util/sybase/SybaseDSL.java similarity index 93% rename from jOOQ/src/main/java/org/jooq/util/sybase/SybaseFactory.java rename to jOOQ/src/main/java/org/jooq/util/sybase/SybaseDSL.java index bb8afb1635..2ab8b7760a 100644 --- a/jOOQ/src/main/java/org/jooq/util/sybase/SybaseFactory.java +++ b/jOOQ/src/main/java/org/jooq/util/sybase/SybaseDSL.java @@ -34,15 +34,15 @@ import org.jooq.SQLDialect; import org.jooq.impl.DSL; /** - * A {@link SQLDialect#SYBASE} specific factory + * The {@link SQLDialect#SYBASE} specific DSL. * * @author Espen Stromsnes */ -public class SybaseFactory extends DSL { +public class SybaseDSL extends DSL { /** * No instances */ - private SybaseFactory() { + private SybaseDSL() { } }