Handle numbers underscore separation when mapping camelCase containin…

…g a number to snake_case
spring-projects · Oct 31, 2024 · 81ab792 · 81ab792
1 parent b9ac2cc
commit 81ab792
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java
@@ -524,6 +524,9 @@ public static String convertPropertyNameToUnderscoreName(@Nullable String name)
 			if (Character.isUpperCase(c)) {
 				result.append('_').append(Character.toLowerCase(c));
 			}
+			else if (Character.isDigit(c) && !Character.isDigit(name.charAt(i - 1))) {
+				result.append('_').append(c);
+			}
 			else {
 				result.append(c);
 			}

diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/JdbcUtilsTests.java
@@ -58,4 +58,11 @@ void convertUnderscoreNameToPropertyName() {
 		assertThat(JdbcUtils.convertUnderscoreNameToPropertyName("some_name_with_1_digit")).isEqualTo("someNameWith1Digit");
 	}
 
+	@Test
+	void convertPropertyNameToUnderscoreName() {
+		assertThat(JdbcUtils.convertPropertyNameToUnderscoreName("AName")).isEqualTo("a_name");
+		assertThat(JdbcUtils.convertPropertyNameToUnderscoreName("someoneElsesName")).isEqualTo("someone_elses_name");
+		assertThat(JdbcUtils.convertPropertyNameToUnderscoreName("someNameWith1Digit")).isEqualTo("some_name_with_1_digit");
+		assertThat(JdbcUtils.convertPropertyNameToUnderscoreName("someNameWith12Number")).isEqualTo("some_name_with_12_number");
+	}
 }