HHH-6100 unqualify entity name and minor improvement

Author: stliu

hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java

@@ -339,7 +339,7 @@ private static void bindRootPersistentClassCommonValues(Element node,
 catalog,
 getClassTableName( entity, node, schema, catalog, null, mappings ),
 getSubselect( node ),
- entity.isAbstract() != null && entity.isAbstract().booleanValue()
+ entity.isAbstract() != null && entity.isAbstract()
 );
 entity.setTable( table );
 bindComment(table, node);
@@ -571,7 +571,7 @@ public static void bindClass(Element node, PersistentClass persistentClass, Mapp
 throw new MappingException( "Unable to determine entity name" );
 }
 persistentClass.setEntityName( entityName );
-persistentClass.setJpaEntityName( entityName );
+persistentClass.setJpaEntityName( StringHelper.unqualify( entityName ) );
 
 bindPojoRepresentation( node, persistentClass, mappings, inheritedMetas );
 bindDom4jRepresentation( node, persistentClass, mappings, inheritedMetas );
@@ -840,7 +840,7 @@ public static void bindUnionSubclass(Element node, UnionSubclass unionSubclass,
 schema,
 catalog,
 getClassTableName(unionSubclass, node, schema, catalog, denormalizedSuperTable, mappings ),
- unionSubclass.isAbstract() != null && unionSubclass.isAbstract().booleanValue(),
+ unionSubclass.isAbstract() != null && unionSubclass.isAbstract(),
 getSubselect( node ),
 denormalizedSuperTable
 );

hibernate-core/src/main/java/org/hibernate/internal/util/StringHelper.java

@@ -224,7 +224,7 @@ public static String[] split(String seperators, String list, boolean include) {
 
 public static String unqualify(String qualifiedName) {
 int loc = qualifiedName.lastIndexOf(".");
-return ( loc < 0 ) ? qualifiedName : qualifiedName.substring( qualifiedName.lastIndexOf(".") + 1 );
+return ( loc < 0 ) ? qualifiedName : qualifiedName.substring( loc + 1 );
 }
 
 public static String qualifier(String qualifiedName) {
@@ -600,12 +600,7 @@ else if ( name.startsWith( "\"" ) && name.endsWith( "\"" ) ) {
  * @return The unquoted version.
  */
 public static String unquote(String name) {
-if ( isQuoted( name ) ) {
-return name.substring( 1, name.length() - 1 );
-}
-else {
-return name;
-}
+return isQuoted( name ) ? name.substring( 1, name.length() - 1 ) : name;
 }
 
 /**
@@ -622,9 +617,18 @@ public static String unquote(String name) {
  * @return True if quoted, false otherwise
  */
 public static boolean isQuoted(String name, Dialect dialect) {
-return name != null && name.length() != 0
-&& ( name.charAt( 0 ) == '`' && name.charAt( name.length() - 1 ) == '`'
-|| name.charAt( 0 ) == dialect.openQuote() && name.charAt( name.length() - 1 ) == dialect.closeQuote() );
+return name != null
+&&
+name.length() != 0
+&& (
+name.charAt( 0 ) == '`'
+&&
+name.charAt( name.length() - 1 ) == '`'
+||
+name.charAt( 0 ) == dialect.openQuote()
+&&
+name.charAt( name.length() - 1 ) == dialect.closeQuote()
+);
 }
 
 /**
@@ -636,12 +640,7 @@ public static boolean isQuoted(String name, Dialect dialect) {
  * @return The unquoted version.
  */
 public static String unquote(String name, Dialect dialect) {
-if ( isQuoted( name, dialect ) ) {
-return name.substring( 1, name.length() - 1 );
-}
-else {
-return name;
-}
+return isQuoted( name, dialect ) ? name.substring( 1, name.length() - 1 ) : name;
 }
 
 /**

hibernate-core/src/main/java/org/hibernate/sql/Alias.java

@@ -85,12 +85,7 @@ private String getUnquotedAliasString(String sqlIdentifier, int quoteType) {
 //truncate the identifier to the max alias length, less the suffix length
 unquoted = unquoted.substring(0, length);
 }
-if ( suffix == null ) {
-return unquoted;
-}
-else {
-return unquoted + suffix;
-}
+return ( suffix == null ) ? unquoted : unquoted + suffix;
 }
 
 public String[] toUnquotedAliasStrings(String[] sqlIdentifiers) {