diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/AbstractJodaTypeToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/AbstractJodaTypeToStringConversion.java index 0de470cf6..541060705 100755 --- a/processor/src/main/java/org/mapstruct/ap/conversion/AbstractJodaTypeToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/conversion/AbstractJodaTypeToStringConversion.java @@ -37,7 +37,7 @@ public abstract class AbstractJodaTypeToStringConversion extends SimpleConversio @Override protected String getToExpression(ConversionContext conversionContext) { - return conversionString( conversionContext, "print" ); + return conversionString( conversionContext, "print" ) + ".trim()"; } @Override diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/JodaConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/JodaConversionTest.java index 272334227..19d6ae816 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/JodaConversionTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/JodaConversionTest.java @@ -107,10 +107,10 @@ public class JodaConversionTest { // and now with default mappings target = SourceTargetMapper.INSTANCE.sourceToTargetDefaultMapping( src ); assertThat( target ).isNotNull(); - assertThat( target.getDateTime() ).isEqualTo( "01.01.2014 00:00 UTC" ); - assertThat( target.getLocalDateTime() ).isEqualTo( "01.01.2014 00:00" ); - assertThat( target.getLocalDate() ).isEqualTo( "01.01.2014" ); - assertThat( target.getLocalTime() ).isEqualTo( "00:00" ); + assertThat( target.getDateTime() ).isEqualTo( "1. Januar 2014 00:00:00 UTC" ); + assertThat( target.getLocalDateTime() ).isEqualTo( "1. Januar 2014 00:00:00" ); + assertThat( target.getLocalDate() ).isEqualTo( "1. Januar 2014" ); + assertThat( target.getLocalTime() ).isEqualTo( "00:00:00" ); } @Test diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/SourceTargetMapper.java index 056db1b9a..2c35a1e90 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/SourceTargetMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/SourceTargetMapper.java @@ -18,7 +18,6 @@ */ package org.mapstruct.ap.test.conversion.jodatime; -import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; @@ -45,7 +44,6 @@ public interface SourceTargetMapper { }) Target sourceToTarget(Source source); - @InheritInverseConfiguration( name = "targetToSource" ) // TODO: FIXME Target sourceToTargetDefaultMapping(Source source); @Mapping(target = "dateTime", dateFormat = DATE_TIME_FORMAT) @@ -80,6 +78,5 @@ public interface SourceTargetMapper { @Mapping(target = "localTime", dateFormat = LOCAL_TIME_FORMAT) Source targetToSourceLocalTimeMapped(Target target); - @InheritInverseConfiguration( name = "sourceToTarget" ) // TODO: FIXME Source targetToSourceDefaultMapping(Target target); }