HHH-19134 Fixing problem - find entity by ID when multiple properties are annotated by @id annotation

          Set compartor to null when type is null in org.hibernate.type.descriptor.java.AbstractJavaType contructor

Author: cigaly

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/AbstractJavaType.java

@@ -48,7 +48,7 @@ protected AbstractJavaType(Type type) {
 	protected AbstractJavaType(Type type, MutabilityPlan<T> mutabilityPlan) {
 		this.type = type;
 		this.mutabilityPlan = mutabilityPlan;
-		this.comparator = Comparable.class.isAssignableFrom( getJavaTypeClass() )
+		this.comparator = type != null && Comparable.class.isAssignableFrom( getJavaTypeClass() )
 				? (Comparator<T>) ComparableComparator.INSTANCE
 				: null;
 	}

tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockEntityPersister.java

@@ -102,6 +102,10 @@ public final Type getPropertyType(String propertyPath) {
 			result = getSubclassPropertyType(propertyPath);
 		}
 
+		if ("id".equals( propertyPath )) {
+			result = identifierType();
+		}
+
 		if (result!=null) {
 			propertyTypesByName.put(propertyPath, result);
 		}

tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/ProcessorSessionFactory.java

@@ -166,7 +166,7 @@ private static Element dereference(AccessType defaultAccessType, Element symbol,
 	private Type propertyType(Element member, String entityName, String path, AccessType defaultAccessType) {
 		final TypeMirror memberType = memberType(member);
 		if (isEmbeddedProperty(member)) {
-			return component.make(asElement(memberType), entityName, path, defaultAccessType, this);
+			return componentType( entityName, path, defaultAccessType, memberType );
 		}
 		else if (isToOneAssociation(member)) {
 			return new ManyToOneType(getTypeConfiguration(), getToOneTargetEntity(member));
@@ -186,6 +186,10 @@ else if (isEnumProperty(member)) {
 		}
 	}
 
+	private Component componentType(String entityName, String path, AccessType defaultAccessType, TypeMirror memberType) {
+		return component.make( asElement( memberType ), entityName, path, defaultAccessType, this );
+	}
+
 	@SuppressWarnings({"rawtypes", "unchecked"})
 	private static BasicType<?> enumType(Element member, TypeMirror memberType) {
 		final Class<Enum> enumClass = Enum.class; // because we can't load the real enum class!
@@ -414,6 +418,12 @@ public String identifierPropertyName() {
 
 		@Override
 		public Type identifierType() {
+			if (hasAnnotation( type, "IdClass" )) {
+				final TypeMirror annotationMember = (TypeMirror)getAnnotationMember( getAnnotation( type, "IdClass" ), "value" );
+				if (annotationMember != null) {
+					return factory.componentType( getEntityName(), EntityIdentifierMapping.ID_ROLE_NAME, defaultAccessType, annotationMember );
+				}
+			}
 			for (Element element : type.getEnclosedElements()) {
 				if ( hasAnnotation(element, "Id")|| hasAnnotation(element, "EmbeddedId") ) {
 					return factory.propertyType(element, getEntityName(), EntityIdentifierMapping.ID_ROLE_NAME, defaultAccessType);
@@ -490,7 +500,8 @@ String qualifyName(String jpaEntityName) {
 	boolean isAttributeDefined(String entityName, String fieldName) {
 		final TypeElement entityClass = findEntityClass(entityName);
 		return entityClass != null
-			&& findPropertyByPath(entityClass, fieldName, getDefaultAccessType(entityClass)) != null;
+			&& (findPropertyByPath(entityClass, fieldName, getDefaultAccessType(entityClass)) != null
+				|| "id".equals( fieldName ) && hasAnnotation( entityClass, "IdClass" ));
 	}
 
 	public TypeElement findEntityClass(String entityName) {