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

#1460 Ensures the FQN will be used for SimpleConversion if required

Browse Source 
* Added getReferenceName() to Type which returns simple or fully-qualified-name
* Use getReferenceName() in all SimpleConversions
* Added testcase that is not working without these changes
* Added ConversionUtils with a lot of helper methods to create the "reference names" used in SimpleConversions
This commit is contained in:
Christian Bandowski 2018-05-05 20:42:37 +02:00 committed by Filip Hrisafov
parent bf31ec72de
commit b291907918
35 changed files with 923 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractJavaTimeToStringConversion.java
View File

@ -52,10 +52,12 @@ public abstract class AbstractJavaTimeToStringConversion extends SimpleConversio
private String dateTimeFormatter(ConversionContext conversionContext) {
if ( !Strings.isEmpty( conversionContext.getDateFormat() ) ) {
return "DateTimeFormatter.ofPattern( \"" + conversionContext.getDateFormat() + "\" )";
return ConversionUtils.dateTimeFormatter( conversionContext )
+ ".ofPattern( \"" + conversionContext.getDateFormat()
+ "\" )";
}
else {
return "DateTimeFormatter." + defaultFormatterSuffix();
return ConversionUtils.dateTimeFormatter( conversionContext ) + "." + defaultFormatterSuffix();
}
}
@ -64,7 +66,7 @@ public abstract class AbstractJavaTimeToStringConversion extends SimpleConversio
@Override
protected String getFromExpression(ConversionContext conversionContext) {
// See http://docs.oracle.com/javase/tutorial/datetime/iso/format.html for how to parse Dates
return new StringBuilder().append( conversionContext.getTargetType().getFullyQualifiedName() )
return new StringBuilder().append( conversionContext.getTargetType().getReferenceName() )
.append( ".parse( " )
.append( parametersListForParsing( conversionContext ) )
.append( " )" ).toString();
@ -74,9 +76,8 @@ public abstract class AbstractJavaTimeToStringConversion extends SimpleConversio
// See http://docs.oracle.com/javase/tutorial/datetime/iso/format.html for how to format Dates
StringBuilder parameterBuilder = new StringBuilder( "<SOURCE>" );
if ( !Strings.isEmpty( conversionContext.getDateFormat() ) ) {
parameterBuilder.append( ", DateTimeFormatter.ofPattern( \"" )
.append( conversionContext.getDateFormat() )
.append( "\" )" );
parameterBuilder.append( ", " );
parameterBuilder.append( dateTimeFormatter( conversionContext ) );
}
return parameterBuilder.toString();
}
@ -84,14 +85,20 @@ public abstract class AbstractJavaTimeToStringConversion extends SimpleConversio
@Override
protected Set<Type> getToConversionImportTypes(ConversionContext conversionContext) {
return Collections.asSet(
conversionContext.getTypeFactory().getType( JavaTimeConstants.DATE_TIME_FORMATTER_FQN )
conversionContext.getTypeFactory().getType( JavaTimeConstants.DATE_TIME_FORMATTER_FQN )
);
}
@Override
protected Set<Type> getFromConversionImportTypes(ConversionContext conversionContext) {
return Collections.asSet(
conversionContext.getTypeFactory().getType( JavaTimeConstants.DATE_TIME_FORMATTER_FQN )
);
if ( !Strings.isEmpty( conversionContext.getDateFormat() ) ) {
return Collections.asSet(
conversionContext.getTargetType(),
conversionContext.getTypeFactory().getType( JavaTimeConstants.DATE_TIME_FORMATTER_FQN )
);
}
return Collections.asSet( conversionContext.getTargetType() );
}
}

18
processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractJodaTypeToStringConversion.java
View File

@ -18,8 +18,6 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.util.Collections;
import java.util.Locale;
import java.util.Set;
@ -28,6 +26,10 @@ import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.JodaTimeConstants;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.dateTimeFormat;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.locale;
/**
* Base class for conversions between Joda-Time types and String.
*
@ -78,7 +80,7 @@ public abstract class AbstractJodaTypeToStringConversion extends SimpleConversio
}
private String conversionString(ConversionContext conversionContext, String method) {
StringBuilder conversionString = new StringBuilder( "DateTimeFormat" );
StringBuilder conversionString = new StringBuilder( dateTimeFormat( conversionContext ) );
conversionString.append( dateFormatPattern( conversionContext ) );
conversionString.append( "." );
conversionString.append( method );
@ -92,7 +94,7 @@ public abstract class AbstractJodaTypeToStringConversion extends SimpleConversio
String dateFormat = conversionContext.getDateFormat();
if ( dateFormat == null ) {
conversionString.append( defaultDateFormatPattern() );
conversionString.append( defaultDateFormatPattern( conversionContext ) );
}
else {
@ -105,8 +107,12 @@ public abstract class AbstractJodaTypeToStringConversion extends SimpleConversio
return conversionString.toString();
}
private String defaultDateFormatPattern() {
return " DateTimeFormat.patternForStyle( \"" + formatStyle() + "\", Locale.getDefault() )";
private String defaultDateFormatPattern(ConversionContext conversionContext) {
return " "
+ dateTimeFormat( conversionContext )
+ ".patternForStyle( \"" + formatStyle() + "\", "
+ locale( conversionContext )
+ ".getDefault() )";
}
/**

2
processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractNumberToStringConversion.java
View File

@ -40,7 +40,6 @@ public abstract class AbstractNumberToStringConversion extends SimpleConversion
private final boolean sourceTypeNumberSubclass;
public AbstractNumberToStringConversion(boolean sourceTypeNumberSubclass) {
this.sourceTypeNumberSubclass = sourceTypeNumberSubclass;
}
@ -77,5 +76,4 @@ public abstract class AbstractNumberToStringConversion extends SimpleConversion
return super.getFromConversionExceptionTypes( conversionContext );
}
}
}

9
processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToBigIntegerConversion.java
View File

@ -18,8 +18,6 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Set;
@ -27,6 +25,9 @@ import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.bigDecimal;
/**
* Conversion between {@link BigDecimal} and {@link BigInteger}.
*
@ -41,7 +42,9 @@ public class BigDecimalToBigIntegerConversion extends SimpleConversion {
@Override
public String getFromExpression(ConversionContext conversionContext) {
return "new BigDecimal( <SOURCE> )";
return "new "
+ bigDecimal( conversionContext )
+ "( <SOURCE> )";
}
@Override

7
processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToPrimitiveConversion.java
View File

@ -18,14 +18,15 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.math.BigDecimal;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.bigDecimal;
/**
* Conversion between {@link BigDecimal} and native number types.
*
@ -50,7 +51,7 @@ public class BigDecimalToPrimitiveConversion extends SimpleConversion {
@Override
public String getFromExpression(ConversionContext conversionContext) {
return "BigDecimal.valueOf( <SOURCE> )";
return bigDecimal( conversionContext ) + ".valueOf( <SOURCE> )";
}
@Override

10
processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToStringConversion.java
View File

@ -18,8 +18,6 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@ -29,6 +27,9 @@ import org.mapstruct.ap.internal.model.HelperMethod;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.bigDecimal;
/**
* Conversion between {@link BigDecimal} and {@link String}.
*
@ -57,13 +58,13 @@ public class BigDecimalToStringConversion extends AbstractNumberToStringConversi
public String getFromExpression(ConversionContext conversionContext) {
if ( requiresDecimalFormat( conversionContext ) ) {
StringBuilder sb = new StringBuilder();
sb.append( "(BigDecimal) " );
sb.append( "(" + bigDecimal( conversionContext ) + ") " );
appendDecimalFormatter( sb, conversionContext );
sb.append( ".parse( <SOURCE> )" );
return sb.toString();
}
else {
return "new BigDecimal( <SOURCE> )";
return "new " + bigDecimal( conversionContext ) + "( <SOURCE> )";
}
}
@ -91,5 +92,4 @@ public class BigDecimalToStringConversion extends AbstractNumberToStringConversi
sb.append( " )" );
}
}

7
processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToWrapperConversion.java
View File

@ -18,8 +18,6 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.math.BigDecimal;
import java.util.Set;
@ -27,6 +25,9 @@ import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.NativeTypes;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.bigDecimal;
/**
* Conversion between {@link BigDecimal} and wrappers of native number types.
*
@ -51,7 +52,7 @@ public class BigDecimalToWrapperConversion extends SimpleConversion {
@Override
public String getFromExpression(ConversionContext conversionContext) {
return "BigDecimal.valueOf( <SOURCE> )";
return bigDecimal( conversionContext ) + ".valueOf( <SOURCE> )";
}
@Override

7
processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToPrimitiveConversion.java
View File

@ -18,14 +18,15 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.math.BigInteger;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.bigInteger;
/**
* Conversion between {@link BigInteger} and native number types.
*
@ -54,7 +55,7 @@ public class BigIntegerToPrimitiveConversion extends SimpleConversion {
if ( targetType == float.class || targetType == double.class ) {
castString = "(long) ";
}
return "BigInteger.valueOf( " + castString + "<SOURCE> )";
return bigInteger( conversionContext ) + ".valueOf( " + castString + "<SOURCE> )";
}
@Override

14
processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToStringConversion.java
View File

@ -18,8 +18,7 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
@ -29,6 +28,10 @@ import org.mapstruct.ap.internal.model.HelperMethod;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.bigDecimal;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.bigInteger;
/**
* Conversion between {@link BigInteger} and {@link String}.
*
@ -57,22 +60,21 @@ public class BigIntegerToStringConversion extends AbstractNumberToStringConversi
public String getFromExpression(ConversionContext conversionContext) {
if ( requiresDecimalFormat( conversionContext ) ) {
StringBuilder sb = new StringBuilder();
sb.append( "( (BigDecimal) " );
sb.append( "( (" + bigDecimal( conversionContext ) + ") " );
appendDecimalFormatter( sb, conversionContext );
sb.append( ".parse( <SOURCE> )" );
sb.append( " ).toBigInteger()" );
return sb.toString();
}
else {
return "new BigInteger( <SOURCE> )";
return "new " + bigInteger( conversionContext ) + "( <SOURCE> )";
}
}
@Override
protected Set<Type> getFromConversionImportTypes(ConversionContext conversionContext) {
if ( requiresDecimalFormat( conversionContext ) ) {
// no imports are required when decimal format is used.
return super.getFromConversionImportTypes( conversionContext );
return asSet( conversionContext.getTypeFactory().getType( BigDecimal.class ) );
}
else {
return asSet( conversionContext.getTypeFactory().getType( BigInteger.class ) );

7
processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToWrapperConversion.java
View File

@ -18,8 +18,6 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.math.BigInteger;
import java.util.Set;
@ -27,6 +25,9 @@ import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.NativeTypes;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.bigInteger;
/**
* Conversion between {@link BigInteger} and wrappers of native number types.
*
@ -56,7 +57,7 @@ public class BigIntegerToWrapperConversion extends SimpleConversion {
toLongValueStr = ".longValue()";
}
return "BigInteger.valueOf( <SOURCE>" + toLongValueStr + " )";
return bigInteger( conversionContext ) + ".valueOf( <SOURCE>" + toLongValueStr + " )";
}
@Override

243
processor/src/main/java/org/mapstruct/ap/internal/conversion/ConversionUtils.java Normal file
View File

@ -0,0 +1,243 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.internal.conversion;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.sql.Time;
import java.sql.Timestamp;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.Currency;
import java.util.Locale;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.util.JavaTimeConstants;
import org.mapstruct.ap.internal.util.JodaTimeConstants;
/**
* Methods mainly used in {@link org.mapstruct.ap.internal.conversion.SimpleConversion SimpleConversion} classes, e. g.
* to get the correct String representation of various types that could be used in generated sources.
*
* @author Christian Bandowski
*/
public final class ConversionUtils {
private ConversionUtils() {
}
/**
* Name for the given {@code canonicalName}.
*
* @param conversionContext Conversion context
* @param canonicalName Canonical name of the type
*
* @return Name or fully-qualified name.
*/
private static String typeReferenceName(ConversionContext conversionContext, String canonicalName) {
return conversionContext.getTypeFactory().getType( canonicalName ).getReferenceName();
}
/**
* Name for the given {@code canonicalName}.
*
* @param conversionContext Conversion context
* @param type Type
*
* @return Name or fully-qualified name.
*/
private static String typeReferenceName(ConversionContext conversionContext, Class<?> type) {
return conversionContext.getTypeFactory().getType( type ).getReferenceName();
}
/**
* Name for {@link java.math.BigDecimal}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String bigDecimal(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, BigDecimal.class );
}
/**
* Name for {@link java.math.BigInteger}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String bigInteger(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, BigInteger.class );
}
/**
* Name for {@link java.util.Locale}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String locale(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, Locale.class );
}
/**
* Name for {@link java.util.Currency}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String currency(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, Currency.class );
}
/**
* Name for {@link java.sql.Date}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String sqlDate(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, java.sql.Date.class );
}
/**
* Name for {@link java.sql.Time}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String time(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, Time.class );
}
/**
* Name for {@link java.sql.Timestamp}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String timestamp(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, Timestamp.class );
}
/**
* Name for {@link java.text.DecimalFormat}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String decimalFormat(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, DecimalFormat.class );
}
/**
* Name for {@link java.text.SimpleDateFormat}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String simpleDateFormat(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, SimpleDateFormat.class );
}
/**
* Name for {@link java.util.Date}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String date(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, java.util.Date.class );
}
/**
* Name for {@link java.time.ZoneOffset}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String zoneOffset(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, JavaTimeConstants.ZONE_OFFSET_FQN );
}
/**
* Name for {@link java.time.ZoneId}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String zoneId(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, JavaTimeConstants.ZONE_ID_FQN );
}
/**
* Name for {@link java.time.LocalDateTime}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String localDateTime(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, JavaTimeConstants.LOCAL_DATE_TIME_FQN );
}
/**
* Name for {@link java.time.ZonedDateTime}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String zonedDateTime(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, JavaTimeConstants.ZONED_DATE_TIME_FQN );
}
/**
* Name for {@link java.time.format.DateTimeFormatter}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String dateTimeFormatter(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, JavaTimeConstants.DATE_TIME_FORMATTER_FQN );
}
/**
* Name for {@code org.joda.time.format.DateTimeFormat}.
*
* @param conversionContext Conversion context
*
* @return Name or fully-qualified name.
*/
public static String dateTimeFormat(ConversionContext conversionContext) {
return typeReferenceName( conversionContext, JodaTimeConstants.DATE_TIME_FORMAT_FQN );
}
}

8
processor/src/main/java/org/mapstruct/ap/internal/conversion/CurrencyToStringConversion.java
View File

@ -18,12 +18,14 @@
*/
package org.mapstruct.ap.internal.conversion;
import java.util.Currency;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.Collections;
import java.util.Currency;
import java.util.Set;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.currency;
/**
* @author Darren Rambaud
@ -36,7 +38,7 @@ public class CurrencyToStringConversion extends SimpleConversion {
@Override
protected String getFromExpression(final ConversionContext conversionContext) {
return "Currency.getInstance( <SOURCE> )";
return currency( conversionContext ) + ".getInstance( <SOURCE> )";
}
@Override

14
processor/src/main/java/org/mapstruct/ap/internal/conversion/DateToSqlDateConversion.java
View File

@ -18,7 +18,14 @@
*/
package org.mapstruct.ap.internal.conversion;
import java.sql.Date;
import java.util.Collections;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.sqlDate;
/**
* Conversion between {@link java.util.Date} and {@link java.sql.Date}.
@ -29,7 +36,12 @@ public class DateToSqlDateConversion extends SimpleConversion {
@Override
protected String getToExpression(ConversionContext conversionContext) {
return "new java.sql.Date( <SOURCE>.getTime() )";
return "new " + sqlDate( conversionContext ) + "( <SOURCE>.getTime() )";
}
@Override
protected Set<Type> getToConversionImportTypes(ConversionContext conversionContext) {
return Collections.singleton( conversionContext.getTypeFactory().getType( Date.class ) );
}
@Override

4
processor/src/main/java/org/mapstruct/ap/internal/conversion/DateToSqlTimeConversion.java
View File

@ -25,6 +25,8 @@ import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.Collections;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.time;
/**
* Conversion between {@link java.util.Date} and {@link java.sql.Time}.
*
@ -34,7 +36,7 @@ public class DateToSqlTimeConversion extends SimpleConversion {
@Override
protected String getToExpression(ConversionContext conversionContext) {
return "new Time( <SOURCE>.getTime() )";
return "new " + time( conversionContext ) + "( <SOURCE>.getTime() )";
}
@Override

4
processor/src/main/java/org/mapstruct/ap/internal/conversion/DateToSqlTimestampConversion.java
View File

@ -25,6 +25,8 @@ import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.Collections;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.timestamp;
/**
* Conversion between {@link java.util.Date} and {@link java.sql.Timestamp}.
*
@ -34,7 +36,7 @@ public class DateToSqlTimestampConversion extends SimpleConversion {
@Override
protected String getToExpression(ConversionContext conversionContext) {
return "new Timestamp( <SOURCE>.getTime() )";
return "new " + timestamp( conversionContext ) + "( <SOURCE>.getTime() )";
}
@Override

11
processor/src/main/java/org/mapstruct/ap/internal/conversion/DateToStringConversion.java
View File

@ -18,9 +18,6 @@
*/
package org.mapstruct.ap.internal.conversion;
import static java.util.Arrays.asList;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Collections;
@ -33,6 +30,10 @@ import org.mapstruct.ap.internal.model.common.Assignment;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static java.util.Arrays.asList;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.simpleDateFormat;
/**
* Conversion between {@link String} and {@link Date}.
*
@ -62,7 +63,9 @@ public class DateToStringConversion implements ConversionProvider {
}
private String getConversionExpression(ConversionContext conversionContext, String method) {
StringBuilder conversionString = new StringBuilder( "new SimpleDateFormat(" );
StringBuilder conversionString = new StringBuilder( "new " );
conversionString.append( simpleDateFormat( conversionContext ) );
conversionString.append( '(' );
if ( conversionContext.getDateFormat() != null ) {
conversionString.append( " \"" );

11
processor/src/main/java/org/mapstruct/ap/internal/conversion/EnumStringConversion.java
View File

@ -18,13 +18,13 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
/**
* Conversion between {@link String} and {@link Enum} types.
*
@ -39,11 +39,14 @@ public class EnumStringConversion extends SimpleConversion {
@Override
public String getFromExpression(ConversionContext conversionContext) {
return "Enum.valueOf( " + conversionContext.getTargetType().getName() + ".class, <SOURCE> )";
return "Enum.valueOf( " + conversionContext.getTargetType().getReferenceName()
+ ".class, <SOURCE> )";
}
@Override
protected Set<Type> getFromConversionImportTypes(ConversionContext conversionContext) {
return asSet( conversionContext.getTargetType() );
return asSet(
conversionContext.getTargetType()
);
}
}

39
processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateTimeToDateConversion.java
View File

@ -18,7 +18,20 @@
*/
package org.mapstruct.ap.internal.conversion;
import java.util.Date;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.Collections;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.date;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.localDateTime;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.zoneId;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.zoneOffset;
import static org.mapstruct.ap.internal.util.JavaTimeConstants.LOCAL_DATE_TIME_FQN;
import static org.mapstruct.ap.internal.util.JavaTimeConstants.ZONE_ID_FQN;
import static org.mapstruct.ap.internal.util.JavaTimeConstants.ZONE_OFFSET_FQN;
/**
* SimpleConversion for mapping {@link java.time.LocalDateTime} to
@ -28,11 +41,33 @@ public class JavaLocalDateTimeToDateConversion extends SimpleConversion {
@Override
protected String getToExpression(ConversionContext conversionContext) {
return "java.util.Date.from( <SOURCE>.toInstant( java.time.ZoneOffset.UTC ) )";
return date( conversionContext )
+ ".from( <SOURCE>.toInstant( "
+ zoneOffset( conversionContext )
+ ".UTC ) )";
}
@Override
protected Set<Type> getToConversionImportTypes(ConversionContext conversionContext) {
return Collections.asSet(
conversionContext.getTypeFactory().getType( Date.class ),
conversionContext.getTypeFactory().getType( ZONE_OFFSET_FQN )
);
}
@Override
protected String getFromExpression(ConversionContext conversionContext) {
return "java.time.LocalDateTime.ofInstant( <SOURCE>.toInstant(), java.time.ZoneId.of( \"UTC\" ) )";
return localDateTime( conversionContext )
+ ".ofInstant( <SOURCE>.toInstant(), "
+ zoneId( conversionContext )
+ ".of( \"UTC\" ) )";
}
@Override
protected Set<Type> getFromConversionImportTypes(ConversionContext conversionContext) {
return Collections.asSet(
conversionContext.getTypeFactory().getType( LOCAL_DATE_TIME_FQN ),
conversionContext.getTypeFactory().getType( ZONE_ID_FQN )
);
}
}

37
processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaLocalDateToDateConversion.java
View File

@ -18,7 +18,19 @@
*/
package org.mapstruct.ap.internal.conversion;
import java.util.Date;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.Collections;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.date;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.localDateTime;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.zoneOffset;
import static org.mapstruct.ap.internal.util.JavaTimeConstants.LOCAL_DATE_TIME_FQN;
import static org.mapstruct.ap.internal.util.JavaTimeConstants.ZONE_ID_FQN;
import static org.mapstruct.ap.internal.util.JavaTimeConstants.ZONE_OFFSET_FQN;
/**
* SimpleConversion for mapping {@link java.time.LocalDate} to
@ -28,12 +40,33 @@ public class JavaLocalDateToDateConversion extends SimpleConversion {
@Override
protected String getToExpression(ConversionContext conversionContext) {
return "java.util.Date.from( <SOURCE>.atStartOfDay( java.time.ZoneOffset.UTC ).toInstant() )";
return date( conversionContext )
+ ".from( <SOURCE>.atStartOfDay( "
+ zoneOffset( conversionContext )
+ ".UTC ).toInstant() )";
}
@Override
protected Set<Type> getToConversionImportTypes(ConversionContext conversionContext) {
return Collections.asSet(
conversionContext.getTypeFactory().getType( Date.class ),
conversionContext.getTypeFactory().getType( ZONE_OFFSET_FQN )
);
}
@Override
protected String getFromExpression(ConversionContext conversionContext) {
return "java.time.LocalDateTime.ofInstant( <SOURCE>.toInstant(), java.time.ZoneOffset.UTC ).toLocalDate()";
return localDateTime( conversionContext )
+ ".ofInstant( <SOURCE>.toInstant(), "
+ zoneOffset( conversionContext )
+ ".UTC ).toLocalDate()";
}
@Override
protected Set<Type> getFromConversionImportTypes(ConversionContext conversionContext) {
return Collections.asSet(
conversionContext.getTypeFactory().getType( LOCAL_DATE_TIME_FQN ),
conversionContext.getTypeFactory().getType( ZONE_ID_FQN )
);
}
}

33
processor/src/main/java/org/mapstruct/ap/internal/conversion/JavaZonedDateTimeToDateConversion.java
View File

@ -18,7 +18,18 @@
*/
package org.mapstruct.ap.internal.conversion;
import java.util.Date;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.Collections;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.date;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.zoneId;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.zonedDateTime;
import static org.mapstruct.ap.internal.util.JavaTimeConstants.ZONED_DATE_TIME_FQN;
import static org.mapstruct.ap.internal.util.JavaTimeConstants.ZONE_ID_FQN;
/**
* SimpleConversion for mapping {@link java.time.ZonedDateTime} to
@ -29,11 +40,29 @@ public class JavaZonedDateTimeToDateConversion extends SimpleConversion {
@Override
protected String getToExpression(ConversionContext conversionContext) {
return "java.util.Date.from( <SOURCE>.toInstant() )";
return date( conversionContext ) + ".from( <SOURCE>.toInstant() )";
}
@Override
protected Set<Type> getToConversionImportTypes(ConversionContext conversionContext) {
return Collections.asSet(
conversionContext.getTypeFactory().getType( Date.class )
);
}
@Override
protected String getFromExpression(ConversionContext conversionContext) {
return "java.time.ZonedDateTime.ofInstant( <SOURCE>.toInstant(), java.time.ZoneId.systemDefault() )";
return zonedDateTime( conversionContext )
+ ".ofInstant( <SOURCE>.toInstant(), "
+ zoneId( conversionContext )
+ ".systemDefault() )";
}
@Override
protected Set<Type> getFromConversionImportTypes(ConversionContext conversionContext) {
return Collections.asSet(
conversionContext.getTypeFactory().getType( ZONED_DATE_TIME_FQN ),
conversionContext.getTypeFactory().getType( ZONE_ID_FQN )
);
}
}

9
processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaDateTimeToCalendarConversion.java
View File

@ -18,8 +18,6 @@
*/
package org.mapstruct.ap.internal.conversion;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import java.util.Calendar;
import java.util.Locale;
import java.util.Set;
@ -27,6 +25,9 @@ import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import static org.mapstruct.ap.internal.util.Collections.asSet;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.locale;
/**
* Conversion between {@code DateTime} and {@link Calendar}.
*
@ -36,7 +37,7 @@ public class JodaDateTimeToCalendarConversion extends SimpleConversion {
@Override
protected String getToExpression(ConversionContext conversionContext) {
return "<SOURCE>.toCalendar( Locale.getDefault() )";
return "<SOURCE>.toCalendar( " + locale( conversionContext ) + ".getDefault() )";
}
@Override
@ -46,7 +47,7 @@ public class JodaDateTimeToCalendarConversion extends SimpleConversion {
@Override
protected String getFromExpression(ConversionContext conversionContext) {
return "new " + conversionContext.getTargetType().getName() + "( <SOURCE> )";
return "new " + conversionContext.getTargetType().getReferenceName() + "( <SOURCE> )";
}
@Override

2
processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaTimeToDateConversion.java
View File

@ -45,7 +45,7 @@ public class JodaTimeToDateConversion extends SimpleConversion {
@Override
protected String getFromExpression(ConversionContext conversionContext) {
return "new " + conversionContext.getTargetType().getName() + "( <SOURCE> )";
return "new " + conversionContext.getTargetType().getReferenceName() + "( <SOURCE> )";
}
@Override

34
processor/src/main/java/org/mapstruct/ap/internal/conversion/PrimitiveToStringConversion.java
View File

@ -18,10 +18,17 @@
*/
package org.mapstruct.ap.internal.conversion;
import java.text.DecimalFormat;
import java.util.Collections;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.NativeTypes;
import org.mapstruct.ap.internal.util.Strings;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.decimalFormat;
/**
* Conversion between primitive types such as {@code byte} or {@code long} and
* {@link String}.
@ -56,6 +63,17 @@ public class PrimitiveToStringConversion extends AbstractNumberToStringConversio
}
}
@Override
public Set<Type> getToConversionImportTypes(ConversionContext conversionContext) {
if ( requiresDecimalFormat( conversionContext ) ) {
return Collections.singleton(
conversionContext.getTypeFactory().getType( DecimalFormat.class )
);
}
return Collections.emptySet();
}
@Override
public String getFromExpression(ConversionContext conversionContext) {
if ( requiresDecimalFormat( conversionContext ) ) {
@ -72,8 +90,22 @@ public class PrimitiveToStringConversion extends AbstractNumberToStringConversio
}
}
@Override
protected Set<Type> getFromConversionImportTypes(ConversionContext conversionContext) {
if ( requiresDecimalFormat( conversionContext ) ) {
return Collections.singleton(
conversionContext.getTypeFactory().getType( DecimalFormat.class )
);
}
return Collections.emptySet();
}
private void appendDecimalFormatter(StringBuilder sb, ConversionContext conversionContext) {
sb.append( "new DecimalFormat( " );
sb.append( "new " );
sb.append( decimalFormat( conversionContext ) );
sb.append( "( " );
if ( conversionContext.getNumberFormat() != null ) {
sb.append( "\"" );
sb.append( conversionContext.getNumberFormat() );

34
processor/src/main/java/org/mapstruct/ap/internal/conversion/WrapperToStringConversion.java
View File

@ -18,10 +18,17 @@
*/
package org.mapstruct.ap.internal.conversion;
import java.text.DecimalFormat;
import java.util.Collections;
import java.util.Set;
import org.mapstruct.ap.internal.model.common.ConversionContext;
import org.mapstruct.ap.internal.model.common.Type;
import org.mapstruct.ap.internal.util.NativeTypes;
import org.mapstruct.ap.internal.util.Strings;
import static org.mapstruct.ap.internal.conversion.ConversionUtils.decimalFormat;
/**
* Conversion between wrapper types such as {@link Integer} and {@link String}.
*
@ -55,6 +62,17 @@ public class WrapperToStringConversion extends AbstractNumberToStringConversion
}
}
@Override
public Set<Type> getToConversionImportTypes(ConversionContext conversionContext) {
if ( requiresDecimalFormat( conversionContext ) ) {
return Collections.singleton(
conversionContext.getTypeFactory().getType( DecimalFormat.class )
);
}
return Collections.emptySet();
}
@Override
public String getFromExpression(ConversionContext conversionContext) {
if ( requiresDecimalFormat( conversionContext ) ) {
@ -71,8 +89,22 @@ public class WrapperToStringConversion extends AbstractNumberToStringConversion
}
}
@Override
protected Set<Type> getFromConversionImportTypes(ConversionContext conversionContext) {
if ( requiresDecimalFormat( conversionContext ) ) {
return Collections.singleton(
conversionContext.getTypeFactory().getType( DecimalFormat.class )
);
}
return Collections.emptySet();
}
private void appendDecimalFormatter(StringBuilder sb, ConversionContext conversionContext) {
sb.append( "new DecimalFormat( " );
sb.append( "new " );
sb.append( decimalFormat( conversionContext ) );
sb.append( "( " );
if ( conversionContext.getNumberFormat() != null ) {
sb.append( "\"" );
sb.append( conversionContext.getNumberFormat() );

10
processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java
View File

@ -26,7 +26,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
@ -181,6 +180,15 @@ public class Type extends ModelElement implements Comparable<Type> {
return name;
}
/**
* String that could be used in generated code to reference to this {@link Type}.
*
* @return Just the name if this {@link Type} will be imported, otherwise the fully-qualified name.
*/
public String getReferenceName() {
return isImported ? name : qualifiedName;
}
public List<Type> getTypeParameters() {
return typeParameters;
}

4
processor/src/main/java/org/mapstruct/ap/internal/util/JavaTimeConstants.java
View File

@ -24,9 +24,13 @@ package org.mapstruct.ap.internal.util;
public final class JavaTimeConstants {
public static final String ZONED_DATE_TIME_FQN = "java.time.ZonedDateTime";
public static final String ZONE_OFFSET_FQN = "java.time.ZoneOffset";
public static final String ZONE_ID_FQN = "java.time.ZoneId";
public static final String LOCAL_DATE_TIME_FQN = "java.time.LocalDateTime";
public static final String LOCAL_DATE_FQN = "java.time.LocalDate";
public static final String LOCAL_TIME_FQN = "java.time.LocalTime";
public static final String DATE_TIME_FORMATTER_FQN = "java.time.format.DateTimeFormatter";
private JavaTimeConstants() {

2
processor/src/main/resources/org/mapstruct/ap/internal/model/common/Type.ftl
View File

@ -26,6 +26,6 @@
<#elseif wildCardSuperBound>
? super <@includeModel object=typeBound />
<#else>
<#if imported>${name}<#else>${fullyQualifiedName}</#if></#if><#if (!ext.raw?? && typeParameters?size > 0) ><<#list typeParameters as typeParameter><@includeModel object=typeParameter /><#if typeParameter_has_next>, </#if></#list>>
${referenceName}</#if><#if (!ext.raw?? && typeParameters?size > 0) ><<#list typeParameters as typeParameter><@includeModel object=typeParameter /><#if typeParameter_has_next>, </#if></#list>>
</#if>
</@compress>

53
processor/src/test/java/org/mapstruct/ap/test/bugs/_1460/Issue1460Mapper.java Normal file
View File

@ -0,0 +1,53 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.bugs._1460;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
/**
* @author Christian Bandowski
*/
@Mapper
public abstract class Issue1460Mapper {
public static final Issue1460Mapper INSTANCE = Mappers.getMapper( Issue1460Mapper.class );
public abstract Target map(Source source);
public abstract String forceUsageOfIssue1460Enum(Issue1460Enum source);
public abstract String forceUsageOfLocale(Locale source);
public abstract String forceUsageOfLocalDate(LocalDate source);
public abstract String forceUsageOfDateTime(DateTime source);
public static class Issue1460Enum {
}
public static class Locale {
}
public static class LocalDate {
}
public static class DateTime {
}
}

67
processor/src/test/java/org/mapstruct/ap/test/bugs/_1460/Issue1460Test.java Normal file
View File

@ -0,0 +1,67 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.bugs._1460;
import java.util.Date;
import java.util.Locale;
import org.joda.time.DateTime;
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.assertj.core.api.Assertions.assertThat;
/**
* @author Christian Bandowski
*/
@WithClasses({
Issue1460Mapper.class,
Source.class,
Target.class
})
@RunWith(AnnotationProcessorTestRunner.class)
@IssueKey("1460")
public class Issue1460Test {
@Test
public void shouldTestMappingLocalDates() {
long dateInMs = 1524693600000L;
String dateAsString = "2018-04-26";
String dateTimeAsString = dateAsString + "T00:00:00+00:00";
Source source = new Source();
source.setStringToEnum( "OK" );
source.setDateToJodaDateTime( new Date( dateInMs ) );
source.setJodaDateTimeToCalendar( DateTime.parse( dateTimeAsString ) );
Target target = Issue1460Mapper.INSTANCE.map( source );
assertThat( target ).isNotNull();
assertThat( target.getStringToEnum() ).isEqualTo( Target.Issue1460Enum.OK );
assertThat( target.getDateToJodaDateTime() ).isEqualTo(
new DateTime( new Date( dateInMs ) )
);
assertThat( target.getJodaDateTimeToCalendar().getTimeInMillis() ).isEqualTo(
DateTime.parse( dateTimeAsString ).toCalendar( Locale.getDefault() ).getTimeInMillis()
);
}
}

53
processor/src/test/java/org/mapstruct/ap/test/bugs/_1460/Source.java Normal file
View File

@ -0,0 +1,53 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.bugs._1460;
import java.util.Date;
import org.joda.time.DateTime;
public class Source {
private String stringToEnum;
private DateTime jodaDateTimeToCalendar;
private Date dateToJodaDateTime;
public String getStringToEnum() {
return stringToEnum;
}
public void setStringToEnum(String stringToEnum) {
this.stringToEnum = stringToEnum;
}
public DateTime getJodaDateTimeToCalendar() {
return jodaDateTimeToCalendar;
}
public void setJodaDateTimeToCalendar(DateTime jodaDateTimeToCalendar) {
this.jodaDateTimeToCalendar = jodaDateTimeToCalendar;
}
public Date getDateToJodaDateTime() {
return dateToJodaDateTime;
}
public void setDateToJodaDateTime(Date dateToJodaDateTime) {
this.dateToJodaDateTime = dateToJodaDateTime;
}
}

57
processor/src/test/java/org/mapstruct/ap/test/bugs/_1460/Target.java Normal file
View File

@ -0,0 +1,57 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.bugs._1460;
import java.util.Calendar;
import org.joda.time.DateTime;
public class Target {
public enum Issue1460Enum {
OK, KO;
}
private Issue1460Enum stringToEnum;
private Calendar jodaDateTimeToCalendar;
private DateTime dateToJodaDateTime;
public Issue1460Enum getStringToEnum() {
return stringToEnum;
}
public void setStringToEnum(Issue1460Enum stringToEnum) {
this.stringToEnum = stringToEnum;
}
public Calendar getJodaDateTimeToCalendar() {
return jodaDateTimeToCalendar;
}
public void setJodaDateTimeToCalendar(Calendar jodaDateTimeToCalendar) {
this.jodaDateTimeToCalendar = jodaDateTimeToCalendar;
}
public DateTime getDateToJodaDateTime() {
return dateToJodaDateTime;
}
public void setDateToJodaDateTime(DateTime dateToJodaDateTime) {
this.dateToJodaDateTime = dateToJodaDateTime;
}
}

38
processor/src/test/java/org/mapstruct/ap/test/bugs/_1460/java8/Issue1460JavaTimeMapper.java Normal file
View File

@ -0,0 +1,38 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.bugs._1460.java8;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
/**
* @author Christian Bandowski
*/
@Mapper
public abstract class Issue1460JavaTimeMapper {
public static final Issue1460JavaTimeMapper INSTANCE = Mappers.getMapper( Issue1460JavaTimeMapper.class );
public abstract Target map(Source source);
public abstract String forceUsageOfLocalDate(LocalDate source);
public static class LocalDate {
}
}

55
processor/src/test/java/org/mapstruct/ap/test/bugs/_1460/java8/Issue1460JavaTimeTest.java Normal file
View File

@ -0,0 +1,55 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.bugs._1460.java8;
import java.time.LocalDate;
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.assertj.core.api.Assertions.assertThat;
/**
* @author Christian Bandowski
*/
@WithClasses({
Issue1460JavaTimeMapper.class,
Source.class,
Target.class
})
@RunWith(AnnotationProcessorTestRunner.class)
@IssueKey("1460")
public class Issue1460JavaTimeTest {
@Test
public void shouldTestMappingLocalDates() {
String dateAsString = "2018-04-26";
Source source = new Source();
source.setStringToJavaLocalDate( dateAsString );
Target target = Issue1460JavaTimeMapper.INSTANCE.map( source );
assertThat( target ).isNotNull();
assertThat( target.getStringToJavaLocalDate() ).isEqualTo( LocalDate.parse( dateAsString ) );
}
}

32
processor/src/test/java/org/mapstruct/ap/test/bugs/_1460/java8/Source.java Normal file
View File

@ -0,0 +1,32 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.bugs._1460.java8;
public class Source {
private String stringToJavaLocalDate;
public String getStringToJavaLocalDate() {
return stringToJavaLocalDate;
}
public void setStringToJavaLocalDate(String stringToJavaLocalDate) {
this.stringToJavaLocalDate = stringToJavaLocalDate;
}
}

34
processor/src/test/java/org/mapstruct/ap/test/bugs/_1460/java8/Target.java Normal file
View File

@ -0,0 +1,34 @@
/**
* Copyright 2012-2017 Gunnar Morling (http://www.gunnarmorling.de/)
* and/or other contributors as indicated by the @authors tag. See the
* copyright.txt file in the distribution for a full listing of all
* contributors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.mapstruct.ap.test.bugs._1460.java8;
import java.time.LocalDate;
public class Target {
private LocalDate stringToJavaLocalDate;
public LocalDate getStringToJavaLocalDate() {
return stringToJavaLocalDate;
}
public void setStringToJavaLocalDate(LocalDate stringToJavaLocalDate) {
this.stringToJavaLocalDate = stringToJavaLocalDate;
}
}