Apply Locale.ROOT for string case change methods' locale

spring-cloud · Oct 18, 2024 · d1cb4e9 · d1cb4e9
1 parent 612710e
commit d1cb4e9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/...ore/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java b/...ore/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java
@@ -26,6 +26,7 @@
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
@@ -527,7 +528,7 @@ private Page<TaskExecution> queryForPageableResults(Pageable pageable, String se
 
 		if (sort != null) {
 			for (Sort.Order sortOrder : sort) {
-				if (validSortColumns.contains(sortOrder.getProperty().toUpperCase())) {
+				if (validSortColumns.contains(sortOrder.getProperty().toUpperCase(Locale.ROOT))) {
 					sortOrderMap.put(sortOrder.getProperty(),
 							sortOrder.isAscending() ? Order.ASCENDING : Order.DESCENDING);
 				}

diff --git a/...pringframework/cloud/task/repository/database/support/AbstractSqlPagingQueryProvider.java b/...pringframework/cloud/task/repository/database/support/AbstractSqlPagingQueryProvider.java
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.sql.DataSource;
@@ -157,7 +158,7 @@ public void init(DataSource dataSource) throws Exception {
 	private String removeKeyWord(String keyWord, String clause) {
 		String temp = clause.trim();
 		String keyWordString = keyWord + " ";
-		if (temp.toLowerCase().startsWith(keyWordString) && temp.length() > keyWordString.length()) {
+		if (temp.toLowerCase(Locale.ROOT).startsWith(keyWordString) && temp.length() > keyWordString.length()) {
 			return temp.substring(keyWordString.length());
 		}
 		else {

diff --git a/...ngframework/cloud/task/repository/database/support/SqlPagingQueryProviderFactoryBean.java b/...ngframework/cloud/task/repository/database/support/SqlPagingQueryProviderFactoryBean.java
@@ -17,6 +17,7 @@
 package org.springframework.cloud.task.repository.database.support;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.sql.DataSource;
@@ -135,7 +136,7 @@ public PagingQueryProvider getObject() throws Exception {
 
 		DatabaseType type;
 		try {
-			type = this.databaseType != null ? DatabaseType.valueOf(this.databaseType.toUpperCase())
+			type = this.databaseType != null ? DatabaseType.valueOf(this.databaseType.toUpperCase(Locale.ROOT))
 					: DatabaseType.fromMetaData(this.dataSource);
 		}
 		catch (MetaDataAccessException e) {

diff --git a/...ain/java/org/springframework/cloud/task/repository/support/TaskRepositoryInitializer.java b/...ain/java/org/springframework/cloud/task/repository/support/TaskRepositoryInitializer.java
@@ -17,6 +17,7 @@
 package org.springframework.cloud.task.repository.support;
 
 import java.sql.SQLException;
+import java.util.Locale;
 
 import javax.sql.DataSource;
 
@@ -84,7 +85,8 @@ public void setResourceLoader(ResourceLoader resourceLoader) {
 
 	private String getDatabaseType(DataSource dataSource) {
 		try {
-			return JdbcUtils.commonDatabaseName(DatabaseType.fromMetaData(dataSource).toString()).toLowerCase();
+			return JdbcUtils.commonDatabaseName(DatabaseType.fromMetaData(dataSource).toString())
+				.toLowerCase(Locale.ROOT);
 		}
 		catch (MetaDataAccessException ex) {
 			throw new IllegalStateException("Unable to detect database type", ex);