Skip to content

Commit 7bee121

Browse files
sjaakdsjaakd
authored
#1307 & #1845 remove deprecated enummapping & create ST - refs under bean mapping
#1307 remove deprecated enum mapping #1845 create source / target references under bean mapping
1 parent 1198269 commit 7bee121

File tree

43 files changed

+975
-1637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+975
-1637
lines changed

‎processor/src/main/java/org/mapstruct/ap/internal/conversion/Conversions.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.mapstruct.ap.internal.model.common.TypeFactory;
2828
import org.mapstruct.ap.internal.util.JodaTimeConstants;
2929

30-
import static org.mapstruct.ap.internal.conversion.ReverseConversion.reverse;
30+
import static org.mapstruct.ap.internal.conversion.ReverseConversion.inverse;
3131

3232
/**
3333
* Holds built-in {@link ConversionProvider}s such as from {@code int} to {@code String}.
@@ -244,7 +244,7 @@ else if ( sourceType.isPrimitive() && !targetType.isPrimitive() ) {
244244
register( sourceType, targetType, new PrimitiveToWrapperConversion( sourceType, targetType ) );
245245
}
246246
else if ( !sourceType.isPrimitive() && targetType.isPrimitive() ) {
247-
register( sourceType, targetType, reverse( new PrimitiveToWrapperConversion( targetType, sourceType ) ) );
247+
register( sourceType, targetType, inverse( new PrimitiveToWrapperConversion( targetType, sourceType ) ) );
248248
}
249249
else {
250250
register( sourceType, targetType, new WrapperToWrapperConversion( sourceType, targetType ) );
@@ -283,15 +283,15 @@ private void register(Class<?> sourceClass, Class<?> targetClass, ConversionProv
283283
Type targetType = typeFactory.getType( targetClass );
284284

285285
conversions.put( new Key( sourceType, targetType ), conversion );
286-
conversions.put( new Key( targetType, sourceType ), reverse( conversion ) );
286+
conversions.put( new Key( targetType, sourceType ), inverse( conversion ) );
287287
}
288288

289289
private void register(String sourceTypeName, Class<?> targetClass, ConversionProvider conversion) {
290290
Type sourceType = typeFactory.getType( sourceTypeName );
291291
Type targetType = typeFactory.getType( targetClass );
292292

293293
conversions.put( new Key( sourceType, targetType ), conversion );
294-
conversions.put( new Key( targetType, sourceType ), reverse( conversion ) );
294+
conversions.put( new Key( targetType, sourceType ), inverse( conversion ) );
295295
}
296296

297297
public ConversionProvider getConversion(Type sourceType, Type targetType) {

‎processor/src/main/java/org/mapstruct/ap/internal/conversion/ReverseConversion.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.mapstruct.ap.internal.model.HelperMethod;
1313

1414
/**
15-
* A {@link ConversionProvider} which creates the reversed conversions for a
15+
* * A {@link ConversionProvider} which creates the inversed conversions for a
1616
* given conversion provider.
1717
*
1818
* @author Gunnar Morling
@@ -21,7 +21,7 @@ public class ReverseConversion implements ConversionProvider {
2121

2222
private ConversionProvider conversionProvider;
2323

24-
public static ReverseConversion reverse(ConversionProvider conversionProvider) {
24+
public static ReverseConversion inverse(ConversionProvider conversionProvider) {
2525
return new ReverseConversion( conversionProvider );
2626
}
2727

‎processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java‎

Lines changed: 107 additions & 65 deletions
Large diffs are not rendered by default.

‎processor/src/main/java/org/mapstruct/ap/internal/model/EnumMappingMethod.java‎

Lines changed: 0 additions & 201 deletions
This file was deleted.

0 commit comments

Comments
 (0)