Merge remote-tracking branch 'upstream/master' into wip/6.0

Author: dreab8

documentation/src/test/java/org/hibernate/userguide/naming/AcmeCorpPhysicalNamingStrategy.java

@@ -6,14 +6,15 @@
  */
 package org.hibernate.userguide.naming;
 
-import java.util.LinkedList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.stream.Collectors;
 
 import org.hibernate.boot.model.naming.Identifier;
-import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 
 import org.apache.commons.lang3.StringUtils;
@@ -27,40 +28,35 @@
  * Additionally standards call for the replacement of certain words with abbreviations.
  *
  * @author Steve Ebersole
+ * @author Nathan Xu
  */
-public class AcmeCorpPhysicalNamingStrategy implements PhysicalNamingStrategy {
-	private static final Map<String,String> ABBREVIATIONS = buildAbbreviationMap();
+public class AcmeCorpPhysicalNamingStrategy extends PhysicalNamingStrategyStandardImpl {
+	private static final Map<String, String> ABBREVIATIONS;
 
-	@Override
-	public Identifier toPhysicalCatalogName(Identifier name, JdbcEnvironment jdbcEnvironment) {
-		// Acme naming standards do not apply to catalog names
-		return name;
-	}
-
-	@Override
-	public Identifier toPhysicalSchemaName(Identifier name, JdbcEnvironment jdbcEnvironment) {
-		// Acme naming standards do not apply to schema names
-		return name;
+	static {
+		ABBREVIATIONS = new TreeMap<>( String.CASE_INSENSITIVE_ORDER );
+		ABBREVIATIONS.put( "account", "acct" );
+		ABBREVIATIONS.put( "number", "num" );
 	}
 
 	@Override
 	public Identifier toPhysicalTableName(Identifier name, JdbcEnvironment jdbcEnvironment) {
 		final List<String> parts = splitAndReplace( name.getText() );
 		return jdbcEnvironment.getIdentifierHelper().toIdentifier(
-				join( parts ),
+				StringUtils.join( parts, '_' ),
 				name.isQuoted()
 		);
 	}
 
 	@Override
 	public Identifier toPhysicalSequenceName(Identifier name, JdbcEnvironment jdbcEnvironment) {
-		final LinkedList<String> parts = splitAndReplace( name.getText() );
+		final List<String> parts = splitAndReplace( name.getText() );
 		// Acme Corp says all sequences should end with _seq
-		if ( !"seq".equalsIgnoreCase( parts.getLast() ) ) {
+		if ( !"seq".equals( parts.get( parts.size() - 1 ) ) ) {
 			parts.add( "seq" );
 		}
 		return jdbcEnvironment.getIdentifierHelper().toIdentifier(
-				join( parts ),
+				StringUtils.join( parts, '_' ),
 				name.isQuoted()
 		);
 	}
@@ -69,50 +65,15 @@ public Identifier toPhysicalSequenceName(Identifier name, JdbcEnvironment jdbcEn
 	public Identifier toPhysicalColumnName(Identifier name, JdbcEnvironment jdbcEnvironment) {
 		final List<String> parts = splitAndReplace( name.getText() );
 		return jdbcEnvironment.getIdentifierHelper().toIdentifier(
-				join( parts ),
+				StringUtils.join( parts, '_' ),
 				name.isQuoted()
 		);
 	}
 
-	private static Map<String, String> buildAbbreviationMap() {
-		TreeMap<String,String> abbreviationMap = new TreeMap<> ( String.CASE_INSENSITIVE_ORDER );
-		abbreviationMap.put( "account", "acct" );
-		abbreviationMap.put( "number", "num" );
-		return abbreviationMap;
-	}
-
-	private LinkedList<String> splitAndReplace(String name) {
-		LinkedList<String> result = new LinkedList<>();
-		for ( String part : StringUtils.splitByCharacterTypeCamelCase( name ) ) {
-			if ( part == null || part.trim().isEmpty() ) {
-				// skip null and space
-				continue;
-			}
-			part = applyAbbreviationReplacement( part );
-			result.add( part.toLowerCase( Locale.ROOT ) );
-		}
-		return result;
-	}
-
-	private String applyAbbreviationReplacement(String word) {
-		if ( ABBREVIATIONS.containsKey( word ) ) {
-			return ABBREVIATIONS.get( word );
-		}
-
-		return word;
-	}
-
-	private String join(List<String> parts) {
-		boolean firstPass = true;
-		String separator = "";
-		StringBuilder joined = new StringBuilder();
-		for ( String part : parts ) {
-			joined.append( separator ).append( part );
-			if ( firstPass ) {
-				firstPass = false;
-				separator = "_";
-			}
-		}
-		return joined.toString();
+	private List<String> splitAndReplace(String name) {
+		return Arrays.stream( StringUtils.splitByCharacterTypeCamelCase( name ) )
+				.filter( StringUtils::isNotBlank )
+				.map( p -> ABBREVIATIONS.getOrDefault( p, p ).toLowerCase( Locale.ROOT ) )
+				.collect( Collectors.toList() );
 	}
 }

gradle/libraries.gradle

@@ -14,7 +14,7 @@ ext {
     junit5Version = '5.3.1'
 
     h2Version = '1.4.199'
-    bytemanVersion = '4.0.13' //Compatible with JDK14
+    bytemanVersion = '4.0.13' //Compatible with JDK16
     jnpVersion = '5.0.6.CR1'
 
     hibernateCommonsVersion = '5.1.0.Final'

hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java

@@ -224,7 +224,7 @@ public void execute() throws HibernateException {
 					session
 			);
 			if ( persister.hasUpdateGeneratedProperties() ) {
-				// this entity defines proeprty generation, so process those generated
+				// this entity defines property generation, so process those generated
 				// values...
 				persister.processUpdateGeneratedProperties( id, instance, state, session );
 				if ( persister.isVersionPropertyGenerated() ) {

hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java

@@ -116,7 +116,7 @@ public MetadataBuilderImpl(MetadataSources sources, StandardServiceRegistry serv
 		this.sources = sources;
 		this.options = new MetadataBuildingOptionsImpl( serviceRegistry );
 		this.bootstrapContext = new BootstrapContextImpl( serviceRegistry, options );
-		//this is needed only fro implementig deprecated method
+		//this is needed only for implementing deprecated method
 		options.setBootstrapContext( bootstrapContext );
 
 		for ( MetadataSourcesContributor contributor :

hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AutoApplicableConverterDescriptorStandardImpl.java

@@ -20,6 +20,7 @@
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.cfg.annotations.HCANNHelper;
+import org.hibernate.internal.util.type.PrimitiveWrapperHelper;
 
 import com.fasterxml.classmate.ResolvedType;
 import com.fasterxml.classmate.ResolvedTypeWithMembers;
@@ -147,7 +148,11 @@ private static Member toMember(XProperty xProperty) {
 	}
 
 	private boolean typesMatch(ResolvedType converterDefinedType, ResolvedType checkType) {
-		if ( !converterDefinedType.getErasedType().isAssignableFrom( checkType.getErasedType() ) ) {
+		Class<?> erasedCheckType = checkType.getErasedType();
+		if ( erasedCheckType.isPrimitive() ) {
+			erasedCheckType = PrimitiveWrapperHelper.getDescriptorByPrimitiveType( erasedCheckType ).getWrapperClass();
+		}
+		if ( !converterDefinedType.getErasedType().isAssignableFrom( erasedCheckType ) ) {
 			return false;
 		}
 
@@ -180,4 +185,5 @@ private boolean typesMatch(ResolvedType converterDefinedType, ResolvedType check
 
 		return true;
 	}
+
 }

hibernate-core/src/main/java/org/hibernate/boot/registry/BootstrapServiceRegistryBuilder.java

@@ -208,7 +208,7 @@ public BootstrapServiceRegistry build() {
 		final ClassLoaderService classLoaderService;
 		if ( providedClassLoaderService == null ) {
 			// Use a set.  As an example, in JPA, OsgiClassLoader may be in both
-			// the providedClassLoaders and the overridenClassLoader.
+			// the providedClassLoaders and the overriddenClassLoader.
 			final Set<ClassLoader> classLoaders = new HashSet<>();
 
 			if ( providedClassLoaders != null )  {

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementHelper.java

@@ -129,7 +129,7 @@ else if ( !session.isConnected() ) {
 		finally {
 			if ( isTempSession ) {
 				try {
-					// Commit the JDBC transaction is we started one.
+					// Commit the JDBC transaction if we started one.
 					if ( !isJta ) {
 						BytecodeLogger.LOGGER.debug( "Enhancement interception Helper#performWork committing transaction on temporary Session" );
 						session.getTransaction().commit();

hibernate-core/src/main/java/org/hibernate/cache/cfg/internal/DomainDataRegionConfigImpl.java

@@ -117,7 +117,7 @@ public Builder addEntityConfig(PersistentClass bootEntityDescriptor, AccessType
 		}
 
 
-		// todo (6.0) : `EntityPersister` and `CollectionPersister` references here should be replaces with `EntityHierarchy` and `PersistentCollectionDescriptor`
+		// todo (6.0) : `EntityPersister` and `CollectionPersister` references here should be replaced with `EntityHierarchy` and `PersistentCollectionDescriptor`
 		//
 		// todo : although ^^, couldn't this just be the boot-time model?  Is there a specific need for it to be the run-time model?
 		//		that would alleviate the difference between 5.3 and 6.0 from the SPI POV

hibernate-core/src/main/java/org/hibernate/cache/internal/NaturalIdCacheKey.java

@@ -86,7 +86,7 @@ private void initTransients() {
 					@Override
 					public String initialize() {
 						//Complex toString is needed as naturalIds for entities are not simply based on a single value like primary keys
-						//the only same way to differentiate the keys is to included the disassembled values in the string.
+						//the only same way to differentiate the keys is to include the disassembled values in the string.
 						final StringBuilder toStringBuilder = new StringBuilder().append( entityName ).append(
 								"##NaturalId[" );
 						for ( int i = 0; i < naturalIdValues.length; i++ ) {

hibernate-core/src/main/java/org/hibernate/cache/internal/RegionFactoryInitiator.java

@@ -83,8 +83,9 @@ protected RegionFactory resolveRegionFactory(Map configurationValues, ServiceReg
 		final Collection<Class<? extends RegionFactory>> implementors = selector.getRegisteredStrategyImplementors( RegionFactory.class );
 
 		if ( setting == null && implementors.size() != 1 ) {
-			// if either are explicitly defined as TRUE we need a RegionFactory
-			if ( useSecondLevelCache == TRUE || useQueryCache == TRUE ) {
+			// if either is explicitly defined as TRUE we need a RegionFactory
+			if ( ( useSecondLevelCache != null && useSecondLevelCache == TRUE )
+					|| ( useQueryCache != null && useQueryCache == TRUE ) ) {
 				throw new CacheException( "Caching was explicitly requested, but no RegionFactory was defined and there is not a single registered RegionFactory" );
 			}
 		}