Skip to content

Commit

Permalink
HHH-9722
Browse files Browse the repository at this point in the history
Changed all toLowerCase() and toUpperCase() to toLowerCase(Locale.ROOT),
toUpperCase(Locale.ROOT).
  • Loading branch information
10urshin authored and brmeyer committed Apr 17, 2015
1 parent f0029d4 commit 1361925
Show file tree
Hide file tree
Showing 80 changed files with 221 additions and 139 deletions.
4 changes: 3 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/CacheMode.java
Expand Up @@ -23,6 +23,8 @@
*/ */
package org.hibernate; package org.hibernate;


import java.util.Locale;

/** /**
* Controls how the session interacts with the second-level cache and query cache. * Controls how the session interacts with the second-level cache and query cache.
* *
Expand Down Expand Up @@ -100,7 +102,7 @@ public static CacheMode interpretExternalSetting(String setting) {
} }


try { try {
return CacheMode.valueOf( setting.toUpperCase() ); return CacheMode.valueOf( setting.toUpperCase(Locale.ROOT) );
} }
catch ( IllegalArgumentException e ) { catch ( IllegalArgumentException e ) {
throw new MappingException( "Unknown Cache Mode: " + setting ); throw new MappingException( "Unknown Cache Mode: " + setting );
Expand Down
Expand Up @@ -23,6 +23,8 @@
*/ */
package org.hibernate; package org.hibernate;


import java.util.Locale;

/** /**
* Defines the various policies by which Hibernate might release its underlying * Defines the various policies by which Hibernate might release its underlying
* JDBC connection. * JDBC connection.
Expand Down Expand Up @@ -61,6 +63,6 @@ public enum ConnectionReleaseMode{
* @return The matched enum value. * @return The matched enum value.
*/ */
public static ConnectionReleaseMode parse(final String name) { public static ConnectionReleaseMode parse(final String name) {
return ConnectionReleaseMode.valueOf( name.toUpperCase() ); return ConnectionReleaseMode.valueOf( name.toUpperCase(Locale.ROOT) );
} }
} }
4 changes: 3 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/FlushMode.java
Expand Up @@ -23,6 +23,8 @@
*/ */
package org.hibernate; package org.hibernate;


import java.util.Locale;

/** /**
* Represents a flushing strategy. The flush process synchronizes * Represents a flushing strategy. The flush process synchronizes
* database state with session state by detecting state changes * database state with session state by detecting state changes
Expand Down Expand Up @@ -119,7 +121,7 @@ public static FlushMode interpretExternalSetting(String externalName) {
} }


try { try {
return FlushMode.valueOf( externalName.toUpperCase() ); return FlushMode.valueOf( externalName.toUpperCase(Locale.ROOT) );
} }
catch ( IllegalArgumentException e ) { catch ( IllegalArgumentException e ) {
throw new MappingException( "unknown FlushMode : " + externalName ); throw new MappingException( "unknown FlushMode : " + externalName );
Expand Down
Expand Up @@ -23,6 +23,7 @@
*/ */
package org.hibernate; package org.hibernate;


import java.util.Locale;
import java.util.Map; import java.util.Map;


import org.hibernate.cfg.Environment; import org.hibernate.cfg.Environment;
Expand Down Expand Up @@ -88,7 +89,7 @@ public static MultiTenancyStrategy determineMultiTenancyStrategy(Map properties)


final String strategyName = strategy.toString(); final String strategyName = strategy.toString();
try { try {
return MultiTenancyStrategy.valueOf( strategyName.toUpperCase() ); return MultiTenancyStrategy.valueOf( strategyName.toUpperCase(Locale.ROOT) );
} }
catch ( RuntimeException e ) { catch ( RuntimeException e ) {
LOG.warn( "Unknown multi tenancy strategy [ " +strategyName +" ], using MultiTenancyStrategy.NONE." ); LOG.warn( "Unknown multi tenancy strategy [ " +strategyName +" ], using MultiTenancyStrategy.NONE." );
Expand Down
Expand Up @@ -28,6 +28,7 @@
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import javax.persistence.AttributeConverter; import javax.persistence.AttributeConverter;
import javax.persistence.SharedCacheMode; import javax.persistence.SharedCacheMode;
Expand Down Expand Up @@ -339,7 +340,7 @@ public MetadataBuilder applySqlFunction(String functionName, SQLFunction functio


// HHH-7721: SQLFunctionRegistry expects all lowercase. Enforce, // HHH-7721: SQLFunctionRegistry expects all lowercase. Enforce,
// just in case a user's customer dialect uses mixed cases. // just in case a user's customer dialect uses mixed cases.
this.options.sqlFunctionMap.put( functionName.toLowerCase(), function ); this.options.sqlFunctionMap.put( functionName.toLowerCase(Locale.ROOT), function );


return this; return this;
} }
Expand Down
Expand Up @@ -2500,7 +2500,7 @@ private void bindProperty(
String.format( String.format(
Locale.ENGLISH, Locale.ENGLISH,
"Cannot specify both insert=\"true\" and generated=\"%s\" for property %s", "Cannot specify both insert=\"true\" and generated=\"%s\" for property %s",
generationTiming.name().toLowerCase(), generationTiming.name().toLowerCase(Locale.ROOT),
propertySource.getName() propertySource.getName()
), ),
mappingDocument.getOrigin() mappingDocument.getOrigin()
Expand All @@ -2522,7 +2522,7 @@ private void bindProperty(
String.format( String.format(
Locale.ENGLISH, Locale.ENGLISH,
"Cannot specify both update=\"true\" and generated=\"%s\" for property %s", "Cannot specify both update=\"true\" and generated=\"%s\" for property %s",
generationTiming.name().toLowerCase(), generationTiming.name().toLowerCase(Locale.ROOT),
propertySource.getName() propertySource.getName()
), ),
mappingDocument.getOrigin() mappingDocument.getOrigin()
Expand Down
Expand Up @@ -23,6 +23,8 @@
*/ */
package org.hibernate.boot.model.source.internal.hbm; package org.hibernate.boot.model.source.internal.hbm;


import java.util.Locale;

/** /**
* Provides meta-information about XML elements. * Provides meta-information about XML elements.
* *
Expand Down Expand Up @@ -173,7 +175,7 @@ public enum XmlElementMetadata {
* @return The {@code hbm.xml} element name * @return The {@code hbm.xml} element name
*/ */
public String getElementName() { public String getElementName() {
return name().toLowerCase(); return name().toLowerCase(Locale.ROOT);
} }


/** /**
Expand Down
Expand Up @@ -31,6 +31,7 @@


import javax.persistence.Id; import javax.persistence.Id;
import java.util.Collection; import java.util.Collection;
import java.util.Locale;


/** /**
* utility class to generate interceptor methods * utility class to generate interceptor methods
Expand Down Expand Up @@ -176,7 +177,7 @@ private PrimitiveAttributeTypeDescriptor(Class<?> primitiveType) {
throw new IllegalArgumentException( "Primitive attribute type descriptor can only be used on primitive types" ); throw new IllegalArgumentException( "Primitive attribute type descriptor can only be used on primitive types" );
} }
// capitalize first letter // capitalize first letter
this.type = primitiveType.getSimpleName().substring( 0, 1 ).toUpperCase() + primitiveType.getSimpleName().substring( 1 ); this.type = primitiveType.getSimpleName().substring( 0, 1 ).toUpperCase(Locale.ROOT) + primitiveType.getSimpleName().substring( 1 );
} }


public String buildReadInterceptionBodyFragment(String fieldName) { public String buildReadInterceptionBodyFragment(String fieldName) {
Expand All @@ -197,7 +198,7 @@ public String buildWriteInterceptionBodyFragment(String fieldName) {
"}%n" + "}%n" +
"this.%1$s = localVar;", "this.%1$s = localVar;",
fieldName, fieldName,
type.toLowerCase(), type.toLowerCase(Locale.ROOT ),
type, type,
EnhancerConstants.INTERCEPTOR_GETTER_NAME EnhancerConstants.INTERCEPTOR_GETTER_NAME
); );
Expand Down
Expand Up @@ -25,6 +25,7 @@


import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Locale;
import java.util.Map; import java.util.Map;


import org.hibernate.AnnotationException; import org.hibernate.AnnotationException;
Expand Down Expand Up @@ -88,7 +89,7 @@ public void doSecondPass(Map persistentClasses) throws MappingException {
break; break;
} }
//JPA 2 requires referencedColumnNames to be case insensitive //JPA 2 requires referencedColumnNames to be case insensitive
columnByReferencedName.put( referencedColumnName.toLowerCase(), joinColumn ); columnByReferencedName.put( referencedColumnName.toLowerCase(Locale.ROOT), joinColumn );
} }
//try default column orientation //try default column orientation
int index = 0; int index = 0;
Expand Down Expand Up @@ -146,7 +147,7 @@ public void doSecondPass(Map persistentClasses) throws MappingException {
columnName columnName
); );
//JPA 2 requires referencedColumnNames to be case insensitive //JPA 2 requires referencedColumnNames to be case insensitive
joinColumn = columnByReferencedName.get( logicalColumnName.toLowerCase() ); joinColumn = columnByReferencedName.get( logicalColumnName.toLowerCase(Locale.ROOT ) );
} }
else { else {
joinColumn = columnByReferencedName.get( "" + index ); joinColumn = columnByReferencedName.get( "" + index );
Expand Down
Expand Up @@ -22,6 +22,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.cfg; package org.hibernate.cfg;
import java.util.Locale;
import org.hibernate.AssertionFailure; import org.hibernate.AssertionFailure;
import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.StringHelper;


Expand All @@ -32,7 +33,7 @@ public class DefaultComponentSafeNamingStrategy extends EJB3NamingStrategy {
public static final NamingStrategy INSTANCE = new DefaultComponentSafeNamingStrategy(); public static final NamingStrategy INSTANCE = new DefaultComponentSafeNamingStrategy();


protected static String addUnderscores(String name) { protected static String addUnderscores(String name) {
return name.replace( '.', '_' ).toLowerCase(); return name.replace( '.', '_' ).toLowerCase(Locale.ROOT);
} }


@Override @Override
Expand Down
Expand Up @@ -24,6 +24,7 @@
package org.hibernate.cfg; package org.hibernate.cfg;


import java.io.Serializable; import java.io.Serializable;
import java.util.Locale;


import org.hibernate.AssertionFailure; import org.hibernate.AssertionFailure;
import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.StringHelper;
Expand Down Expand Up @@ -79,7 +80,7 @@ protected static String addUnderscores(String name) {
buf.insert(i++, '_'); buf.insert(i++, '_');
} }
} }
return buf.toString().toLowerCase(); return buf.toString().toLowerCase(Locale.ROOT);
} }


public String collectionTableName( public String collectionTableName(
Expand Down
Expand Up @@ -25,6 +25,7 @@


import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import javax.persistence.Index; import javax.persistence.Index;


Expand Down Expand Up @@ -69,7 +70,7 @@ public boolean isUnique() {
private void initializeColumns(String[] columns, String[] ordering, List<String> list) { private void initializeColumns(String[] columns, String[] ordering, List<String> list) {
for ( int i = 0, size = list.size(); i < size; i++ ) { for ( int i = 0, size = list.size(); i < size; i++ ) {
final String description = list.get( i ); final String description = list.get( i );
final String tmp = description.toLowerCase(); final String tmp = description.toLowerCase(Locale.ROOT);
if ( tmp.endsWith( " desc" ) ) { if ( tmp.endsWith( " desc" ) ) {
columns[i] = description.substring( 0, description.length() - 5 ); columns[i] = description.substring( 0, description.length() - 5 );
ordering[i] = "desc"; ordering[i] = "desc";
Expand Down
Expand Up @@ -22,6 +22,7 @@
* Boston, MA 02110-1301 USA * Boston, MA 02110-1301 USA
*/ */
package org.hibernate.cfg; package org.hibernate.cfg;
import java.util.Locale;
import java.util.Map; import java.util.Map;


import org.hibernate.MappingException; import org.hibernate.MappingException;
Expand Down Expand Up @@ -66,7 +67,7 @@ public void doSecondPass(Map persistentClasses) throws MappingException {
clazz.getProperty( fetch.association() ); clazz.getProperty( fetch.association() );


profile.addFetch( profile.addFetch(
fetch.entity().getName(), fetch.association(), fetch.mode().toString().toLowerCase() fetch.entity().getName(), fetch.association(), fetch.mode().toString().toLowerCase(Locale.ROOT)
); );
} }
} }
Expand Down
Expand Up @@ -26,6 +26,7 @@
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import javax.persistence.AttributeOverride; import javax.persistence.AttributeOverride;
Expand Down Expand Up @@ -463,23 +464,23 @@ public void bind() {
Loader loader = property.getAnnotation( Loader.class ); Loader loader = property.getAnnotation( Loader.class );
if ( sqlInsert != null ) { if ( sqlInsert != null ) {
collection.setCustomSQLInsert( sqlInsert.sql().trim(), sqlInsert.callable(), collection.setCustomSQLInsert( sqlInsert.sql().trim(), sqlInsert.callable(),
ExecuteUpdateResultCheckStyle.fromExternalName( sqlInsert.check().toString().toLowerCase() ) ExecuteUpdateResultCheckStyle.fromExternalName( sqlInsert.check().toString().toLowerCase(Locale.ROOT) )
); );


} }
if ( sqlUpdate != null ) { if ( sqlUpdate != null ) {
collection.setCustomSQLUpdate( sqlUpdate.sql(), sqlUpdate.callable(), collection.setCustomSQLUpdate( sqlUpdate.sql(), sqlUpdate.callable(),
ExecuteUpdateResultCheckStyle.fromExternalName( sqlUpdate.check().toString().toLowerCase() ) ExecuteUpdateResultCheckStyle.fromExternalName( sqlUpdate.check().toString().toLowerCase(Locale.ROOT) )
); );
} }
if ( sqlDelete != null ) { if ( sqlDelete != null ) {
collection.setCustomSQLDelete( sqlDelete.sql(), sqlDelete.callable(), collection.setCustomSQLDelete( sqlDelete.sql(), sqlDelete.callable(),
ExecuteUpdateResultCheckStyle.fromExternalName( sqlDelete.check().toString().toLowerCase() ) ExecuteUpdateResultCheckStyle.fromExternalName( sqlDelete.check().toString().toLowerCase(Locale.ROOT) )
); );
} }
if ( sqlDeleteAll != null ) { if ( sqlDeleteAll != null ) {
collection.setCustomSQLDeleteAll( sqlDeleteAll.sql(), sqlDeleteAll.callable(), collection.setCustomSQLDeleteAll( sqlDeleteAll.sql(), sqlDeleteAll.callable(),
ExecuteUpdateResultCheckStyle.fromExternalName( sqlDeleteAll.check().toString().toLowerCase() ) ExecuteUpdateResultCheckStyle.fromExternalName( sqlDeleteAll.check().toString().toLowerCase(Locale.ROOT) )
); );
} }
if ( loader != null ) { if ( loader != null ) {
Expand Down
Expand Up @@ -27,6 +27,7 @@
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale;
import javax.persistence.Access; import javax.persistence.Access;
import javax.persistence.ConstraintMode; import javax.persistence.ConstraintMode;
import javax.persistence.Entity; import javax.persistence.Entity;
Expand Down Expand Up @@ -334,23 +335,23 @@ public void bindEntity() {


if ( sqlInsert != null ) { if ( sqlInsert != null ) {
persistentClass.setCustomSQLInsert( sqlInsert.sql().trim(), sqlInsert.callable(), persistentClass.setCustomSQLInsert( sqlInsert.sql().trim(), sqlInsert.callable(),
ExecuteUpdateResultCheckStyle.fromExternalName( sqlInsert.check().toString().toLowerCase() ) ExecuteUpdateResultCheckStyle.fromExternalName( sqlInsert.check().toString().toLowerCase(Locale.ROOT) )
); );


} }
if ( sqlUpdate != null ) { if ( sqlUpdate != null ) {
persistentClass.setCustomSQLUpdate( sqlUpdate.sql(), sqlUpdate.callable(), persistentClass.setCustomSQLUpdate( sqlUpdate.sql(), sqlUpdate.callable(),
ExecuteUpdateResultCheckStyle.fromExternalName( sqlUpdate.check().toString().toLowerCase() ) ExecuteUpdateResultCheckStyle.fromExternalName( sqlUpdate.check().toString().toLowerCase(Locale.ROOT) )
); );Locale.ROOT
} }
if ( sqlDelete != null ) { if ( sqlDelete != null ) {
persistentClass.setCustomSQLDelete( sqlDelete.sql(), sqlDelete.callable(), persistentClass.setCustomSQLDelete( sqlDelete.sql(), sqlDelete.callable(),
ExecuteUpdateResultCheckStyle.fromExternalName( sqlDelete.check().toString().toLowerCase() ) ExecuteUpdateResultCheckStyle.fromExternalName( sqlDelete.check().toString().toLowerCase(Locale.ROOT) )
); );
} }
if ( sqlDeleteAll != null ) { if ( sqlDeleteAll != null ) {
persistentClass.setCustomSQLDelete( sqlDeleteAll.sql(), sqlDeleteAll.callable(), persistentClass.setCustomSQLDelete( sqlDeleteAll.sql(), sqlDeleteAll.callable(),
ExecuteUpdateResultCheckStyle.fromExternalName( sqlDeleteAll.check().toString().toLowerCase() ) ExecuteUpdateResultCheckStyle.fromExternalName( sqlDeleteAll.check().toString().toLowerCase(Locale.ROOT) )
); );
} }
if ( loader != null ) { if ( loader != null ) {
Expand Down Expand Up @@ -986,23 +987,23 @@ else if ( joinTable != null ) {
join.setCustomSQLInsert( matchingTable.sqlInsert().sql().trim(), join.setCustomSQLInsert( matchingTable.sqlInsert().sql().trim(),
matchingTable.sqlInsert().callable(), matchingTable.sqlInsert().callable(),
ExecuteUpdateResultCheckStyle.fromExternalName( ExecuteUpdateResultCheckStyle.fromExternalName(
matchingTable.sqlInsert().check().toString().toLowerCase() matchingTable.sqlInsert().check().toString().toLowerCase(Locale.ROOT)
) )
); );
} }
if ( !BinderHelper.isEmptyAnnotationValue( matchingTable.sqlUpdate().sql() ) ) { if ( !BinderHelper.isEmptyAnnotationValue( matchingTable.sqlUpdate().sql() ) ) {
join.setCustomSQLUpdate( matchingTable.sqlUpdate().sql().trim(), join.setCustomSQLUpdate( matchingTable.sqlUpdate().sql().trim(),
matchingTable.sqlUpdate().callable(), matchingTable.sqlUpdate().callable(),
ExecuteUpdateResultCheckStyle.fromExternalName( ExecuteUpdateResultCheckStyle.fromExternalName(
matchingTable.sqlUpdate().check().toString().toLowerCase() matchingTable.sqlUpdate().check().toString().toLowerCase(Locale.ROOT)
) )
); );
} }
if ( !BinderHelper.isEmptyAnnotationValue( matchingTable.sqlDelete().sql() ) ) { if ( !BinderHelper.isEmptyAnnotationValue( matchingTable.sqlDelete().sql() ) ) {
join.setCustomSQLDelete( matchingTable.sqlDelete().sql().trim(), join.setCustomSQLDelete( matchingTable.sqlDelete().sql().trim(),
matchingTable.sqlDelete().callable(), matchingTable.sqlDelete().callable(),
ExecuteUpdateResultCheckStyle.fromExternalName( ExecuteUpdateResultCheckStyle.fromExternalName(
matchingTable.sqlDelete().check().toString().toLowerCase() matchingTable.sqlDelete().check().toString().toLowerCase(Locale.ROOT)
) )
); );
} }
Expand Down
Expand Up @@ -34,6 +34,7 @@
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.persistence.Access; import javax.persistence.Access;
Expand Down Expand Up @@ -1980,7 +1981,7 @@ public static List<NamedStoredProcedureQuery> buildNamedStoreProcedureQueries(El
parameterDescriptor.setValue( "mode", ParameterMode.IN ); parameterDescriptor.setValue( "mode", ParameterMode.IN );
} }
else { else {
parameterDescriptor.setValue( "mode", ParameterMode.valueOf( modeValue.toUpperCase() ) ); parameterDescriptor.setValue( "mode", ParameterMode.valueOf( modeValue.toUpperCase(Locale.ROOT) ) );
} }
String clazzName = parameterElement.attributeValue( "class" ); String clazzName = parameterElement.attributeValue( "class" );
Class clazz; Class clazz;
Expand Down
Expand Up @@ -24,6 +24,7 @@
package org.hibernate.cfg.beanvalidation; package org.hibernate.cfg.beanvalidation;


import java.util.HashSet; import java.util.HashSet;
import java.util.Locale;
import java.util.Set; import java.util.Set;


import org.hibernate.HibernateException; import org.hibernate.HibernateException;
Expand Down Expand Up @@ -68,7 +69,7 @@ private static ValidationMode getMode(String modeProperty) {
} }
else { else {
try { try {
return valueOf( modeProperty.trim().toUpperCase() ); return valueOf( modeProperty.trim().toUpperCase(Locale.ROOT) );
} }
catch ( IllegalArgumentException e ) { catch ( IllegalArgumentException e ) {
throw new HibernateException( "Unknown validation mode in " + BeanValidationIntegrator.MODE_PROPERTY + ": " + modeProperty ); throw new HibernateException( "Unknown validation mode in " + BeanValidationIntegrator.MODE_PROPERTY + ": " + modeProperty );
Expand Down
Expand Up @@ -27,6 +27,7 @@
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Set; import java.util.Set;


import org.hibernate.Criteria; import org.hibernate.Criteria;
Expand Down Expand Up @@ -289,7 +290,7 @@ protected void addPropertyTypedValue(Object value, Type type, List<TypedValue> l
if ( value instanceof String ) { if ( value instanceof String ) {
String string = (String) value; String string = (String) value;
if ( isIgnoreCaseEnabled ) { if ( isIgnoreCaseEnabled ) {
string = string.toLowerCase(); string = string.toLowerCase(Locale.ROOT);
} }
if ( isLikeEnabled ) { if ( isLikeEnabled ) {
string = matchMode.toMatchString( string ); string = matchMode.toMatchString( string );
Expand Down

0 comments on commit 1361925

Please sign in to comment.