Improve Connections signature

This commit is contained in:
Timo Westkämper 2014-12-21 00:05:04 +02:00
parent 69c74e3d84
commit 75ac91fdfb
28 changed files with 28 additions and 32 deletions

View File

@ -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));
}

View File

@ -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);
}

View File

@ -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());
}
}

View File

@ -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);
}

View File

@ -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());
}
}

View File

@ -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);
}
}

View File

@ -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());
}
}

View File

@ -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)");

View File

@ -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);
}

View File

@ -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());
}
}

View File

@ -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());
}
}

View File

@ -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());
}
}

View File

@ -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);
}

View File

@ -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());
}
}

View File

@ -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);
}

View File

@ -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());
}
}

View File

@ -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);
}

View File

@ -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());
}
}

View File

@ -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());
}
}

View File

@ -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);
}

View File

@ -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());
}
}

View File

@ -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());
}
}

View File

@ -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);
}

View File

@ -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());
}
}

View File

@ -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);
}

View File

@ -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());
}
}

View File

@ -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);
}

View File

@ -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());
}
}