HHH-19589 If property is annotated with @convert do not check for (registered) user type

Author: cigaly

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

@@ -332,24 +332,25 @@ public void setType(
 		if ( converterDescriptor != null ) {
 			applyJpaConverter( value, converterDescriptor );
 		}
-
-		final Class<? extends UserType<?>> userTypeImpl =
-				kind.mappingAccess.customType( value, getSourceModelContext() );
-		if ( userTypeImpl != null ) {
-			applyExplicitType( userTypeImpl,
-					kind.mappingAccess.customTypeParameters( value, getSourceModelContext() ) );
-			// An explicit custom UserType has top precedence when we get to BasicValue resolution.
-			return;
-		}
-		else if ( modelClassDetails != null ) {
-			final ClassDetails rawClassDetails = modelClassDetails.determineRawClass();
-			final Class<?> basicClass = rawClassDetails.toJavaClass();
-			final Class<? extends UserType<?>> registeredUserTypeImpl =
-					getMetadataCollector().findRegisteredUserType( basicClass );
-			if ( registeredUserTypeImpl != null ) {
-				applyExplicitType( registeredUserTypeImpl, emptyMap() );
+		else {
+			final Class<? extends UserType<?>> userTypeImpl =
+					kind.mappingAccess.customType( value, getSourceModelContext() );
+			if ( userTypeImpl != null ) {
+				applyExplicitType( userTypeImpl,
+						kind.mappingAccess.customTypeParameters( value, getSourceModelContext() ) );
+				// An explicit custom UserType has top precedence when we get to BasicValue resolution.
 				return;
 			}
+			else if ( modelClassDetails != null ) {
+				final ClassDetails rawClassDetails = modelClassDetails.determineRawClass();
+				final Class<?> basicClass = rawClassDetails.toJavaClass();
+				final Class<? extends UserType<?>> registeredUserTypeImpl =
+						getMetadataCollector().findRegisteredUserType( basicClass );
+				if ( registeredUserTypeImpl != null ) {
+					applyExplicitType( registeredUserTypeImpl, emptyMap() );
+					return;
+				}
+			}
 		}
 
 		switch ( kind ) {