#10 Making sure error is raised in case property can't be reverse-mapped

This commit is contained in:
Gunnar Morling 2013-05-20 13:25:46 +02:00
parent 0c6c28f13c
commit 3036b2f2a7

View File

@ -236,13 +236,16 @@ public class MapperGenerationVisitor extends ElementKindVisitor6<Void, Void> {
} }
private void reportErrorIfPropertyCanNotBeMapped(Method method, Method reverseMethod, MappedProperty property, Method propertyMappingMethod, Method reversePropertyMappingMethod, Conversion conversion) { private void reportErrorIfPropertyCanNotBeMapped(Method method, Method reverseMethod, MappedProperty property, Method propertyMappingMethod, Method reversePropertyMappingMethod, Conversion conversion) {
if ( property.getSourceType().equals( property.getTargetType() ) || if ( property.getSourceType().equals( property.getTargetType() ) ) {
return;
}
//no mapping method nor conversion nor collection with default implementation
if ( !(
propertyMappingMethod != null || propertyMappingMethod != null ||
conversion != null || conversion != null ||
( property.getTargetType().isCollectionType() && property.getTargetType() ( property.getTargetType().isCollectionType() && property.getTargetType()
.getCollectionImplementationType() != null ) ) { .getCollectionImplementationType() != null ) ) ) {
return;
}
reportError( reportError(
String.format( String.format(
@ -254,16 +257,17 @@ public class MapperGenerationVisitor extends ElementKindVisitor6<Void, Void> {
), ),
method.getExecutable() method.getExecutable()
); );
}
mappingErroneous = true; if ( reverseMethod == null ) {
return;
}
if ( reverseMethod == null || if ( !(
reversePropertyMappingMethod != null || reversePropertyMappingMethod != null ||
conversion != null || conversion != null ||
( property.getSourceType().isCollectionType() && property.getSourceType() ( property.getSourceType().isCollectionType() && property.getSourceType()
.getCollectionImplementationType() == null ) ) { .getCollectionImplementationType() != null ) ) ) {
return;
}
reportError( reportError(
String.format( String.format(
@ -276,6 +280,7 @@ public class MapperGenerationVisitor extends ElementKindVisitor6<Void, Void> {
reverseMethod.getExecutable() reverseMethod.getExecutable()
); );
} }
}
private String getIterableConversionString(Conversions conversions, Type sourceElementType, Type targetElementType, boolean isToConversion) { private String getIterableConversionString(Conversions conversions, Type sourceElementType, Type targetElementType, boolean isToConversion) {
Conversion conversion = conversions.getConversion( sourceElementType, targetElementType ); Conversion conversion = conversions.getConversion( sourceElementType, targetElementType );