JpaPersistentPropertyImpl now considers super types association and target type.

The association target type detection in JpaPersistenPropertyImpl previously failed to honor the super class detected association target type as fallback. In fact, it didn't even override ….getAssociationTargetType() at all to expose the target type declared on JPA specific annotations.

This is now in place and tested by verifying the AbstractPersistentProperty support for jMolecules annotations still work in case no JPA specific customizations are applied.

Closes #2191

Author: odrotbohm

pom.xml

@@ -243,6 +243,14 @@
 			<version>${querydsl}</version>
 			<optional>true</optional>
 		</dependency>
+		
+		<!-- jMolecules -->
+		<dependency>
+			<groupId>org.jmolecules.integrations</groupId>
+			<artifactId>jmolecules-spring</artifactId>
+			<version>${jmolecules-integration}</version>
+			<scope>test</scope>
+		</dependency>
 
 		<!-- CDI -->
 		<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->

src/main/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImpl.java

@@ -101,7 +101,8 @@ public JpaPersistentPropertyImpl(JpaMetamodel metamodel, Property property,
 
 		Assert.notNull(metamodel, "Metamodel must not be null!");
 
-		this.isAssociation = Lazy.of(() -> ASSOCIATION_ANNOTATIONS.stream().anyMatch(this::isAnnotationPresent));
+		this.isAssociation = Lazy.of(() -> super.isAssociation() //
+				|| ASSOCIATION_ANNOTATIONS.stream().anyMatch(this::isAnnotationPresent));
 		this.usePropertyAccess = detectPropertyAccess();
 		this.associationTargetType = detectAssociationTargetType();
 		this.updateable = detectUpdatability();
@@ -117,7 +118,10 @@ public JpaPersistentPropertyImpl(JpaMetamodel metamodel, Property property,
 	 */
 	@Override
 	public Class<?> getActualType() {
-		return associationTargetType != null ? associationTargetType.getType() : super.getActualType();
+
+		return associationTargetType != null //
+				? associationTargetType.getType() //
+				: super.getActualType();
 	}
 
 	/* 
@@ -213,6 +217,18 @@ public boolean isEmbeddable() {
 		return isAnnotationPresent(Embedded.class) || hasActualTypeAnnotation(Embeddable.class);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mapping.model.AnnotationBasedPersistentProperty#getAssociationTargetType()
+	 */
+	@Override
+	public Class<?> getAssociationTargetType() {
+
+		return associationTargetType != null //
+				? associationTargetType.getType() //
+				: super.getAssociationTargetType();
+	}
+
 	/**
 	 * Looks up both Spring Data's and JPA's access type definition annotations on the property or type level to determine
 	 * the access type to be used. Will consider property-level annotations over type-level ones, favoring the Spring Data

src/test/java/org/springframework/data/jpa/mapping/JpaPersistentPropertyImplUnitTests.java

@@ -170,6 +170,16 @@ void simplePropertyIsNotConsideredAnAssociation() {
 		assertThat(property.isAssociation()).isFalse();
 	}
 
+	@Test
+	void detectsJMoleculesAssociation() {
+
+		JpaPersistentEntityImpl<?> entity = context.getRequiredPersistentEntity(JMoleculesSample.class);
+		JpaPersistentProperty property = entity.getRequiredPersistentProperty("association");
+
+		assertThat(property.isAssociation()).isTrue();
+		assertThat(property.getAssociationTargetType()).isEqualTo(JMoleculesAggregate.class);
+	}
+
 	private JpaPersistentProperty getProperty(Class<?> ownerType, String propertyName) {
 
 		JpaPersistentEntity<?> entity = context.getRequiredPersistentEntity(ownerType);
@@ -293,4 +303,12 @@ private static class WithReadOnly {
 		@Column(updatable = false) String name;
 		String updatable;
 	}
+
+	// jMolecules
+
+	private static class JMoleculesSample {
+		Association<JMoleculesAggregate, Identifier> association;
+	}
+
+	private static interface JMoleculesAggregate extends AggregateRoot<JMoleculesAggregate, Identifier> {}
 }