From d15f3548be88a0eed528bd69aee6a4e6837763f7 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 19 Dec 2016 13:12:03 -0800 Subject: [PATCH] Polish --- ...CloudFoundryActuatorAutoConfiguration.java | 1 - .../SpringPhysicalNamingStrategy.java | 21 +++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java index d5b2feea7f..9df978a816 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java @@ -101,7 +101,6 @@ public class CloudFoundryActuatorAutoConfiguration { /** * Nested configuration for ignored requests if Spring Security is present. - * */ @ConditionalOnClass(WebSecurity.class) static class CloudFoundryIgnoredRequestConfiguration { diff --git a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java index aeef5859c5..070ccf3579 100644 --- a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java +++ b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategy.java @@ -73,11 +73,24 @@ public class SpringPhysicalNamingStrategy implements PhysicalNamingStrategy { builder.insert(i++, '_'); } } + return getIdentifier(builder.toString(), name.isQuoted(), jdbcEnvironment); + } - String text = builder.toString(); - String finalText = isCaseInsensitive(jdbcEnvironment) - ? text.toLowerCase(Locale.ROOT) : text; - return new Identifier(finalText, name.isQuoted()); + /** + * Get an the identifier for the specified details. By default his method will return + * an identifier with the name adapted based on the result of + * {@link #isCaseInsensitive(JdbcEnvironment)} + * @param name the name of the identifier + * @param quoted if the identifier is quoted + * @param jdbcEnvironment the JDBC environment + * @return an identifier instance + */ + protected Identifier getIdentifier(String name, boolean quoted, + JdbcEnvironment jdbcEnvironment) { + if (isCaseInsensitive(jdbcEnvironment)) { + name = name.toLowerCase(Locale.ROOT); + } + return new Identifier(name, quoted); } /**