Skip to content

Store TypeDescriptors as fields in generated ConversionServiceAdapter #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chessray merged 3 commits into from
Jul 15, 2024
Merged

Store TypeDescriptors as fields in generated ConversionServiceAdapter #108

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f3f478
Store TypeDescriptors as fields in generated ConversionServiceAdapter…
jbonzohln Jul 5, 2024
3fc125a
Store TypeDescriptors as fields in generated ConversionServiceAdapter…
jbonzohln Jul 15, 2024
7f6dce1
Handle Arrays
jbonzohln Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 22 additions & 19 deletions ...ain/java/org/mapstruct/extensions/spring/converter/ConversionServiceAdapterGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import com.squareup.javapoet.*;
import java.time.Clock;
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;

Expand Down Expand Up @@ -39,11 +40,29 @@ protected TypeSpec createMainTypeSpec(
return adapterClassTypeSpec
.addAnnotation(COMPONENT_ANNOTATION_CLASS_NAME)
.addField(conversionServiceFieldSpec)
.addFields(buildTypeDescriptorFields(descriptor, conversionServiceFieldSpec))
.addMethod(buildConstructorSpec(descriptor, conversionServiceFieldSpec))
.addMethods(buildMappingMethods(descriptor, conversionServiceFieldSpec))
.build();
}

private List<FieldSpec> buildTypeDescriptorFields(ConversionServiceAdapterDescriptor descriptor, FieldSpec conversionServiceFieldSpec)
{
return descriptor.getFromToMappings().stream()
.flatMap(fromToMapping -> Stream.of(fromToMapping.getSource(), fromToMapping.getTarget()))
.distinct()
.map(typeName -> FieldSpec.builder(TYPE_DESCRIPTOR_CLASS_NAME, fieldName(typeName), PRIVATE, FINAL)
Comment thread
jbonzohln marked this conversation as resolved.
Outdated
.initializer(String.format("%s", typeDescriptorFormat(typeName)), typeDescriptorArguments(typeName).toArray()).build())
.collect(toList());
}

private String fieldName(TypeName typeName) {
return "typeDescriptor_" + typeName.toString()
Comment thread
jbonzohln marked this conversation as resolved.
Outdated
.replace('.', '_')
.replace('<', '_')
.replace('>', '_');
}

private static MethodSpec buildConstructorSpec(
final ConversionServiceAdapterDescriptor descriptor,
final FieldSpec conversionServiceFieldSpec) {
Expand Down Expand Up @@ -110,28 +129,12 @@ private MethodSpec toMappingMethodSpec(
.addStatement(
String.format(
"return ($T) $N.convert($N, %s, %s)",
typeDescriptorFormat(fromToMapping.getSource()),
typeDescriptorFormat(fromToMapping.getTarget())),
allTypeDescriptorArguments(
injectedConversionServiceFieldSpec, sourceParameterSpec, fromToMapping))
fieldName(fromToMapping.getSource()),
fieldName(fromToMapping.getTarget())),
fromToMapping.getTarget(), injectedConversionServiceFieldSpec, sourceParameterSpec)
.build();
}

private Object[] allTypeDescriptorArguments(
final FieldSpec injectedConversionServiceFieldSpec,
final ParameterSpec sourceParameterSpec,
final FromToMapping fromToMapping) {
return concat(
concat(
Stream.of(
fromToMapping.getTarget(),
injectedConversionServiceFieldSpec,
sourceParameterSpec),
typeDescriptorArguments(fromToMapping.getSource())),
typeDescriptorArguments(fromToMapping.getTarget()))
.toArray();
}

private String typeDescriptorFormat(final TypeName typeName) {
if (typeName instanceof ParameterizedTypeName
&& isCollectionWithGenericParameter((ParameterizedTypeName) typeName)) {
Expand Down
12 changes: 10 additions & 2 deletions extensions/src/test/resources/ConversionServiceAdapterCustomBeanJava8Generated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,24 @@
public class ConversionServiceAdapter {
private final ConversionService conversionService;

private final TypeDescriptor typeDescriptor_test_Car = TypeDescriptor.valueOf(Car.class);

private final TypeDescriptor typeDescriptor_test_CarDto = TypeDescriptor.valueOf(CarDto.class);

private final TypeDescriptor typeDescriptor_java_util_List_test_Car_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class));

private final TypeDescriptor typeDescriptor_java_util_List_test_CarDto_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class));

public ConversionServiceAdapter(
@Qualifier("myConversionService") @Lazy final ConversionService conversionService) {
this.conversionService = conversionService;
}

public CarDto toDto(final Car source) {
return (CarDto) conversionService.convert(source, TypeDescriptor.valueOf(Car.class), TypeDescriptor.valueOf(CarDto.class));
return (CarDto) conversionService.convert(source, typeDescriptor_test_Car, typeDescriptor_test_CarDto);
}

public List<CarDto> mapListOfCarToListOfCarDto(final List<Car> source) {
return (List<CarDto>) conversionService.convert(source, TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class)), TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class)));
return (List<CarDto>) conversionService.convert(source, typeDescriptor_java_util_List_test_Car_, typeDescriptor_java_util_List_test_CarDto_);
}
}
12 changes: 10 additions & 2 deletions extensions/src/test/resources/ConversionServiceAdapterCustomBeanJava9PlusGenerated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,24 @@
public class ConversionServiceAdapter {
private final ConversionService conversionService;

private final TypeDescriptor typeDescriptor_test_Car = TypeDescriptor.valueOf(Car.class);

private final TypeDescriptor typeDescriptor_test_CarDto = TypeDescriptor.valueOf(CarDto.class);

private final TypeDescriptor typeDescriptor_java_util_List_test_Car_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class));

private final TypeDescriptor typeDescriptor_java_util_List_test_CarDto_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class));

public ConversionServiceAdapter(
@Qualifier("myConversionService") @Lazy final ConversionService conversionService) {
this.conversionService = conversionService;
}

public CarDto toDto(final Car source) {
return (CarDto) conversionService.convert(source, TypeDescriptor.valueOf(Car.class), TypeDescriptor.valueOf(CarDto.class));
return (CarDto) conversionService.convert(source, typeDescriptor_test_Car, typeDescriptor_test_CarDto);
}

public List<CarDto> mapListOfCarToListOfCarDto(final List<Car> source) {
return (List<CarDto>) conversionService.convert(source, TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class)), TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class)));
return (List<CarDto>) conversionService.convert(source, typeDescriptor_java_util_List_test_Car_, typeDescriptor_java_util_List_test_CarDto_);
}
}
12 changes: 10 additions & 2 deletions extensions/src/test/resources/ConversionServiceAdapterCustomBeanNoGenerated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,24 @@
public class ConversionServiceAdapter {
private final ConversionService conversionService;

private final TypeDescriptor typeDescriptor_test_Car = TypeDescriptor.valueOf(Car.class);

private final TypeDescriptor typeDescriptor_test_CarDto = TypeDescriptor.valueOf(CarDto.class);

private final TypeDescriptor typeDescriptor_java_util_List_test_Car_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class));

private final TypeDescriptor typeDescriptor_java_util_List_test_CarDto_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class));

public ConversionServiceAdapter(
@Qualifier("myConversionService") @Lazy final ConversionService conversionService) {
this.conversionService = conversionService;
}

public CarDto toDto(final Car source) {
return (CarDto) conversionService.convert(source, TypeDescriptor.valueOf(Car.class), TypeDescriptor.valueOf(CarDto.class));
return (CarDto) conversionService.convert(source, typeDescriptor_test_Car, typeDescriptor_test_CarDto);
}

public List<CarDto> mapListOfCarToListOfCarDto(final List<Car> source) {
return (List<CarDto>) conversionService.convert(source, TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class)), TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class)));
return (List<CarDto>) conversionService.convert(source, typeDescriptor_java_util_List_test_Car_, typeDescriptor_java_util_List_test_CarDto_);
}
}
13 changes: 11 additions & 2 deletions extensions/src/test/resources/ConversionServiceAdapterJava8Generated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,24 @@
public class ConversionServiceAdapter {
private final ConversionService conversionService;

private final TypeDescriptor typeDescriptor_test_Car = TypeDescriptor.valueOf(Car.class);

private final TypeDescriptor typeDescriptor_test_CarDto = TypeDescriptor.valueOf(CarDto.class);

private final TypeDescriptor typeDescriptor_java_util_List_test_Car_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class));

private final TypeDescriptor typeDescriptor_java_util_List_test_CarDto_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class));


public ConversionServiceAdapter(@Lazy final ConversionService conversionService) {
this.conversionService = conversionService;
}

public CarDto toDto(final Car source) {
return (CarDto) conversionService.convert(source, TypeDescriptor.valueOf(Car.class), TypeDescriptor.valueOf(CarDto.class));
return (CarDto) conversionService.convert(source, typeDescriptor_test_Car, typeDescriptor_test_CarDto);
}

public List<CarDto> mapListOfCarToListOfCarDto(final List<Car> source) {
return (List<CarDto>) conversionService.convert(source, TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class)), TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class)));
return (List<CarDto>) conversionService.convert(source, typeDescriptor_java_util_List_test_Car_, typeDescriptor_java_util_List_test_CarDto_);
}
}
15 changes: 12 additions & 3 deletions extensions/src/test/resources/ConversionServiceAdapterJava8GeneratedNoDate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,24 @@
public class ConversionServiceAdapter {
private final ConversionService conversionService;

public ConversionServiceAdapter(@Lazy final ConversionService conversionService) {
private final TypeDescriptor typeDescriptor_test_Car = TypeDescriptor.valueOf(Car.class);

private final TypeDescriptor typeDescriptor_test_CarDto = TypeDescriptor.valueOf(CarDto.class);

private final TypeDescriptor typeDescriptor_java_util_List_test_Car_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class));

private final TypeDescriptor typeDescriptor_java_util_List_test_CarDto_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class));

public ConversionServiceAdapter(
@Lazy final ConversionService conversionService) {
this.conversionService = conversionService;
}

public CarDto toDto(final Car source) {
return (CarDto) conversionService.convert(source, TypeDescriptor.valueOf(Car.class), TypeDescriptor.valueOf(CarDto.class));
return (CarDto) conversionService.convert(source, typeDescriptor_test_Car, typeDescriptor_test_CarDto);
}

public List<CarDto> mapListOfCarToListOfCarDto(final List<Car> source) {
return (List<CarDto>) conversionService.convert(source, TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class)), TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class)));
return (List<CarDto>) conversionService.convert(source, typeDescriptor_java_util_List_test_Car_, typeDescriptor_java_util_List_test_CarDto_);
}
}
15 changes: 12 additions & 3 deletions extensions/src/test/resources/ConversionServiceAdapterJava9PlusGenerated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,24 @@
public class ConversionServiceAdapter {
private final ConversionService conversionService;

public ConversionServiceAdapter(@Lazy final ConversionService conversionService) {
private final TypeDescriptor typeDescriptor_test_Car = TypeDescriptor.valueOf(Car.class);

private final TypeDescriptor typeDescriptor_test_CarDto = TypeDescriptor.valueOf(CarDto.class);

private final TypeDescriptor typeDescriptor_java_util_List_test_Car_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class));

private final TypeDescriptor typeDescriptor_java_util_List_test_CarDto_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class));

public ConversionServiceAdapter(
@Lazy final ConversionService conversionService) {
this.conversionService = conversionService;
}

public CarDto toDto(final Car source) {
return (CarDto) conversionService.convert(source, TypeDescriptor.valueOf(Car.class), TypeDescriptor.valueOf(CarDto.class));
return (CarDto) conversionService.convert(source, typeDescriptor_test_Car, typeDescriptor_test_CarDto);
}

public List<CarDto> mapListOfCarToListOfCarDto(final List<Car> source) {
return (List<CarDto>) conversionService.convert(source, TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class)), TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class)));
return (List<CarDto>) conversionService.convert(source, typeDescriptor_java_util_List_test_Car_, typeDescriptor_java_util_List_test_CarDto_);
}
}
15 changes: 12 additions & 3 deletions extensions/src/test/resources/ConversionServiceAdapterJava9PlusGeneratedNoDate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,24 @@
public class ConversionServiceAdapter {
private final ConversionService conversionService;

public ConversionServiceAdapter(@Lazy final ConversionService conversionService) {
private final TypeDescriptor typeDescriptor_test_Car = TypeDescriptor.valueOf(Car.class);

private final TypeDescriptor typeDescriptor_test_CarDto = TypeDescriptor.valueOf(CarDto.class);

private final TypeDescriptor typeDescriptor_java_util_List_test_Car_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class));

private final TypeDescriptor typeDescriptor_java_util_List_test_CarDto_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class));

public ConversionServiceAdapter(
@Lazy final ConversionService conversionService) {
this.conversionService = conversionService;
}

public CarDto toDto(final Car source) {
return (CarDto) conversionService.convert(source, TypeDescriptor.valueOf(Car.class), TypeDescriptor.valueOf(CarDto.class));
return (CarDto) conversionService.convert(source, typeDescriptor_test_Car, typeDescriptor_test_CarDto);
}

public List<CarDto> mapListOfCarToListOfCarDto(final List<Car> source) {
return (List<CarDto>) conversionService.convert(source, TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class)), TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class)));
return (List<CarDto>) conversionService.convert(source, typeDescriptor_java_util_List_test_Car_, typeDescriptor_java_util_List_test_CarDto_);
}
}
15 changes: 12 additions & 3 deletions extensions/src/test/resources/ConversionServiceAdapterNoGenerated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,24 @@
public class ConversionServiceAdapter {
private final ConversionService conversionService;

public ConversionServiceAdapter(@Lazy final ConversionService conversionService) {
private final TypeDescriptor typeDescriptor_test_Car = TypeDescriptor.valueOf(Car.class);

private final TypeDescriptor typeDescriptor_test_CarDto = TypeDescriptor.valueOf(CarDto.class);

private final TypeDescriptor typeDescriptor_java_util_List_test_Car_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class));

private final TypeDescriptor typeDescriptor_java_util_List_test_CarDto_ = TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class));

public ConversionServiceAdapter(
@Lazy final ConversionService conversionService) {
this.conversionService = conversionService;
}

public CarDto toDto(final Car source) {
return (CarDto) conversionService.convert(source, TypeDescriptor.valueOf(Car.class), TypeDescriptor.valueOf(CarDto.class));
return (CarDto) conversionService.convert(source, typeDescriptor_test_Car, typeDescriptor_test_CarDto);
}

public List<CarDto> mapListOfCarToListOfCarDto(final List<Car> source) {
return (List<CarDto>) conversionService.convert(source, TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(Car.class)), TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(CarDto.class)));
return (List<CarDto>) conversionService.convert(source, typeDescriptor_java_util_List_test_Car_, typeDescriptor_java_util_List_test_CarDto_);
}
}