Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ public static CallMetaDataProvider createMetaDataProvider(DataSource dataSource,
}
}

@SuppressWarnings("removal")
CallMetaDataProvider provider = switch (databaseProductName) {
case ORACLE -> new OracleCallMetaDataProvider(databaseMetaData);
case POSTGRES -> new PostgresCallMetaDataProvider(databaseMetaData);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
* @author Thomas Risberg
* @author Juergen Hoeller
* @since 2.5
* @deprecated Apache Derby is retired, switch to H2 or HSQLDB
*/
@Deprecated(forRemoval = true, since = "7.1")
public class DerbyCallMetaDataProvider extends GenericCallMetaDataProvider {

public DerbyCallMetaDataProvider(DatabaseMetaData databaseMetaData) throws SQLException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
*
* @author Thomas Risberg
* @since 3.0
* @deprecated Apache Derby is retired, switch to HSQLDB or H2
*/
@Deprecated(forRemoval = true, since = "7.1")
public class DerbyTableMetaDataProvider extends GenericTableMetaDataProvider {

private boolean supportsGeneratedKeysOverride = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ private TableMetaDataProviderFactory() {
* @param context the class that holds configuration and meta-data
* @return instance of the TableMetaDataProvider implementation to be used
*/
@SuppressWarnings("removal")
public static TableMetaDataProvider createMetaDataProvider(DataSource dataSource, TableMetaDataContext context) {
try {
return JdbcUtils.extractDatabaseMetaData(dataSource, databaseMetaData -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.springframework.jdbc.datasource.embedded;

import java.io.OutputStream;
import java.sql.SQLException;
import java.util.Properties;

Expand All @@ -33,7 +34,9 @@
* @author Oliver Gierke
* @author Juergen Hoeller
* @since 3.0
* @deprecated Apache Derby is retired, switch to H2 or HSQLDB
*/
@Deprecated(forRemoval = true, since = "7.1")
final class DerbyEmbeddedDatabaseConfigurer implements EmbeddedDatabaseConfigurer {

private static final String URL_TEMPLATE = "jdbc:derby:memory:%s;%s";
Expand All @@ -49,7 +52,7 @@ public static synchronized DerbyEmbeddedDatabaseConfigurer getInstance() {
if (instance == null) {
// disable log file
System.setProperty("derby.stream.error.method",
OutputStreamFactory.class.getName() + ".getNoopOutputStream");
OutputStream.class.getName() + ".nullOutputStream");
instance = new DerbyEmbeddedDatabaseConfigurer();
}
return instance;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public abstract class EmbeddedDatabaseConfigurers {
* @return the configurer instance
* @throws IllegalStateException if the driver for the specified database type is not available
*/
@SuppressWarnings("removal")
public static EmbeddedDatabaseConfigurer getConfigurer(EmbeddedDatabaseType type) {
Assert.notNull(type, "EmbeddedDatabaseType is required");
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ public enum EmbeddedDatabaseType {
/** The <a href="https://h2database.com">H2</a> Embedded Java SQL Database Engine. */
H2,

/** The <a href="https://db.apache.org/derby">Apache Derby</a> Embedded SQL Database. */
/**
* The <a href="https://db.apache.org/derby">Apache Derby</a> Embedded SQL Database.
*
* @deprecated Apache Derby is retired, switch to HSQLDB or H2
*/
@Deprecated(forRemoval = true, since = "7.1")
DERBY

}
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@
*
* @author Thomas Risberg
* @author Juergen Hoeller
* @since 2.5
* @deprecated Apache Derby is retired, switch to HSQLDB or H2
*/
@Deprecated(forRemoval = true, since = "7.1")
public class DerbyMaxValueIncrementer extends AbstractIdentityColumnMaxValueIncrementer {

/** The default for dummy name. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ public enum Database {

DB2,

/**
* @deprecated Apache Derby is retired, switch to HSQLDB or H2
*/
@Deprecated(forRemoval = true, since = "7.1")
DERBY,

/** @since 2.5.5 */
Expand Down