From 2e9d6a1d4e4720414ab3c5c0f64f9ff20cf676eb Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 29 Jan 2024 13:04:42 +0100 Subject: [PATCH] Polishing --- .../jdbc/core/metadata/GenericTableMetaDataProvider.java | 7 ++++--- .../jdbc/core/metadata/TableMetaDataContext.java | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java index 2a5d80c3cb..b331de7241 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 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. @@ -258,6 +258,7 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider { return identifierNameToUse(schemaName); } + @Nullable private String identifierNameToUse(@Nullable String identifierName) { if (identifierName == null) { return null; @@ -326,8 +327,8 @@ public class GenericTableMetaDataProvider implements TableMetaDataProvider { tables = databaseMetaData.getTables( catalogNameToUse(catalogName), schemaNameToUse(schemaName), tableNameToUse(tableName), null); while (tables != null && tables.next()) { - TableMetaData tmd = new TableMetaData(tables.getString("TABLE_CAT"), tables.getString("TABLE_SCHEM"), - tables.getString("TABLE_NAME")); + TableMetaData tmd = new TableMetaData(tables.getString("TABLE_CAT"), + tables.getString("TABLE_SCHEM"), tables.getString("TABLE_NAME")); if (tmd.schemaName() == null) { tableMeta.put(this.userName != null ? this.userName.toUpperCase() : "", tmd); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java index b9c4505eeb..447f0b23ab 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java @@ -425,6 +425,7 @@ public class TableMetaDataContext { return obtainMetaDataProvider().isGeneratedKeysColumnNameArraySupported(); } + private static final class QuoteHandler { @Nullable @@ -432,7 +433,7 @@ public class TableMetaDataContext { private final boolean quoting; - private QuoteHandler(@Nullable String identifierQuoteString) { + public QuoteHandler(@Nullable String identifierQuoteString) { this.identifierQuoteString = identifierQuoteString; this.quoting = StringUtils.hasText(identifierQuoteString); }