diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/CannotReadScriptException.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/CannotReadScriptException.java index 10c95834a81..31685154f6d 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/CannotReadScriptException.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/CannotReadScriptException.java @@ -22,7 +22,6 @@ import org.springframework.core.io.support.EncodedResource; * not be read during population. * * @author Keith Donald - * @since 3.0 */ @SuppressWarnings("serial") public class CannotReadScriptException extends RuntimeException { diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java index f5a9da6d263..78b6ad24e4b 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.jdbc.datasource.embedded; 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. * * @author Oliver Gierke - * @since 3.0 */ final class H2EmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfigurer { @@ -31,7 +29,6 @@ final class H2EmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfigu private final Class driverClass; - /** * Get the singleton {@link H2EmbeddedDatabaseConfigurer} instance. * @return the configurer @@ -45,16 +42,15 @@ final class H2EmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfigu return INSTANCE; } - - private H2EmbeddedDatabaseConfigurer(Class driverClass) { - this.driverClass = driverClass; - } - 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.setUsername("sa"); properties.setPassword(""); } -} + private H2EmbeddedDatabaseConfigurer(Class driverClass) { + this.driverClass = driverClass; + } + +} \ No newline at end of file diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java index 36406e68615..a5911ee3d57 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/HsqlEmbeddedDatabaseConfigurer.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.jdbc.datasource.embedded; import org.springframework.util.ClassUtils; @@ -24,7 +23,6 @@ import org.springframework.util.ClassUtils; * * @author Keith Donald * @author Oliver Gierke - * @since 3.0 */ final class HsqlEmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfigurer { @@ -32,7 +30,6 @@ final class HsqlEmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfi private final Class driverClass; - /** * Get the singleton {@link HsqlEmbeddedDatabaseConfigurer} instance. * @return the configurer @@ -46,16 +43,15 @@ final class HsqlEmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfi return INSTANCE; } - - private HsqlEmbeddedDatabaseConfigurer(Class driverClass) { - this.driverClass = driverClass; - } - public void configureConnectionProperties(ConnectionProperties properties, String databaseName) { - properties.setDriverClass(this.driverClass); + properties.setDriverClass(driverClass); properties.setUrl("jdbc:hsqldb:mem:" + databaseName); properties.setUsername("sa"); properties.setPassword(""); } -} + private HsqlEmbeddedDatabaseConfigurer(Class driverClass) { + this.driverClass = driverClass; + } + +} \ No newline at end of file diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/JdbcUtils.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/JdbcUtils.java index 866ba89c589..6f47739d396 100644 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/JdbcUtils.java +++ b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/JdbcUtils.java @@ -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; import java.sql.Connection;