diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/AbstractJavaTimeToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/AbstractJavaTimeToStringConversion.java index c5ddf0b1e..79726c90b 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/AbstractJavaTimeToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/conversion/AbstractJavaTimeToStringConversion.java @@ -23,6 +23,7 @@ import java.util.Set; import org.mapstruct.ap.model.common.ConversionContext; import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.util.Collections; +import org.mapstruct.ap.util.JavaTimeConstants; import org.mapstruct.ap.util.Strings; /** @@ -83,24 +84,14 @@ public abstract class AbstractJavaTimeToStringConversion extends SimpleConversio @Override protected Set getToConversionImportTypes(ConversionContext conversionContext) { return Collections.asSet( - conversionContext.getTypeFactory().getType( dateTimeFormatterClass() ) + conversionContext.getTypeFactory().getType( JavaTimeConstants.DATE_TIME_FORMATTER_FQN ) ); } @Override protected Set getFromConversionImportTypes(ConversionContext conversionContext) { return Collections.asSet( - conversionContext.getTypeFactory().getType( dateTimeFormatterClass() ) + conversionContext.getTypeFactory().getType( JavaTimeConstants.DATE_TIME_FORMATTER_FQN ) ); } - - private Class dateTimeFormatterClass() { - try { - return Class.forName( "java.time.format.DateTimeFormatter" ); - } - catch ( ClassNotFoundException e ) { - throw new RuntimeException( "java.time.format.DateTimeFormatter not found on classpath" ); - } - } - } diff --git a/processor/src/main/java/org/mapstruct/ap/util/JavaTimeConstants.java b/processor/src/main/java/org/mapstruct/ap/util/JavaTimeConstants.java index e6fb6ebf5..b00edd606 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/JavaTimeConstants.java +++ b/processor/src/main/java/org/mapstruct/ap/util/JavaTimeConstants.java @@ -27,6 +27,7 @@ public final class JavaTimeConstants { 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() { }