Skip to content

Commit 8db83f5

Browse files
10urshinbrmeyer
10urshin
authored and
brmeyer
committed
HHH-9722
Changed all toLowerCase() and toUpperCase() to toLowerCase(Locale.ROOT), toUpperCase(Locale.ROOT). Conflicts: hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/XmlElementMetadata.java hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/AttributeTypeDescriptor.java hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java hibernate-core/src/main/java/org/hibernate/dialect/Oracle8iDialect.java hibernate-core/src/main/java/org/hibernate/dialect/Oracle9iDialect.java hibernate-core/src/main/java/org/hibernate/dialect/pagination/FirstLimitHandler.java hibernate-core/src/main/java/org/hibernate/dialect/pagination/TopLimitHandler.java hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/ExtractedDatabaseMetaDataImpl.java hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentImpl.java hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/NormalizingIdentifierHelperImpl.java hibernate-core/src/main/java/org/hibernate/tool/schema/internal/SchemaValidatorImpl.java hibernate-core/src/test/java/org/hibernate/dialect/SQLServer2005DialectTestCase.java hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/internal/IlikeAuditExpression.java
1 parent 9bd04e7 commit 8db83f5

File tree

70 files changed

+215
-141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+215
-141
lines changed

‎hibernate-core/src/main/java/org/hibernate/CacheMode.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
*/
2424
package org.hibernate;
2525

26+
import java.util.Locale;
27+
2628
/**
2729
* Controls how the session interacts with the second-level cache and query cache.
2830
*
@@ -100,7 +102,7 @@ public static CacheMode interpretExternalSetting(String setting) {
100102
}
101103

102104
try {
103-
return CacheMode.valueOf( setting.toUpperCase() );
105+
return CacheMode.valueOf( setting.toUpperCase(Locale.ROOT) );
104106
}
105107
catch ( IllegalArgumentException e ) {
106108
throw new MappingException( "Unknown Cache Mode: " + setting );

‎hibernate-core/src/main/java/org/hibernate/ConnectionReleaseMode.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
*/
2424
package org.hibernate;
2525

26+
import java.util.Locale;
27+
2628
/**
2729
* Defines the various policies by which Hibernate might release its underlying
2830
* JDBC connection.
@@ -61,6 +63,6 @@ public enum ConnectionReleaseMode{
6163
* @return The matched enum value.
6264
*/
6365
public static ConnectionReleaseMode parse(final String name) {
64-
return ConnectionReleaseMode.valueOf( name.toUpperCase() );
66+
return ConnectionReleaseMode.valueOf( name.toUpperCase(Locale.ROOT) );
6567
}
6668
}

‎hibernate-core/src/main/java/org/hibernate/FlushMode.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
*/
2424
package org.hibernate;
2525

26+
import java.util.Locale;
27+
2628
/**
2729
* Represents a flushing strategy. The flush process synchronizes
2830
* database state with session state by detecting state changes
@@ -119,7 +121,7 @@ public static FlushMode interpretExternalSetting(String externalName) {
119121
}
120122

121123
try {
122-
return FlushMode.valueOf( externalName.toUpperCase() );
124+
return FlushMode.valueOf( externalName.toUpperCase(Locale.ROOT) );
123125
}
124126
catch ( IllegalArgumentException e ) {
125127
throw new MappingException( "unknown FlushMode : " + externalName );

‎hibernate-core/src/main/java/org/hibernate/MultiTenancyStrategy.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
*/
2424
package org.hibernate;
2525

26+
import java.util.Locale;
2627
import java.util.Map;
2728

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

8990
final String strategyName = strategy.toString();
9091
try {
91-
return MultiTenancyStrategy.valueOf( strategyName.toUpperCase() );
92+
return MultiTenancyStrategy.valueOf( strategyName.toUpperCase(Locale.ROOT) );
9293
}
9394
catch ( RuntimeException e ) {
9495
LOG.warn( "Unknown multi tenancy strategy [ " +strategyName +" ], using MultiTenancyStrategy.NONE." );

‎hibernate-core/src/main/java/org/hibernate/cfg/CopyIdentifierComponentSecondPass.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import java.util.HashMap;
2727
import java.util.Iterator;
28+
import java.util.Locale;
2829
import java.util.Map;
2930

3031
import org.hibernate.AnnotationException;
@@ -87,7 +88,7 @@ public void doSecondPass(Map persistentClasses) throws MappingException {
8788
break;
8889
}
8990
//JPA 2 requires referencedColumnNames to be case insensitive
90-
columnByReferencedName.put( referencedColumnName.toLowerCase(), joinColumn );
91+
columnByReferencedName.put( referencedColumnName.toLowerCase(Locale.ROOT), joinColumn );
9192
}
9293
//try default column orientation
9394
int index = 0;
@@ -142,7 +143,7 @@ public void doSecondPass(Map persistentClasses) throws MappingException {
142143
final String columnName = column.getName();
143144
logicalColumnName = mappings.getLogicalColumnName( columnName, referencedPersistentClass.getTable() );
144145
//JPA 2 requires referencedColumnNames to be case insensitive
145-
joinColumn = columnByReferencedName.get( logicalColumnName.toLowerCase() );
146+
joinColumn = columnByReferencedName.get( logicalColumnName.toLowerCase(Locale.ROOT ) );
146147
}
147148
else {
148149
joinColumn = columnByReferencedName.get( "" + index );

‎hibernate-core/src/main/java/org/hibernate/cfg/DefaultComponentSafeNamingStrategy.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* Boston, MA 02110-1301 USA
2323
*/
2424
package org.hibernate.cfg;
25+
import java.util.Locale;
2526
import org.hibernate.AssertionFailure;
2627
import org.hibernate.internal.util.StringHelper;
2728

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

3435
protected static String addUnderscores(String name) {
35-
return name.replace( '.', '_' ).toLowerCase();
36+
return name.replace( '.', '_' ).toLowerCase(Locale.ROOT);
3637
}
3738

3839
@Override

‎hibernate-core/src/main/java/org/hibernate/cfg/ImprovedNamingStrategy.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
package org.hibernate.cfg;
2525

2626
import java.io.Serializable;
27+
import java.util.Locale;
2728

2829
import org.hibernate.AssertionFailure;
2930
import org.hibernate.internal.util.StringHelper;
@@ -79,7 +80,7 @@ protected static String addUnderscores(String name) {
7980
buf.insert(i++, '_');
8081
}
8182
}
82-
return buf.toString().toLowerCase();
83+
return buf.toString().toLowerCase(Locale.ROOT);
8384
}
8485

8586
public String collectionTableName(

‎hibernate-core/src/main/java/org/hibernate/cfg/JPAIndexHolder.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import java.util.ArrayList;
2727
import java.util.List;
28+
import java.util.Locale;
2829
import java.util.StringTokenizer;
2930
import javax.persistence.Index;
3031

@@ -70,7 +71,7 @@ public boolean isUnique() {
7071
private void initializeColumns(String[] columns, String[] ordering, List<String> list) {
7172
for ( int i = 0, size = list.size(); i < size; i++ ) {
7273
final String description = list.get( i );
73-
final String tmp = description.toLowerCase();
74+
final String tmp = description.toLowerCase(Locale.ROOT);
7475
if ( tmp.endsWith( " desc" ) ) {
7576
columns[i] = description.substring( 0, description.length() - 5 );
7677
ordering[i] = "desc";

‎hibernate-core/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
* Boston, MA 02110-1301 USA
2323
*/
2424
package org.hibernate.cfg;
25+
import java.util.Locale;
2526
import java.util.Map;
2627

2728
import org.hibernate.MappingException;
@@ -60,7 +61,7 @@ public void doSecondPass(Map persistentClasses) throws MappingException {
6061
clazz.getProperty( fetch.association() );
6162

6263
profile.addFetch(
63-
fetch.entity().getName(), fetch.association(), fetch.mode().toString().toLowerCase()
64+
fetch.entity().getName(), fetch.association(), fetch.mode().toString().toLowerCase(Locale.ROOT)
6465
);
6566
}
6667
}

‎hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.Comparator;
2727
import java.util.HashMap;
2828
import java.util.Iterator;
29+
import java.util.Locale;
2930
import java.util.Map;
3031
import java.util.Properties;
3132
import javax.persistence.AttributeOverride;
@@ -461,23 +462,23 @@ public void bind() {
461462
Loader loader = property.getAnnotation( Loader.class );
462463
if ( sqlInsert != null ) {
463464
collection.setCustomSQLInsert( sqlInsert.sql().trim(), sqlInsert.callable(),
464-
ExecuteUpdateResultCheckStyle.fromExternalName( sqlInsert.check().toString().toLowerCase() )
465+
ExecuteUpdateResultCheckStyle.fromExternalName( sqlInsert.check().toString().toLowerCase(Locale.ROOT) )
465466
);
466467

467468
}
468469
if ( sqlUpdate != null ) {
469470
collection.setCustomSQLUpdate( sqlUpdate.sql(), sqlUpdate.callable(),
470-
ExecuteUpdateResultCheckStyle.fromExternalName( sqlUpdate.check().toString().toLowerCase() )
471+
ExecuteUpdateResultCheckStyle.fromExternalName( sqlUpdate.check().toString().toLowerCase(Locale.ROOT) )
471472
);
472473
}
473474
if ( sqlDelete != null ) {
474475
collection.setCustomSQLDelete( sqlDelete.sql(), sqlDelete.callable(),
475-
ExecuteUpdateResultCheckStyle.fromExternalName( sqlDelete.check().toString().toLowerCase() )
476+
ExecuteUpdateResultCheckStyle.fromExternalName( sqlDelete.check().toString().toLowerCase(Locale.ROOT) )
476477
);
477478
}
478479
if ( sqlDeleteAll != null ) {
479480
collection.setCustomSQLDeleteAll( sqlDeleteAll.sql(), sqlDeleteAll.callable(),
480-
ExecuteUpdateResultCheckStyle.fromExternalName( sqlDeleteAll.check().toString().toLowerCase() )
481+
ExecuteUpdateResultCheckStyle.fromExternalName( sqlDeleteAll.check().toString().toLowerCase(Locale.ROOT) )
481482
);
482483
}
483484
if ( loader != null ) {

0 commit comments

Comments
 (0)