Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish Javadoc and log messages for embedded databases

Browse Source
This commit is contained in:
Sam Brannen
2015-08-19 21:44:07 +02:00
parent 0cd21aa55f
commit 2025d5c35e
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/AbstractEmbeddedDatabaseConfigurer.java
View File

@@ -44,7 +44,7 @@ abstract class AbstractEmbeddedDatabaseConfigurer implements EmbeddedDatabaseCon
} }
catch (SQLException ex) { catch (SQLException ex) {
if (logger.isWarnEnabled()) { if (logger.isWarnEnabled()) {
logger.warn("Could not shutdown embedded database", ex); logger.warn("Could not shut down embedded database", ex);
} }
} }
} }

4
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@ final class DerbyEmbeddedDatabaseConfigurer implements EmbeddedDatabaseConfigure
catch (SQLException ex) { catch (SQLException ex) {
// Error code that indicates successful shutdown // Error code that indicates successful shutdown
if (!"08006".equals(ex.getSQLState())) { if (!"08006".equals(ex.getSQLState())) {
LogFactory.getLog(getClass()).warn("Could not shutdown in-memory Derby database", ex); LogFactory.getLog(getClass()).warn("Could not shut down embedded Derby database", ex);
} }
} }
} }

12
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -20,10 +20,8 @@ import javax.sql.DataSource;
/** /**
* {@code EmbeddedDatabaseConfigurer} encapsulates the configuration required to * {@code EmbeddedDatabaseConfigurer} encapsulates the configuration required to
* create, connect to, and shutdown a specific type of embedded database such as * create, connect to, and shut down a specific type of embedded database such as
* HSQL or H2. * HSQL, H2, or Derby.
* <p>Create an implementation for each database type you wish to support; for
* example HSQL, H2, or some other type.
* *
* @author Keith Donald * @author Keith Donald
* @author Sam Brannen * @author Sam Brannen
@@ -40,9 +38,9 @@ public interface EmbeddedDatabaseConfigurer {
void configureConnectionProperties(ConnectionProperties properties, String databaseName); void configureConnectionProperties(ConnectionProperties properties, String databaseName);
/** /**
* Shutdown the embedded database instance that backs the supplied {@link DataSource}. * Shut down the embedded database instance that backs the supplied {@link DataSource}.
* @param dataSource the data source * @param dataSource the data source
* @param databaseName the name of the database being shutdown * @param databaseName the name of the database being shut down
*/ */
void shutdown(DataSource dataSource, String databaseName); void shutdown(DataSource dataSource, String databaseName);

2
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
View File

@@ -44,7 +44,7 @@ import org.springframework.util.Assert;
* <li>Call {@link #setDatabaseName} to set an explicit name for the database. * <li>Call {@link #setDatabaseName} to set an explicit name for the database.
* <li>Call {@link #setDatabaseType} to set the database type if you wish to * <li>Call {@link #setDatabaseType} to set the database type if you wish to
* use one of the supported types. * use one of the supported types.
* <li>Call {@link #setDatabaseConfigurer} to configure support for your own * <li>Call {@link #setDatabaseConfigurer} to configure support for a custom
* embedded database type. * embedded database type.
* <li>Call {@link #setDatabasePopulator} to change the algorithm used to * <li>Call {@link #setDatabasePopulator} to change the algorithm used to
* populate the database. * populate the database.