removed @since 3.0--no point if its not consistent and whole package is 3.0 anyway
This commit is contained in:
parent
54c768de5d
commit
b9aa82a0c4
|
|
@ -22,7 +22,6 @@ import org.springframework.core.io.support.EncodedResource;
|
||||||
* not be read during population.
|
* not be read during population.
|
||||||
*
|
*
|
||||||
* @author Keith Donald
|
* @author Keith Donald
|
||||||
* @since 3.0
|
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class CannotReadScriptException extends RuntimeException {
|
public class CannotReadScriptException extends RuntimeException {
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,6 @@
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.jdbc.datasource.embedded;
|
package org.springframework.jdbc.datasource.embedded;
|
||||||
|
|
||||||
import org.springframework.util.ClassUtils;
|
import org.springframework.util.ClassUtils;
|
||||||
|
|
@ -23,7 +22,6 @@ import org.springframework.util.ClassUtils;
|
||||||
* Call {@link #getInstance()} to get the singleton instance of this class.
|
* Call {@link #getInstance()} to get the singleton instance of this class.
|
||||||
*
|
*
|
||||||
* @author Oliver Gierke
|
* @author Oliver Gierke
|
||||||
* @since 3.0
|
|
||||||
*/
|
*/
|
||||||
final class H2EmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfigurer {
|
final class H2EmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfigurer {
|
||||||
|
|
||||||
|
|
@ -31,7 +29,6 @@ final class H2EmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfigu
|
||||||
|
|
||||||
private final Class<?> driverClass;
|
private final Class<?> driverClass;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the singleton {@link H2EmbeddedDatabaseConfigurer} instance.
|
* Get the singleton {@link H2EmbeddedDatabaseConfigurer} instance.
|
||||||
* @return the configurer
|
* @return the configurer
|
||||||
|
|
@ -45,16 +42,15 @@ final class H2EmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfigu
|
||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private H2EmbeddedDatabaseConfigurer(Class<?> driverClass) {
|
|
||||||
this.driverClass = driverClass;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void configureConnectionProperties(ConnectionProperties properties, String databaseName) {
|
public void configureConnectionProperties(ConnectionProperties properties, String databaseName) {
|
||||||
properties.setDriverClass(this.driverClass);
|
properties.setDriverClass(driverClass);
|
||||||
properties.setUrl(String.format("jdbc:h2:mem:%s;DB_CLOSE_DELAY=-1", databaseName));
|
properties.setUrl(String.format("jdbc:h2:mem:%s;DB_CLOSE_DELAY=-1", databaseName));
|
||||||
properties.setUsername("sa");
|
properties.setUsername("sa");
|
||||||
properties.setPassword("");
|
properties.setPassword("");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
private H2EmbeddedDatabaseConfigurer(Class<?> driverClass) {
|
||||||
|
this.driverClass = driverClass;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -13,7 +13,6 @@
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.jdbc.datasource.embedded;
|
package org.springframework.jdbc.datasource.embedded;
|
||||||
|
|
||||||
import org.springframework.util.ClassUtils;
|
import org.springframework.util.ClassUtils;
|
||||||
|
|
@ -24,7 +23,6 @@ import org.springframework.util.ClassUtils;
|
||||||
*
|
*
|
||||||
* @author Keith Donald
|
* @author Keith Donald
|
||||||
* @author Oliver Gierke
|
* @author Oliver Gierke
|
||||||
* @since 3.0
|
|
||||||
*/
|
*/
|
||||||
final class HsqlEmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfigurer {
|
final class HsqlEmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfigurer {
|
||||||
|
|
||||||
|
|
@ -32,7 +30,6 @@ final class HsqlEmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfi
|
||||||
|
|
||||||
private final Class<?> driverClass;
|
private final Class<?> driverClass;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the singleton {@link HsqlEmbeddedDatabaseConfigurer} instance.
|
* Get the singleton {@link HsqlEmbeddedDatabaseConfigurer} instance.
|
||||||
* @return the configurer
|
* @return the configurer
|
||||||
|
|
@ -46,16 +43,15 @@ final class HsqlEmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfi
|
||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private HsqlEmbeddedDatabaseConfigurer(Class<?> driverClass) {
|
|
||||||
this.driverClass = driverClass;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void configureConnectionProperties(ConnectionProperties properties, String databaseName) {
|
public void configureConnectionProperties(ConnectionProperties properties, String databaseName) {
|
||||||
properties.setDriverClass(this.driverClass);
|
properties.setDriverClass(driverClass);
|
||||||
properties.setUrl("jdbc:hsqldb:mem:" + databaseName);
|
properties.setUrl("jdbc:hsqldb:mem:" + databaseName);
|
||||||
properties.setUsername("sa");
|
properties.setUsername("sa");
|
||||||
properties.setPassword("");
|
properties.setPassword("");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
private HsqlEmbeddedDatabaseConfigurer(Class<?> driverClass) {
|
||||||
|
this.driverClass = driverClass;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,3 +1,18 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2002-2009 the original author or authors.
|
||||||
|
*
|
||||||
|
* 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 org.springframework.jdbc.datasource.embedded;
|
package org.springframework.jdbc.datasource.embedded;
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue