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 35287d7c4..73fbdbea1 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/Connections.java +++ b/querydsl-sql/src/test/java/com/mysema/query/Connections.java @@ -83,11 +83,7 @@ public final class Connections { return configurationHolder.get(); } - public static void setConfiguration(Configuration conf) { - configurationHolder.set(conf); - } - - public static void setTemplates(SQLTemplates templates) { + public static void initConfiguration(SQLTemplates templates) { configurationHolder.set(new Configuration(templates)); } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDLiteralsSuiteTest.java index e167a181e..08d7d90ef 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDLiteralsSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDLiteralsSuiteTest.java @@ -24,7 +24,7 @@ public class CUBRIDLiteralsSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initCubrid(); - Connections.setTemplates(CUBRIDTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(CUBRIDTemplates.builder().newLineToSingleSpace().build()); Connections.getConfiguration().setUseLiterals(true); } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDSuiteTest.java index 9bad786e3..502ff9a06 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDSuiteTest.java @@ -24,7 +24,7 @@ public class CUBRIDSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initCubrid(); - Connections.setTemplates(CUBRIDTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(CUBRIDTemplates.builder().newLineToSingleSpace().build()); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/DerbyLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/DerbyLiteralsSuiteTest.java index 508615bce..682d31d88 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/DerbyLiteralsSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/DerbyLiteralsSuiteTest.java @@ -21,7 +21,7 @@ public class DerbyLiteralsSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initDerby(); - Connections.setTemplates(DerbyTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(DerbyTemplates.builder().newLineToSingleSpace().build()); Connections.getConfiguration().setUseLiterals(true); } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/DerbySuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/DerbySuiteTest.java index 6e6f7c49c..b1335b144 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/DerbySuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/DerbySuiteTest.java @@ -21,7 +21,7 @@ public class DerbySuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initDerby(); - Connections.setTemplates(DerbyTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(DerbyTemplates.builder().newLineToSingleSpace().build()); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdLiteralsSuiteTest.java index a2f3934df..d24bf83a6 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdLiteralsSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdLiteralsSuiteTest.java @@ -24,7 +24,7 @@ public class FirebirdLiteralsSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initFirebird(); - Connections.setTemplates(FirebirdTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(FirebirdTemplates.builder().newLineToSingleSpace().build()); Connections.getConfiguration().setUseLiterals(true); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdSuiteTest.java index 2f937a6ac..758362c27 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdSuiteTest.java @@ -24,6 +24,6 @@ public class FirebirdSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initFirebird(); - Connections.setTemplates(FirebirdTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(FirebirdTemplates.builder().newLineToSingleSpace().build()); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/H2ExceptionSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/H2ExceptionSuiteTest.java index 4a9ba4184..9931860dd 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/H2ExceptionSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/H2ExceptionSuiteTest.java @@ -25,7 +25,7 @@ public class H2ExceptionSuiteTest extends AbstractBaseTest { @BeforeClass public static void setUp() throws Exception { Connections.initH2(); - Connections.setTemplates(H2Templates.builder().build()); + Connections.initConfiguration(H2Templates.builder().build()); Connections.getConnection().createStatement() .execute("ALTER TABLE SURVEY ADD CONSTRAINT UNIQUE_ID UNIQUE(ID)"); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/H2LiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/H2LiteralsSuiteTest.java index 7969379fe..9be16a43d 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/H2LiteralsSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/H2LiteralsSuiteTest.java @@ -22,7 +22,7 @@ public class H2LiteralsSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initH2(); - Connections.setTemplates(GeoDBTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(GeoDBTemplates.builder().newLineToSingleSpace().build()); Connections.getConfiguration().setUseLiterals(true); } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/H2SuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/H2SuiteTest.java index 34c729572..90b98593f 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/H2SuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/H2SuiteTest.java @@ -22,7 +22,7 @@ public class H2SuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initH2(); - Connections.setTemplates(GeoDBTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(GeoDBTemplates.builder().newLineToSingleSpace().build()); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithQuotingTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithQuotingTest.java index a69e0c581..23d2dfc07 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithQuotingTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithQuotingTest.java @@ -21,7 +21,7 @@ public class H2WithQuotingTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initH2(); - Connections.setTemplates(H2Templates.builder().quote().newLineToSingleSpace().build()); + Connections.initConfiguration(H2Templates.builder().quote().newLineToSingleSpace().build()); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithSchemaTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithSchemaTest.java index c7c571727..e4c420264 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithSchemaTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithSchemaTest.java @@ -21,7 +21,7 @@ public class H2WithSchemaTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initH2(); - Connections.setTemplates(H2Templates.builder().printSchema().newLineToSingleSpace().build()); + Connections.initConfiguration(H2Templates.builder().printSchema().newLineToSingleSpace().build()); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbLiteralsSuiteTest.java index 41b61b152..cd700620a 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbLiteralsSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbLiteralsSuiteTest.java @@ -21,7 +21,7 @@ public class HsqldbLiteralsSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initHSQL(); - Connections.setTemplates(HSQLDBTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(HSQLDBTemplates.builder().newLineToSingleSpace().build()); Connections.getConfiguration().setUseLiterals(true); } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbSuiteTest.java index 69acb6063..860b44af7 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbSuiteTest.java @@ -21,7 +21,7 @@ public class HsqldbSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initHSQL(); - Connections.setTemplates(HSQLDBTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(HSQLDBTemplates.builder().newLineToSingleSpace().build()); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLLiteralsSuiteTest.java index 7d06f5690..fec86772d 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLLiteralsSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLLiteralsSuiteTest.java @@ -26,7 +26,7 @@ public class MSSQLLiteralsSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initSQLServer(); - Connections.setTemplates(SQLServer2008SpatialTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(SQLServer2008SpatialTemplates.builder().newLineToSingleSpace().build()); Connections.getConfiguration().setUseLiterals(true); } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java index 3b0700074..4f98097af 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java @@ -26,7 +26,7 @@ public class MSSQLSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initSQLServer(); - Connections.setTemplates(SQLServer2008SpatialTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(SQLServer2008SpatialTemplates.builder().newLineToSingleSpace().build()); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLLiteralsSuiteTest.java index 7cf33863f..ed6382401 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLLiteralsSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLLiteralsSuiteTest.java @@ -27,7 +27,7 @@ public class MySQLLiteralsSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initMySQL(); - Connections.setTemplates(MySQLSpatialTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(MySQLSpatialTemplates.builder().newLineToSingleSpace().build()); Connections.getConfiguration().setUseLiterals(true); } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java index e0c964205..8bd973c12 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java @@ -27,7 +27,7 @@ public class MySQLSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initMySQL(); - Connections.setTemplates(MySQLSpatialTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(MySQLSpatialTemplates.builder().newLineToSingleSpace().build()); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLWithQuotingTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLWithQuotingTest.java index c923d3ad4..8bea1ea32 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLWithQuotingTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLWithQuotingTest.java @@ -24,7 +24,7 @@ public class MySQLWithQuotingTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initMySQL(); - Connections.setTemplates(MySQLSpatialTemplates.builder().quote().newLineToSingleSpace().build()); + Connections.initConfiguration(MySQLSpatialTemplates.builder().quote().newLineToSingleSpace().build()); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/OracleLiteralsSuiteTest.java index 07c9617db..6e3b2ee57 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleLiteralsSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/OracleLiteralsSuiteTest.java @@ -26,7 +26,7 @@ public class OracleLiteralsSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initOracle(); - Connections.setTemplates(OracleSpatialTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(OracleSpatialTemplates.builder().newLineToSingleSpace().build()); Connections.getConfiguration().setUseLiterals(true); } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/OracleSuiteTest.java index 74a5f24fb..0a92e4d2d 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/OracleSuiteTest.java @@ -26,7 +26,7 @@ public class OracleSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initOracle(); - Connections.setTemplates(OracleSpatialTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(OracleSpatialTemplates.builder().newLineToSingleSpace().build()); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleWithQuotingTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/OracleWithQuotingTest.java index aec564a7f..5ab4c9a62 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleWithQuotingTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/OracleWithQuotingTest.java @@ -24,7 +24,7 @@ public class OracleWithQuotingTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initOracle(); - Connections.setTemplates(OracleTemplates.builder().quote().newLineToSingleSpace().build()); + Connections.initConfiguration(OracleTemplates.builder().quote().newLineToSingleSpace().build()); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLLiteralsSuiteTest.java index a8b838646..5c1869e5f 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLLiteralsSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLLiteralsSuiteTest.java @@ -47,7 +47,7 @@ public class PostgreSQLLiteralsSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initPostgres(); - Connections.setTemplates(PostGISTemplates.builder().quote().newLineToSingleSpace().build()); + Connections.initConfiguration(PostGISTemplates.builder().quote().newLineToSingleSpace().build()); Connections.getConfiguration().setUseLiterals(true); } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLSuiteTest.java index 4ae96b647..6731ecfb1 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLSuiteTest.java @@ -47,7 +47,7 @@ public class PostgreSQLSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initPostgres(); - Connections.setTemplates(PostGISTemplates.builder().quote().newLineToSingleSpace().build()); + Connections.initConfiguration(PostGISTemplates.builder().quote().newLineToSingleSpace().build()); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteLiteralsSuiteTest.java index 8de46e1bf..05cf6a167 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteLiteralsSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteLiteralsSuiteTest.java @@ -21,7 +21,7 @@ public class SQLiteLiteralsSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initSQLite(); - Connections.setTemplates(SQLiteTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(SQLiteTemplates.builder().newLineToSingleSpace().build()); Connections.getConfiguration().setUseLiterals(true); } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteSuiteTest.java index 57f40a0cf..20d90e667 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteSuiteTest.java @@ -21,7 +21,7 @@ public class SQLiteSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initSQLite(); - Connections.setTemplates(SQLiteTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(SQLiteTemplates.builder().newLineToSingleSpace().build()); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataLiteralsSuiteTest.java index 4cf6682bc..6350a3ab2 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataLiteralsSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataLiteralsSuiteTest.java @@ -27,7 +27,7 @@ public class TeradataLiteralsSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initTeradata(); - Connections.setTemplates(TeradataSpatialTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(TeradataSpatialTemplates.builder().newLineToSingleSpace().build()); Connections.getConfiguration().setUseLiterals(true); } diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java index b99e12dd9..1fdd575b5 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java @@ -27,7 +27,7 @@ public class TeradataSuiteTest extends AbstractSuite { @BeforeClass public static void setUp() throws Exception { Connections.initTeradata(); - Connections.setTemplates(TeradataSpatialTemplates.builder().newLineToSingleSpace().build()); + Connections.initConfiguration(TeradataSpatialTemplates.builder().newLineToSingleSpace().build()); } }