Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-13496 Review string appending styles

This commit is contained in:
Sanne Grinovero 2019-07-05 16:22:49 +01:00
parent 9196a4e01e
commit cdcd6bfe76
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/javassist/PersistentAttributesEnhancer.java
View File

@ -162,7 +162,7 @@ public class PersistentAttributesEnhancer extends EnhancerImpl {
try { try {
boolean declared = persistentField.getDeclaringClass().equals( managedCtClass ); boolean declared = persistentField.getDeclaringClass().equals( managedCtClass );
String declaredReadFragment = "this." + fieldName + ""; String declaredReadFragment = "this." + fieldName;
String superReadFragment = "super." + readerName + "()"; String superReadFragment = "super." + readerName + "()";
if ( !declared ) { if ( !declared ) {

6
hibernate-core/src/main/java/org/hibernate/cfg/CopyIdentifierComponentSecondPass.java
View File

@ -79,8 +79,8 @@ public class CopyIdentifierComponentSecondPass implements SecondPass {
AtomicInteger index = new AtomicInteger( 0 ); AtomicInteger index = new AtomicInteger( 0 );
if ( columnByReferencedName.isEmpty() ) { if ( columnByReferencedName.isEmpty() ) {
isExplicitReference = false; isExplicitReference = false;
for (Ejb3JoinColumn joinColumn : joinColumns) { for ( Ejb3JoinColumn joinColumn : joinColumns ) {
columnByReferencedName.put( "" + index.get(), joinColumn ); columnByReferencedName.put( String.valueOf( index.get() ), joinColumn );
index.getAndIncrement(); index.getAndIncrement();
} }
index.set( 0 ); index.set( 0 );
@ -184,7 +184,7 @@ public class CopyIdentifierComponentSecondPass implements SecondPass {
joinColumn = columnByReferencedName.get( logicalColumnName.toLowerCase(Locale.ROOT ) ); joinColumn = columnByReferencedName.get( logicalColumnName.toLowerCase(Locale.ROOT ) );
} }
else { else {
joinColumn = columnByReferencedName.get( "" + index.get() ); joinColumn = columnByReferencedName.get( String.valueOf( index.get() ) );
index.getAndIncrement(); index.getAndIncrement();
} }
if ( joinColumn == null && ! joinColumns[0].isNameDeferred() ) { if ( joinColumn == null && ! joinColumns[0].isNameDeferred() ) {