third_codes/mapstruct
1
0
Fork 0
mirror of https://github.com/mapstruct/mapstruct.git synced 2025-07-12 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#330 Making target() mandatory

Browse Source
This commit is contained in:
Gunnar Morling 2014-10-25 12:10:53 +02:00
parent 912ba714c1
commit 27bc599bca
18 changed files with 136 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
core-jdk8/src/main/java/org/mapstruct/Mapping.java
View File

@ -29,36 +29,41 @@ import java.util.Date;
/**
* Configures the mapping of one bean attribute or enum constant.
* <p>
* The name of the mapped attribute or constant is to be specified via {@link #target()}. For mapped bean attributes it
* is assumed by default that the attribute has the same name in the source bean. Alternatively, one of
* {@link #source()}, {@link #expression()} or {@link #constant()} can be specified to define the property source.
* <p>
* In addition, the attributes {@link #dateFormat()} and {@link #qualifiedBy()} may be used to further define the
* mapping.
*
* @author Gunnar Morling
*/
@Retention( RetentionPolicy.SOURCE )
@Target( ElementType.METHOD )
@Repeatable( Mappings.class )
@Repeatable(Mappings.class)
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.METHOD)
public @interface Mapping {
/**
* The source to use for this Mapping. This can either be:
* The target name of the configured property as defined by the JavaBeans specification. If used to map an enum
* constant, the name of the constant member is to be given.
*
* @return The target name of the configured property or enum constant
*/
String target();
/**
* The source to use for this mapping. This can either be:
* <ol>
* <li>The source name of the configured property as defined by the JavaBeans specification.</li>
* <li>When used to map an enum constant, the name of the constant member is to be given.</li>
* </ol>
* Either this attribute or {@link #constant()} or {@link #expression()} may be specified for a given mapping, but
* not two at the same time. If this attribute is given, the target property must be specified via
* {@link #target()}.
* Either this attribute or {@link #constant()} or {@link #expression()} may be specified for a given mapping.
*
* @return The source name of the configured property or enum constant.
*/
String source() default "";
/**
* The target name of the configured property as defined by the JavaBeans specification. Defaults to the source name
* if not given. If used to map an enum constant, the name of the constant member is to be given.
*
* @return The target name of the configured property or enum constant
*/
String target() default "";
/**
* A format string as processable by {@link SimpleDateFormat} if the attribute is mapped from {@code String} to
* {@link Date} or vice-versa. Will be ignored for all other attribute types and when mapping enum constants.
@ -72,32 +77,29 @@ public @interface Mapping {
* property is not of type {@code String}, the value will be converted by applying a matching conversion method or
* built-in conversion.
* <p>
* Either this attribute or {@link #source()} or {@link #expression()} may be specified for a given mapping, but not
* two at the same time. If this attribute is given, the target property must be specified via {@link #target()}.
* Either this attribute or {@link #source()} or {@link #expression()} may be specified for a given mapping.
*
* @return A constant {@code String} constant specifying the value for the designated target property
*/
String constant() default "";
/**
* An expression {@link String} based on which the specified target property is to be set.
*
* The format is determined by a type of expression. For instance:
* An expression {@link String} based on which the specified target property is to be set. The format is determined
* by a type of expression. For instance:
* {@code expression = "java(new org.example.TimeAndFormat( s.getTime(), s.getFormat() ))")} will insert the java
* expression in the designated {@link #target()} property.
* <p>
* Either this attribute or {@link #source()} or {@link #constant()} may be specified for a given mapping, but not
* two at the same time. If this attribute is given, the target property must be specified via {@link #target()}.
* Either this attribute or {@link #source()} or {@link #constant()} may be specified for a given mapping.
*
* @return A constant {@code String} constant specifying the value for the designated target property
*/
String expression() default "";
/**
* Whether the property specified via {@link #source()} or {@link #target()} should be ignored by the generated
* mapping method or not. This can be useful when certain attributes should not be propagated from source or target
* or when properties in the target object are populated using a decorator and thus would be reported as unmapped
* target property by default.
* Whether the property specified via {@link #target()} should be ignored by the generated mapping method or not.
* This can be useful when certain attributes should not be propagated from source or target or when properties in
* the target object are populated using a decorator and thus would be reported as unmapped target property by
* default.
*
* @return {@code true} if the given property should be ignored, {@code false} otherwise
*/
@ -105,9 +107,8 @@ public @interface Mapping {
/**
* A qualifier can be specified to aid the selection process of a suitable mapper. This is useful in case multiple
* mappers (hand written of internal) qualify and result in an 'Ambiguous mapping methods found' error.
*
* A qualifier is a custom annotation and can be placed on either a hand written mapper class or a method.
* mapping methods (hand written or generated) qualify and thus would result in an 'Ambiguous mapping methods found'
* error. A qualifier is a custom annotation and can be placed on a hand written mapper class or a method.
*
* @return the qualifiers
*/

61
core/src/main/java/org/mapstruct/Mapping.java
View File

@ -28,6 +28,13 @@ import java.util.Date;
/**
* Configures the mapping of one bean attribute or enum constant.
* <p>
* The name of the mapped attribute or constant is to be specified via {@link #target()}. For mapped bean attributes it
* is assumed by default that the attribute has the same name in the source bean. Alternatively, one of
* {@link #source()}, {@link #expression()} or {@link #constant()} can be specified to define the property source.
* <p>
* In addition, the attributes {@link #dateFormat()} and {@link #qualifiedBy()} may be used to further define the
* mapping.
*
* @author Gunnar Morling
*/
@ -36,27 +43,25 @@ import java.util.Date;
public @interface Mapping {
/**
* The source to use for this Mapping. This can either be:
* The target name of the configured property as defined by the JavaBeans specification. If used to map an enum
* constant, the name of the constant member is to be given.
*
* @return The target name of the configured property or enum constant
*/
String target();
/**
* The source to use for this mapping. This can either be:
* <ol>
* <li>The source name of the configured property as defined by the JavaBeans specification.</li>
* <li>When used to map an enum constant, the name of the constant member is to be given.</li>
* </ol>
* Either this attribute or {@link #constant()} or {@link #expression()} may be specified for a given mapping,
* but not two at the same time. If this attribute is given, the target property must be specified via
* {@link #target()}.
* Either this attribute or {@link #constant()} or {@link #expression()} may be specified for a given mapping.
*
* @return The source name of the configured property or enum constant.
*/
String source() default "";
/**
* The target name of the configured property as defined by the JavaBeans specification. Defaults to the source name
* if not given. If used to map an enum constant, the name of the constant member is to be given.
*
* @return The target name of the configured property or enum constant
*/
String target() default "";
/**
* A format string as processable by {@link SimpleDateFormat} if the attribute is mapped from {@code String} to
* {@link Date} or vice-versa. Will be ignored for all other attribute types and when mapping enum constants.
@ -66,38 +71,33 @@ public @interface Mapping {
String dateFormat() default "";
/**
* A constant {@link String} based on which the specified target property is to be set. If the designated
* target property is not of type {@code String}, the value will be converted by applying a matching conversion
* method or built-in conversion.
* A constant {@link String} based on which the specified target property is to be set. If the designated target
* property is not of type {@code String}, the value will be converted by applying a matching conversion method or
* built-in conversion.
* <p>
* Either this attribute or {@link #source()} or {@link #expression()} may be specified for a given mapping,
* but not two at the same time. If this attribute is given, the target property must be specified via
* {@link #target()}.
* Either this attribute or {@link #source()} or {@link #expression()} may be specified for a given mapping.
*
* @return A constant {@code String} constant specifying the value for the designated target property
*/
String constant() default "";
/**
* An expression {@link String} based on which the specified target property is to be set.
*
* The format is determined by a type of expression. For instance:
* An expression {@link String} based on which the specified target property is to be set. The format is determined
* by a type of expression. For instance:
* {@code expression = "java(new org.example.TimeAndFormat( s.getTime(), s.getFormat() ))")} will insert the java
* expression in the designated {@link #target()} property.
* <p>
* Either this attribute or {@link #source()} or {@link #constant()} may be specified for a given mapping,
* but not two at the same time. If this attribute is given, the target property must be specified via
* {@link #target()}.
* Either this attribute or {@link #source()} or {@link #constant()} may be specified for a given mapping.
*
* @return A constant {@code String} constant specifying the value for the designated target property
*/
String expression() default "";
/**
* Whether the property specified via {@link #source()} or {@link #target()} should be ignored by the generated
* mapping method or not. This can be useful when certain attributes should not be propagated from source or target
* or when properties in the target object are populated using a decorator and thus would be reported as unmapped
* target property by default.
* Whether the property specified via {@link #target()} should be ignored by the generated mapping method or not.
* This can be useful when certain attributes should not be propagated from source or target or when properties in
* the target object are populated using a decorator and thus would be reported as unmapped target property by
* default.
*
* @return {@code true} if the given property should be ignored, {@code false} otherwise
*/
@ -105,9 +105,8 @@ public @interface Mapping {
/**
* A qualifier can be specified to aid the selection process of a suitable mapper. This is useful in case multiple
* mappers (hand written of internal) qualify and result in an 'Ambiguous mapping methods found' error.
*
* A qualifier is a custom annotation and can be placed on either a hand written mapper class or a method.
* mapping methods (hand written or generated) qualify and thus would result in an 'Ambiguous mapping methods found'
* error. A qualifier is a custom annotation and can be placed on a hand written mapper class or a method.
*
* @return the qualifiers
*/

3
processor/src/main/java/org/mapstruct/ap/model/BeanMappingMethod.java
View File

@ -305,8 +305,7 @@ public class BeanMappingMethod extends MappingMethod {
}
}
else if ( mappedProperty.getConstant().isEmpty()
&& mappedProperty.getJavaExpression().isEmpty()
else if ( mappedProperty.getSourcePropertyName() != null
&& !hasSourceProperty( mappedProperty.getSourcePropertyName() ) ) {
ctx.getMessager().printMessage(
Diagnostic.Kind.ERROR,

16
processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java
View File

@ -111,7 +111,8 @@ public class PropertyMapping extends ModelElement {
if ( mapping != null ) {
dateFormat = mapping.getDateFormat();
qualifiers = mapping.getQualifiers();
sourcePropertyName = mapping.getSourcePropertyName();
sourcePropertyName =
mapping.getSourcePropertyName() == null ? targetPropertyName : mapping.getSourcePropertyName();
}
else {
sourcePropertyName = targetPropertyName;
@ -121,18 +122,7 @@ public class PropertyMapping extends ModelElement {
// then iterate over source accessors (assuming the source is a bean)
for ( ExecutableElement sourceAccessor : sourceGetters ) {
List<Mapping> sourceMappings = method.getMappings().get( sourcePropertyName );
if ( method.getMappings().containsKey( sourcePropertyName ) ) {
for ( Mapping sourceMapping : sourceMappings ) {
boolean mapsToOtherTarget = !sourceMapping.getTargetName().equals( targetPropertyName );
if ( Executables.getPropertyName( sourceAccessor ).equals( sourcePropertyName )
&& !mapsToOtherTarget ) {
return getPropertyMapping( sourceAccessor, dateFormat, qualifiers );
}
}
}
else if ( Executables.getPropertyName( sourceAccessor ).equals( sourcePropertyName ) ) {
if ( Executables.getPropertyName( sourceAccessor ).equals( sourcePropertyName ) ) {
return getPropertyMapping( sourceAccessor, dateFormat, qualifiers );
}
}

34
processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java
View File

@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.annotation.processing.Messager;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.AnnotationValue;
@ -53,7 +52,7 @@ public class Mapping {
private final String javaExpression;
private final String targetName;
private final String dateFormat;
private final List<TypeMirror> qualifiers;
private final List<TypeMirror> qualifiers;
private final boolean isIgnored;
private final AnnotationMirror mirror;
private final AnnotationValue sourceAnnotationValue;
@ -85,18 +84,7 @@ public class Mapping {
mappingPrism.values.source()
);
if ( mappingPrism.source().isEmpty() &&
mappingPrism.constant().isEmpty() &&
mappingPrism.expression().isEmpty() &&
!mappingPrism.ignore() ) {
messager.printMessage(
Diagnostic.Kind.ERROR,
"Either define a source, a constant or an expression in a Mapping",
element
);
return null;
}
else if ( !mappingPrism.source().isEmpty() && !mappingPrism.constant().isEmpty() ) {
if ( !mappingPrism.source().isEmpty() && !mappingPrism.constant().isEmpty() ) {
messager.printMessage(
Diagnostic.Kind.ERROR,
"Source and constant are both defined in Mapping, either define a source or a constant",
@ -120,10 +108,12 @@ public class Mapping {
);
return null;
}
String source = mappingPrism.source().isEmpty() ? null : mappingPrism.source();
return new Mapping(
mappingPrism.source(),
source,
sourceNameParts != null ? sourceNameParts[0] : null,
sourceNameParts != null ? sourceNameParts[1] : mappingPrism.source(),
sourceNameParts != null ? sourceNameParts[1] : source,
mappingPrism.constant(),
mappingPrism.expression(),
mappingPrism.target(),
@ -156,8 +146,8 @@ public class Mapping {
}
//CHECKSTYLE:OFF
private Mapping( String sourceName, String sourceParameterName, String sourcePropertyName, String constant,
String expression, String targetName, String dateFormat, List<TypeMirror> qualifiers,
private Mapping(String sourceName, String sourceParameterName, String sourcePropertyName, String constant,
String expression, String targetName, String dateFormat, List<TypeMirror> qualifiers,
boolean isIgnored, AnnotationMirror mirror, AnnotationValue sourceAnnotationValue,
AnnotationValue targetAnnotationValue) {
this.sourceName = sourceName;
@ -167,7 +157,7 @@ public class Mapping {
this.expression = expression;
Matcher javaExpressionMatcher = JAVA_EXPRESSION.matcher( expression );
this.javaExpression = javaExpressionMatcher.matches() ? javaExpressionMatcher.group( 1 ).trim() : "";
this.targetName = targetName.equals( "" ) ? sourceName : targetName;
this.targetName = targetName;
this.dateFormat = dateFormat;
this.qualifiers = qualifiers;
this.isIgnored = isIgnored;
@ -246,12 +236,12 @@ public class Mapping {
// mapping can only be reversed if the source was not a constant nor an expression
if ( constant.isEmpty() && expression.isEmpty() ) {
reverse = new Mapping(
targetName,
sourceName != null ? targetName : null,
null,
targetName,
sourceName != null ? targetName : null,
constant,
expression,
sourceName,
sourceName != null ? sourceName : targetName,
dateFormat,
qualifiers,
isIgnored,

2
processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/CalendarToStringMapper.java
View File

@ -29,6 +29,6 @@ public interface CalendarToStringMapper {
CalendarToStringMapper INSTANCE = Mappers.getMapper( CalendarToStringMapper.class );
@Mapping( source = "prop", dateFormat = "dd.MM.yyyy" )
@Mapping( target = "prop", dateFormat = "dd.MM.yyyy" )
StringProperty map( CalendarProperty source );
}

2
processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/StringToCalendarMapper.java
View File

@ -29,6 +29,6 @@ public interface StringToCalendarMapper {
StringToCalendarMapper INSTANCE = Mappers.getMapper( StringToCalendarMapper.class );
@Mapping( source = "prop", dateFormat = "dd.MM.yyyy" )
@Mapping( target = "prop", dateFormat = "dd.MM.yyyy" )
CalendarProperty map( StringProperty source);
}

2
processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/StringToXmlGregCalMapper.java
View File

@ -31,7 +31,7 @@ public interface StringToXmlGregCalMapper {
XmlGregorianCalendarProperty map(StringProperty source);
@Mapping(source = "prop", dateFormat = "dd.MM.yyyy")
@Mapping(target = "prop", dateFormat = "dd.MM.yyyy")
XmlGregorianCalendarProperty mapAndFormat(StringProperty source);
}

2
processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/XmlGregCalToStringMapper.java
View File

@ -31,7 +31,7 @@ public interface XmlGregCalToStringMapper {
StringProperty map(XmlGregorianCalendarProperty source);
@Mapping(source = "prop", dateFormat = "dd.MM.yyyy")
@Mapping(target = "prop", dateFormat = "dd.MM.yyyy")
StringProperty mapAndFormat(XmlGregorianCalendarProperty source);
}

6
processor/src/test/java/org/mapstruct/ap/test/conversion/date/SourceTargetMapper.java
View File

@ -21,10 +21,10 @@ package org.mapstruct.ap.test.conversion.date;
import java.util.Date;
import java.util.List;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.IterableMapping;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.factory.Mappers;
@Mapper
@ -32,13 +32,15 @@ public interface SourceTargetMapper {
SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class );
@Mapping(source = "date", dateFormat = "dd.MM.yyyy")
@Mapping(target = "date", dateFormat = "dd.MM.yyyy")
Target sourceToTarget(Source source);
@InheritInverseConfiguration
Source targetToSource(Target target);
@IterableMapping(dateFormat = "dd.MM.yyyy")
List<String> stringListToDateList(List<Date> dates);
@InheritInverseConfiguration
List<Date> dateListToStringList(List<String> strings);
}

40
processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/SourceTargetMapper.java
View File

@ -39,46 +39,46 @@ public interface SourceTargetMapper {
String LOCAL_TIME_FORMAT = "HH:mm";
SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class );
@Mappings( { @Mapping( source = "zonedDateTime", dateFormat = DATE_TIME_FORMAT ),
@Mapping( source = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT ),
@Mapping( source = "localDate", dateFormat = LOCAL_DATE_FORMAT ),
@Mapping( source = "localTime", dateFormat = LOCAL_TIME_FORMAT ) } )
@Mappings( { @Mapping( target = "zonedDateTime", dateFormat = DATE_TIME_FORMAT ),
@Mapping( target = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT ),
@Mapping( target = "localDate", dateFormat = LOCAL_DATE_FORMAT ),
@Mapping( target = "localTime", dateFormat = LOCAL_TIME_FORMAT ) } )
Target sourceToTarget(Source source);
@Mappings( { @Mapping( source = "zonedDateTime", dateFormat = DATE_TIME_FORMAT ),
@Mapping( source = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT ),
@Mapping( source = "localDate", dateFormat = LOCAL_DATE_FORMAT ),
@Mapping( source = "localTime", dateFormat = LOCAL_TIME_FORMAT ) } )
@Mappings( { @Mapping( target = "zonedDateTime", dateFormat = DATE_TIME_FORMAT ),
@Mapping( target = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT ),
@Mapping( target = "localDate", dateFormat = LOCAL_DATE_FORMAT ),
@Mapping( target = "localTime", dateFormat = LOCAL_TIME_FORMAT ) } )
Target sourceToTargetDefaultMapping(Source source);
@Mapping( source = "zonedDateTime", dateFormat = DATE_TIME_FORMAT )
@Mapping( target = "zonedDateTime", dateFormat = DATE_TIME_FORMAT )
Target sourceToTargetDateTimeMapped(Source source);
@Mapping( source = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT )
@Mapping( target = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT )
Target sourceToTargetLocalDateTimeMapped(Source source);
@Mapping( source = "localDate", dateFormat = LOCAL_DATE_FORMAT )
@Mapping( target = "localDate", dateFormat = LOCAL_DATE_FORMAT )
Target sourceToTargetLocalDateMapped(Source source);
@Mapping( source = "localTime", dateFormat = LOCAL_TIME_FORMAT )
@Mapping( target = "localTime", dateFormat = LOCAL_TIME_FORMAT )
Target sourceToTargetLocalTimeMapped(Source source);
@Mappings( { @Mapping( source = "zonedDateTime", dateFormat = DATE_TIME_FORMAT ),
@Mapping( source = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT ),
@Mapping( source = "localDate", dateFormat = LOCAL_DATE_FORMAT ),
@Mapping( source = "localTime", dateFormat = LOCAL_TIME_FORMAT ) } )
@Mappings( { @Mapping( target = "zonedDateTime", dateFormat = DATE_TIME_FORMAT ),
@Mapping( target = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT ),
@Mapping( target = "localDate", dateFormat = LOCAL_DATE_FORMAT ),
@Mapping( target = "localTime", dateFormat = LOCAL_TIME_FORMAT ) } )
Source targetToSource(Target target);
@Mapping( source = "zonedDateTime", dateFormat = DATE_TIME_FORMAT )
@Mapping( target = "zonedDateTime", dateFormat = DATE_TIME_FORMAT )
Source targetToSourceDateTimeMapped(Target target);
@Mapping( source = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT )
@Mapping( target = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT )
Source targetToSourceLocalDateTimeMapped(Target target);
@Mapping( source = "localDate", dateFormat = LOCAL_DATE_FORMAT )
@Mapping( target = "localDate", dateFormat = LOCAL_DATE_FORMAT )
Source targetToSourceLocalDateMapped(Target target);
@Mapping( source = "localTime", dateFormat = LOCAL_TIME_FORMAT )
@Mapping( target = "localTime", dateFormat = LOCAL_TIME_FORMAT )
Source targetToSourceLocalTimeMapped(Target target);
@InheritInverseConfiguration( name = "sourceToTarget" )

33
processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/SourceTargetMapper.java
View File

@ -38,47 +38,46 @@ public interface SourceTargetMapper {
SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class );
@Mappings({
@Mapping(source = "dateTime", dateFormat = DATE_TIME_FORMAT),
@Mapping(source = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT),
@Mapping(source = "localDate", dateFormat = LOCAL_DATE_FORMAT),
@Mapping(source = "localTime", dateFormat = LOCAL_TIME_FORMAT)
@Mapping(target = "dateTime", dateFormat = DATE_TIME_FORMAT),
@Mapping(target = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT),
@Mapping(target = "localDate", dateFormat = LOCAL_DATE_FORMAT),
@Mapping(target = "localTime", dateFormat = LOCAL_TIME_FORMAT)
})
Target sourceToTarget(Source source);
@InheritInverseConfiguration( name = "targetToSource" ) // TODO: FIXME
Target sourceToTargetDefaultMapping(Source source);
@Mapping(source = "dateTime", dateFormat = DATE_TIME_FORMAT)
@Mapping(target = "dateTime", dateFormat = DATE_TIME_FORMAT)
Target sourceToTargetDateTimeMapped(Source source);
@Mapping(source = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT)
@Mapping(target = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT)
Target sourceToTargetLocalDateTimeMapped(Source source);
@Mapping(source = "localDate", dateFormat = LOCAL_DATE_FORMAT)
@Mapping(target = "localDate", dateFormat = LOCAL_DATE_FORMAT)
Target sourceToTargetLocalDateMapped(Source source);
@Mapping(source = "localTime", dateFormat = LOCAL_TIME_FORMAT)
@Mapping(target = "localTime", dateFormat = LOCAL_TIME_FORMAT)
Target sourceToTargetLocalTimeMapped(Source source);
@Mappings({
@Mapping(source = "dateTime", dateFormat = DATE_TIME_FORMAT),
@Mapping(source = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT),
@Mapping(source = "localDate", dateFormat = LOCAL_DATE_FORMAT),
@Mapping(source = "localTime", dateFormat = LOCAL_TIME_FORMAT)
@Mapping(target = "dateTime", dateFormat = DATE_TIME_FORMAT),
@Mapping(target = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT),
@Mapping(target = "localDate", dateFormat = LOCAL_DATE_FORMAT),
@Mapping(target = "localTime", dateFormat = LOCAL_TIME_FORMAT)
})
Source targetToSource(Target target);
@Mapping(source = "dateTime", dateFormat = DATE_TIME_FORMAT)
@Mapping(target = "dateTime", dateFormat = DATE_TIME_FORMAT)
Source targetToSourceDateTimeMapped(Target target);
@Mapping(source = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT)
@Mapping(target = "localDateTime", dateFormat = LOCAL_DATE_TIME_FORMAT)
Source targetToSourceLocalDateTimeMapped(Target target);
@Mapping(source = "localDate", dateFormat = LOCAL_DATE_FORMAT)
@Mapping(target = "localDate", dateFormat = LOCAL_DATE_FORMAT)
Source targetToSourceLocalDateMapped(Target target);
@Mapping(source = "localTime", dateFormat = LOCAL_TIME_FORMAT)
@Mapping(target = "localTime", dateFormat = LOCAL_TIME_FORMAT)
Source targetToSourceLocalTimeMapped(Target target);
@InheritInverseConfiguration( name = "sourceToTarget" ) // TODO: FIXME

2
processor/src/test/java/org/mapstruct/ap/test/conversion/string/SourceTargetMapper.java
View File

@ -27,7 +27,7 @@ public interface SourceTargetMapper {
SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class );
@Mapping( source = "object", ignore = true )
@Mapping( target = "object", ignore = true )
Target sourceToTarget(Source source);
Source targetToSource(Target target);

9
processor/src/test/java/org/mapstruct/ap/test/ignore/AnimalMapper.java
View File

@ -18,10 +18,9 @@
*/
package org.mapstruct.ap.test.ignore;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.factory.Mappers;
@Mapper
@ -29,11 +28,9 @@ public interface AnimalMapper {
AnimalMapper INSTANCE = Mappers.getMapper( AnimalMapper.class );
@Mappings({
@Mapping(source = "size", ignore = true),
@Mapping(target = "age", ignore = true)
})
@Mapping(target = "age", ignore = true)
AnimalDto animalToDto(Animal animal);
@InheritInverseConfiguration
Animal animalDtoToAnimal(AnimalDto animalDto);
}

16
processor/src/test/java/org/mapstruct/ap/test/ignore/IgnorePropertyTest.java
View File

@ -18,14 +18,14 @@
*/
package org.mapstruct.ap.test.ignore;
import static org.fest.assertions.Assertions.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.WithClasses;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
/**
* Test for ignoring properties during the mapping.
*
@ -35,18 +35,6 @@ import static org.fest.assertions.Assertions.assertThat;
@RunWith(AnnotationProcessorTestRunner.class)
public class IgnorePropertyTest {
@Test
@IssueKey("72")
public void shouldNotPropagateIgnoredPropertyGivenViaSourceAttribute() {
Animal animal = new Animal( "Bruno", 100, 23 );
AnimalDto animalDto = AnimalMapper.INSTANCE.animalToDto( animal );
assertThat( animalDto ).isNotNull();
assertThat( animalDto.getName() ).isEqualTo( "Bruno" );
assertThat( animalDto.getSize() ).isNull();
}
@Test
@IssueKey("72")
public void shouldNotPropagateIgnoredPropertyGivenViaTargetAttribute() {

6
processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/ErroneousMapper.java
View File

@ -18,12 +18,12 @@
*/
package org.mapstruct.ap.test.selection.qualifier;
import org.mapstruct.ap.test.selection.qualifier.bean.GermanRelease;
import org.mapstruct.ap.test.selection.qualifier.bean.OriginalRelease;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.ap.test.selection.qualifier.annotation.NonQualifierAnnotated;
import org.mapstruct.ap.test.selection.qualifier.bean.GermanRelease;
import org.mapstruct.ap.test.selection.qualifier.bean.OriginalRelease;
import org.mapstruct.ap.test.selection.qualifier.handwritten.SomeOtherMapper;
import org.mapstruct.ap.test.selection.qualifier.handwritten.YetAnotherMapper;
import org.mapstruct.factory.Mappers;
@ -38,7 +38,7 @@ public interface ErroneousMapper {
ErroneousMapper INSTANCE = Mappers.getMapper( ErroneousMapper.class );
@Mappings( {
@Mapping( source = "title", qualifiedBy = { NonQualifierAnnotated.class } ), } )
@Mapping( target = "title", qualifiedBy = { NonQualifierAnnotated.class } ), } )
GermanRelease toGerman( OriginalRelease movies );
}

8
processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/MovieMapper.java
View File

@ -18,15 +18,15 @@
*/
package org.mapstruct.ap.test.selection.qualifier;
import org.mapstruct.ap.test.selection.qualifier.bean.GermanRelease;
import org.mapstruct.ap.test.selection.qualifier.bean.OriginalRelease;
import org.mapstruct.ap.test.selection.qualifier.handwritten.Titles;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.ap.test.selection.qualifier.annotation.EnglishToGerman;
import org.mapstruct.ap.test.selection.qualifier.annotation.TitleTranslator;
import org.mapstruct.ap.test.selection.qualifier.bean.GermanRelease;
import org.mapstruct.ap.test.selection.qualifier.bean.OriginalRelease;
import org.mapstruct.ap.test.selection.qualifier.handwritten.SomeOtherMapper;
import org.mapstruct.ap.test.selection.qualifier.handwritten.Titles;
import org.mapstruct.factory.Mappers;
/**
@ -39,7 +39,7 @@ public interface MovieMapper {
MovieMapper INSTANCE = Mappers.getMapper( MovieMapper.class );
@Mappings( {
@Mapping( source = "title", qualifiedBy = { TitleTranslator.class, EnglishToGerman.class } ),
@Mapping( target = "title", qualifiedBy = { TitleTranslator.class, EnglishToGerman.class } )
} )
GermanRelease toGerman( OriginalRelease movies );

30
processor/src/test/java/org/mapstruct/ap/test/source/constants/SourceConstantsTest.java
View File

@ -18,10 +18,13 @@
*/
package org.mapstruct.ap.test.source.constants;
import static org.fest.assertions.Assertions.assertThat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import javax.tools.Diagnostic.Kind;
import org.junit.Test;
@ -33,8 +36,6 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
import static org.fest.assertions.Assertions.assertThat;
/**
* @author Sjaak Derksen
*/
@ -159,31 +160,6 @@ public class SourceConstantsTest {
public void errorOnSourceAndExpression() throws ParseException {
}
@Test
@IssueKey("187")
@WithClasses({
Source.class,
Target.class,
ErroneousMapper2.class,
StringListMapper.class
})
@ExpectedCompilationOutcome(
value = CompilationResult.FAILED,
diagnostics = {
@Diagnostic(type = ErroneousMapper2.class,
kind = Kind.ERROR,
line = 41,
messageRegExp = "Either define a source, a constant or an expression in a Mapping"),
@Diagnostic(type = ErroneousMapper2.class,
kind = Kind.WARNING,
line = 41,
messageRegExp = "Unmapped target property: \"integerConstant\"")
}
)
public void errorOnNeitherSourceNorExpression() throws ParseException {
}
@Test
@IssueKey("255")
@WithClasses({