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

#2351 NullValueMappingStrategy for Maps and Iterables

Browse Source 
With two new parameters for Mapper and MapperConfig, it is now possible to override the nullValueMappingStrategy specifically for MapMapping and IterableMapping.
This commit is contained in:
Henning Pöttker 2021-10-25 12:20:11 +02:00 committed by Filip Hrisafov
parent 80d26a1a9c
commit e32fc8c283
18 changed files with 453 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/main/java/org/mapstruct/Mapper.java
View File

@ -203,6 +203,32 @@ public @interface Mapper {
*/
NullValueMappingStrategy nullValueMappingStrategy() default NullValueMappingStrategy.RETURN_NULL;
/**
* The strategy to be applied when {@code null} is passed as source argument value to an {@link IterableMapping} of
* this mapper. If unset, the strategy set with {@link #nullValueMappingStrategy()} will be applied. If neither
* strategy is configured, the strategy given via {@link MapperConfig#nullValueIterableMappingStrategy()} will be
* applied, using {@link NullValueMappingStrategy#RETURN_NULL} by default.
*
* @since 1.5
*
* @return The strategy to be applied when {@code null} is passed as source value to an {@link IterableMapping} of
* this mapper.
*/
NullValueMappingStrategy nullValueIterableMappingStrategy() default NullValueMappingStrategy.RETURN_NULL;
/**
* The strategy to be applied when {@code null} is passed as source argument value to a {@link MapMapping} of this
* mapper. If unset, the strategy set with {@link #nullValueMappingStrategy()} will be applied. If neither strategy
* is configured, the strategy given via {@link MapperConfig#nullValueMapMappingStrategy()} will be applied, using
* {@link NullValueMappingStrategy#RETURN_NULL} by default.
*
* @since 1.5
*
* @return The strategy to be applied when {@code null} is passed as source value to a {@link MapMapping} of this
* mapper.
*/
NullValueMappingStrategy nullValueMapMappingStrategy() default NullValueMappingStrategy.RETURN_NULL;
/**
* The strategy to be applied when a source bean property is {@code null} or not present. If no strategy is
* configured, the strategy given via {@link MapperConfig#nullValuePropertyMappingStrategy()} will be applied,

22
core/src/main/java/org/mapstruct/MapperConfig.java
View File

@ -177,6 +177,28 @@ public @interface MapperConfig {
*/
NullValueMappingStrategy nullValueMappingStrategy() default NullValueMappingStrategy.RETURN_NULL;
/**
* The strategy to be applied when {@code null} is passed as source argument value to an {@link IterableMapping}.
* If no strategy is configured, the strategy given via {@link #nullValueMappingStrategy()} will be applied, using
* {@link NullValueMappingStrategy#RETURN_NULL} by default.
*
* @since 1.5
*
* @return The strategy to be applied when {@code null} is passed as source value to an {@link IterableMapping}.
*/
NullValueMappingStrategy nullValueIterableMappingStrategy() default NullValueMappingStrategy.RETURN_NULL;
/**
* The strategy to be applied when {@code null} is passed as source argument value to a {@link MapMapping}.
* If no strategy is configured, the strategy given via {@link #nullValueMappingStrategy()} will be applied, using
* {@link NullValueMappingStrategy#RETURN_NULL} by default.
*
* @since 1.5
*
* @return The strategy to be applied when {@code null} is passed as source value to a {@link MapMapping}.
*/
NullValueMappingStrategy nullValueMapMappingStrategy() default NullValueMappingStrategy.RETURN_NULL;
/**
* The strategy to be applied when a source bean property is {@code null} or not present. If no strategy is
* configured, {@link NullValuePropertyMappingStrategy#SET_TO_NULL} will be used by default.

8
processor/src/main/java/org/mapstruct/ap/internal/model/source/DefaultOptions.java
View File

@ -124,6 +124,14 @@ public class DefaultOptions extends DelegatingOptions {
return SubclassExhaustiveStrategyGem.valueOf( mapper.subclassExhaustiveStrategy().getDefaultValue() );
}
public NullValueMappingStrategyGem getNullValueIterableMappingStrategy() {
return NullValueMappingStrategyGem.valueOf( mapper.nullValueIterableMappingStrategy().getDefaultValue() );
}
public NullValueMappingStrategyGem getNullValueMapMappingStrategy() {
return NullValueMappingStrategyGem.valueOf( mapper.nullValueMapMappingStrategy().getDefaultValue() );
}
public BuilderGem getBuilder() {
// TODO: I realized this is not correct, however it needs to be null in order to keep downward compatibility
// but assuming a default @Builder will make testcases fail. Not having a default means that you need to

8
processor/src/main/java/org/mapstruct/ap/internal/model/source/DelegatingOptions.java
View File

@ -102,6 +102,14 @@ public abstract class DelegatingOptions {
return next.getSubclassExhaustiveStrategy();
}
public NullValueMappingStrategyGem getNullValueIterableMappingStrategy() {
return next.getNullValueIterableMappingStrategy();
}
public NullValueMappingStrategyGem getNullValueMapMappingStrategy() {
return next.getNullValueMapMappingStrategy();
}
public BuilderGem getBuilder() {
return next.getBuilder();
}

8
processor/src/main/java/org/mapstruct/ap/internal/model/source/IterableMappingOptions.java
View File

@ -30,11 +30,11 @@ public class IterableMappingOptions extends DelegatingOptions {
private final IterableMappingGem iterableMapping;
public static IterableMappingOptions fromGem(IterableMappingGem iterableMapping,
MapperOptions mappperOptions, ExecutableElement method,
MapperOptions mapperOptions, ExecutableElement method,
FormattingMessager messager, TypeUtils typeUtils) {
if ( iterableMapping == null || !isConsistent( iterableMapping, method, messager ) ) {
IterableMappingOptions options = new IterableMappingOptions( null, null, null, mappperOptions );
IterableMappingOptions options = new IterableMappingOptions( null, null, null, mapperOptions );
return options;
}
@ -54,7 +54,7 @@ public class IterableMappingOptions extends DelegatingOptions {
);
IterableMappingOptions options =
new IterableMappingOptions( formatting, selection, iterableMapping, mappperOptions );
new IterableMappingOptions( formatting, selection, iterableMapping, mapperOptions );
return options;
}
@ -99,7 +99,7 @@ public class IterableMappingOptions extends DelegatingOptions {
.filter( GemValue::hasValue )
.map( GemValue::getValue )
.map( NullValueMappingStrategyGem::valueOf )
.orElse( next().getNullValueMappingStrategy() );
.orElse( next().getNullValueIterableMappingStrategy() );
}
public MappingControl getElementMappingControl(ElementUtils elementUtils) {

2
processor/src/main/java/org/mapstruct/ap/internal/model/source/MapMappingOptions.java
View File

@ -144,7 +144,7 @@ public class MapMappingOptions extends DelegatingOptions {
.filter( GemValue::hasValue )
.map( GemValue::getValue )
.map( NullValueMappingStrategyGem::valueOf )
.orElse( next().getNullValueMappingStrategy() );
.orElse( next().getNullValueMapMappingStrategy() );
}
public MappingControl getKeyMappingControl(ElementUtils elementUtils) {

22
processor/src/main/java/org/mapstruct/ap/internal/model/source/MapperConfigOptions.java
View File

@ -134,6 +134,28 @@ public class MapperConfigOptions extends DelegatingOptions {
next().getSubclassExhaustiveStrategy();
}
@Override
public NullValueMappingStrategyGem getNullValueIterableMappingStrategy() {
if ( mapperConfig.nullValueIterableMappingStrategy().hasValue() ) {
return NullValueMappingStrategyGem.valueOf( mapperConfig.nullValueIterableMappingStrategy().get() );
}
if ( mapperConfig.nullValueMappingStrategy().hasValue() ) {
return NullValueMappingStrategyGem.valueOf( mapperConfig.nullValueMappingStrategy().get() );
}
return next().getNullValueIterableMappingStrategy();
}
@Override
public NullValueMappingStrategyGem getNullValueMapMappingStrategy() {
if ( mapperConfig.nullValueMapMappingStrategy().hasValue() ) {
return NullValueMappingStrategyGem.valueOf( mapperConfig.nullValueMapMappingStrategy().get() );
}
if ( mapperConfig.nullValueMappingStrategy().hasValue() ) {
return NullValueMappingStrategyGem.valueOf( mapperConfig.nullValueMappingStrategy().get() );
}
return next().getNullValueMapMappingStrategy();
}
@Override
public BuilderGem getBuilder() {
return mapperConfig.builder().hasValue() ? mapperConfig.builder().get() : next().getBuilder();

22
processor/src/main/java/org/mapstruct/ap/internal/model/source/MapperOptions.java
View File

@ -163,6 +163,28 @@ public class MapperOptions extends DelegatingOptions {
next().getSubclassExhaustiveStrategy();
}
@Override
public NullValueMappingStrategyGem getNullValueIterableMappingStrategy() {
if ( mapper.nullValueIterableMappingStrategy().hasValue() ) {
return NullValueMappingStrategyGem.valueOf( mapper.nullValueIterableMappingStrategy().get() );
}
if ( mapper.nullValueMappingStrategy().hasValue() ) {
return NullValueMappingStrategyGem.valueOf( mapper.nullValueMappingStrategy().get() );
}
return next().getNullValueIterableMappingStrategy();
}
@Override
public NullValueMappingStrategyGem getNullValueMapMappingStrategy() {
if ( mapper.nullValueMapMappingStrategy().hasValue() ) {
return NullValueMappingStrategyGem.valueOf( mapper.nullValueMapMappingStrategy().get() );
}
if ( mapper.nullValueMappingStrategy().hasValue() ) {
return NullValueMappingStrategyGem.valueOf( mapper.nullValueMappingStrategy().get() );
}
return next().getNullValueMapMappingStrategy();
}
@Override
public BuilderGem getBuilder() {
return mapper.builder().hasValue() ? mapper.builder().get() : next().getBuilder();

11
processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapper.java
View File

@ -16,7 +16,6 @@ import org.mapstruct.IterableMapping;
import org.mapstruct.MapMapping;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.ap.test.nullvaluemapping._target.CarDto;
import org.mapstruct.ap.test.nullvaluemapping._target.DriverAndCarDto;
import org.mapstruct.ap.test.nullvaluemapping.source.Car;
@ -29,18 +28,14 @@ public interface CarMapper {
CarMapper INSTANCE = Mappers.getMapper( CarMapper.class );
@BeanMapping(nullValueMappingStrategy = RETURN_DEFAULT)
@Mappings({
@Mapping(target = "seatCount", source = "numberOfSeats"),
@Mapping(target = "model", constant = "ModelT"),
@Mapping(target = "seatCount", source = "numberOfSeats")
@Mapping(target = "model", constant = "ModelT")
@Mapping(target = "catalogId", expression = "java( UUID.randomUUID().toString() )")
})
CarDto carToCarDto(Car car);
@BeanMapping(nullValueMappingStrategy = RETURN_DEFAULT)
@Mappings({
@Mapping(target = "seatCount", source = "car.numberOfSeats"),
@Mapping(target = "seatCount", source = "car.numberOfSeats")
@Mapping(target = "catalogId", expression = "java( UUID.randomUUID().toString() )")
})
CarDto carToCarDto(Car car, String model);
@IterableMapping(nullValueMappingStrategy = RETURN_DEFAULT)

35
processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapperIterableSettingOnConfig.java Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.nullvaluemapping;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.mapstruct.IterableMapping;
import org.mapstruct.MapMapping;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ap.test.nullvaluemapping._target.CarDto;
import org.mapstruct.ap.test.nullvaluemapping.source.Car;
import org.mapstruct.factory.Mappers;
@Mapper(imports = UUID.class, config = CentralIterableMappingConfig.class)
public interface CarMapperIterableSettingOnConfig {
CarMapperIterableSettingOnConfig INSTANCE = Mappers.getMapper( CarMapperIterableSettingOnConfig.class );
@Mapping(target = "seatCount", source = "numberOfSeats")
@Mapping(target = "model", constant = "ModelT")
@Mapping(target = "catalogId", expression = "java( UUID.randomUUID().toString() )")
CarDto carToCarDto(Car car);
@IterableMapping(dateFormat = "dummy")
List<CarDto> carsToCarDtos(List<Car> cars);
@MapMapping(valueDateFormat = "dummy")
Map<Integer, CarDto> carsToCarDtoMap(Map<Integer, Car> cars);
}

40
processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapperIterableSettingOnMapper.java Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.nullvaluemapping;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.mapstruct.IterableMapping;
import org.mapstruct.MapMapping;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.NullValueMappingStrategy;
import org.mapstruct.ap.test.nullvaluemapping._target.CarDto;
import org.mapstruct.ap.test.nullvaluemapping.source.Car;
import org.mapstruct.factory.Mappers;
@Mapper(
imports = UUID.class,
nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
nullValueIterableMappingStrategy = NullValueMappingStrategy.RETURN_NULL
)
public interface CarMapperIterableSettingOnMapper {
CarMapperIterableSettingOnMapper INSTANCE = Mappers.getMapper( CarMapperIterableSettingOnMapper.class );
@Mapping(target = "seatCount", source = "numberOfSeats")
@Mapping(target = "model", constant = "ModelT")
@Mapping(target = "catalogId", expression = "java( UUID.randomUUID().toString() )")
CarDto carToCarDto(Car car);
@IterableMapping(dateFormat = "dummy")
List<CarDto> carsToCarDtos(List<Car> cars);
@MapMapping(valueDateFormat = "dummy")
Map<Integer, CarDto> carsToCarDtoMap(Map<Integer, Car> cars);
}

35
processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapperMapSettingOnConfig.java Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.nullvaluemapping;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.mapstruct.IterableMapping;
import org.mapstruct.MapMapping;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.ap.test.nullvaluemapping._target.CarDto;
import org.mapstruct.ap.test.nullvaluemapping.source.Car;
import org.mapstruct.factory.Mappers;
@Mapper(imports = UUID.class, config = CentralMapMappingConfig.class)
public interface CarMapperMapSettingOnConfig {
CarMapperMapSettingOnConfig INSTANCE = Mappers.getMapper( CarMapperMapSettingOnConfig.class );
@Mapping(target = "seatCount", source = "numberOfSeats")
@Mapping(target = "model", constant = "ModelT")
@Mapping(target = "catalogId", expression = "java( UUID.randomUUID().toString() )")
CarDto carToCarDto(Car car);
@IterableMapping(dateFormat = "dummy")
List<CarDto> carsToCarDtos(List<Car> cars);
@MapMapping(valueDateFormat = "dummy")
Map<Integer, CarDto> carsToCarDtoMap(Map<Integer, Car> cars);
}

40
processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapperMapSettingOnMapper.java Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.nullvaluemapping;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.mapstruct.IterableMapping;
import org.mapstruct.MapMapping;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.NullValueMappingStrategy;
import org.mapstruct.ap.test.nullvaluemapping._target.CarDto;
import org.mapstruct.ap.test.nullvaluemapping.source.Car;
import org.mapstruct.factory.Mappers;
@Mapper(
imports = UUID.class,
nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
nullValueMapMappingStrategy = NullValueMappingStrategy.RETURN_NULL
)
public interface CarMapperMapSettingOnMapper {
CarMapperMapSettingOnMapper INSTANCE = Mappers.getMapper( CarMapperMapSettingOnMapper.class );
@Mapping(target = "seatCount", source = "numberOfSeats")
@Mapping(target = "model", constant = "ModelT")
@Mapping(target = "catalogId", expression = "java( UUID.randomUUID().toString() )")
CarDto carToCarDto(Car car);
@IterableMapping(dateFormat = "dummy")
List<CarDto> carsToCarDtos(List<Car> cars);
@MapMapping(valueDateFormat = "dummy")
Map<Integer, CarDto> carsToCarDtoMap(Map<Integer, Car> cars);
}

7
processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapperSettingOnConfig.java
View File

@ -13,7 +13,6 @@ import org.mapstruct.IterableMapping;
import org.mapstruct.MapMapping;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.NullValueMappingStrategy;
import org.mapstruct.ap.test.nullvaluemapping._target.CarDto;
import org.mapstruct.ap.test.nullvaluemapping.source.Car;
@ -24,11 +23,9 @@ public interface CarMapperSettingOnConfig {
CarMapperSettingOnConfig INSTANCE = Mappers.getMapper( CarMapperSettingOnConfig.class );
@Mappings({
@Mapping(target = "seatCount", source = "numberOfSeats"),
@Mapping(target = "model", constant = "ModelT"),
@Mapping(target = "seatCount", source = "numberOfSeats")
@Mapping(target = "model", constant = "ModelT")
@Mapping(target = "catalogId", expression = "java( UUID.randomUUID().toString() )")
})
CarDto carToCarDto(Car car);
@IterableMapping(dateFormat = "dummy")

7
processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapperSettingOnMapper.java
View File

@ -13,7 +13,6 @@ import org.mapstruct.IterableMapping;
import org.mapstruct.MapMapping;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Mappings;
import org.mapstruct.NullValueMappingStrategy;
import org.mapstruct.ap.test.nullvaluemapping._target.CarDto;
import org.mapstruct.ap.test.nullvaluemapping.source.Car;
@ -24,11 +23,9 @@ public interface CarMapperSettingOnMapper {
CarMapperSettingOnMapper INSTANCE = Mappers.getMapper( CarMapperSettingOnMapper.class );
@Mappings({
@Mapping(target = "seatCount", source = "numberOfSeats"),
@Mapping(target = "model", constant = "ModelT"),
@Mapping(target = "seatCount", source = "numberOfSeats")
@Mapping(target = "model", constant = "ModelT")
@Mapping(target = "catalogId", expression = "java( UUID.randomUUID().toString() )")
})
CarDto carToCarDto(Car car);
@IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT)

17
processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CentralIterableMappingConfig.java Normal file
View File

@ -0,0 +1,17 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.nullvaluemapping;
import org.mapstruct.MapperConfig;
import org.mapstruct.NullValueMappingStrategy;
@MapperConfig(
nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
nullValueIterableMappingStrategy = NullValueMappingStrategy.RETURN_NULL
)
public class CentralIterableMappingConfig {
}

17
processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CentralMapMappingConfig.java Normal file
View File

@ -0,0 +1,17 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.nullvaluemapping;
import org.mapstruct.MapperConfig;
import org.mapstruct.NullValueMappingStrategy;
@MapperConfig(
nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
nullValueMapMappingStrategy = NullValueMappingStrategy.RETURN_NULL
)
public class CentralMapMappingConfig {
}

150
processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/NullValueMappingTest.java
View File

@ -33,8 +33,14 @@ import static org.assertj.core.api.Assertions.assertThat;
DriverAndCarDto.class,
CarMapper.class,
CarMapperSettingOnMapper.class,
CarMapperIterableSettingOnMapper.class,
CarMapperMapSettingOnMapper.class,
CentralConfig.class,
CarMapperSettingOnConfig.class
CarMapperSettingOnConfig.class,
CentralIterableMappingConfig.class,
CarMapperIterableSettingOnConfig.class,
CentralMapMappingConfig.class,
CarMapperMapSettingOnConfig.class,
})
public class NullValueMappingTest {
@ -161,8 +167,7 @@ public class NullValueMappingTest {
List<CarDto> carDtos = CarMapperSettingOnMapper.INSTANCE.carsToCarDtos( null );
//then
assertThat( carDtos ).isNotNull();
assertThat( carDtos.isEmpty() ).isTrue();
assertThat( carDtos ).isEmpty();
}
@ProcessorTest
@ -175,6 +180,74 @@ public class NullValueMappingTest {
assertThat( carDtoMap ).isNull();
}
@ProcessorTest
public void shouldMapExpressionAndConstantRegardlessOfIterableNullArgOnMapper() {
//when
CarDto carDto = CarMapperIterableSettingOnMapper.INSTANCE.carToCarDto( null );
//then
assertThat( carDto ).isNotNull();
assertThat( carDto.getMake() ).isNull();
assertThat( carDto.getSeatCount() ).isEqualTo( 0 );
assertThat( carDto.getModel() ).isEqualTo( "ModelT" );
assertThat( carDto.getCatalogId() ).isNotEmpty();
}
@ProcessorTest
public void shouldMapIterableToNullWithIterableNullArgOnMapper() {
//when
List<CarDto> carDtos = CarMapperIterableSettingOnMapper.INSTANCE.carsToCarDtos( null );
//then
assertThat( carDtos ).isNull();
}
@ProcessorTest
public void shouldMapMapRegardlessOfIterableNullArgOnMapper() {
//when
Map<Integer, CarDto> carDtoMap = CarMapperIterableSettingOnMapper.INSTANCE.carsToCarDtoMap( null );
//then
assertThat( carDtoMap ).isEmpty();
}
@ProcessorTest
public void shouldMapExpressionAndConstantRegardlessMapNullArgOnMapper() {
//when
CarDto carDto = CarMapperMapSettingOnMapper.INSTANCE.carToCarDto( null );
//then
assertThat( carDto ).isNotNull();
assertThat( carDto.getMake() ).isNull();
assertThat( carDto.getSeatCount() ).isEqualTo( 0 );
assertThat( carDto.getModel() ).isEqualTo( "ModelT" );
assertThat( carDto.getCatalogId() ).isNotEmpty();
}
@ProcessorTest
public void shouldMapIterableRegardlessOfMapNullArgOnMapper() {
//when
List<CarDto> carDtos = CarMapperMapSettingOnMapper.INSTANCE.carsToCarDtos( null );
//then
assertThat( carDtos ).isEmpty();
}
@ProcessorTest
public void shouldMapMapToWithMapNullArgOnMapper() {
//when
Map<Integer, CarDto> carDtoMap = CarMapperMapSettingOnMapper.INSTANCE.carsToCarDtoMap( null );
//then
assertThat( carDtoMap ).isNull();
}
@ProcessorTest
public void shouldMapExpressionAndConstantRegardlessNullArgOnConfig() {
@ -196,8 +269,7 @@ public class NullValueMappingTest {
List<CarDto> carDtos = CarMapperSettingOnConfig.INSTANCE.carsToCarDtos( null );
//then
assertThat( carDtos ).isNotNull();
assertThat( carDtos.isEmpty() ).isTrue();
assertThat( carDtos ).isEmpty();
}
@ProcessorTest
@ -210,6 +282,74 @@ public class NullValueMappingTest {
assertThat( carDtoMap ).isNull();
}
@ProcessorTest
public void shouldMapExpressionAndConstantRegardlessOfIterableNullArgOnConfig() {
//when
CarDto carDto = CarMapperIterableSettingOnConfig.INSTANCE.carToCarDto( null );
//then
assertThat( carDto ).isNotNull();
assertThat( carDto.getMake() ).isNull();
assertThat( carDto.getSeatCount() ).isEqualTo( 0 );
assertThat( carDto.getModel() ).isEqualTo( "ModelT" );
assertThat( carDto.getCatalogId() ).isNotEmpty();
}
@ProcessorTest
public void shouldMapIterableToNullWithIterableNullArgOnConfig() {
//when
List<CarDto> carDtos = CarMapperIterableSettingOnConfig.INSTANCE.carsToCarDtos( null );
//then
assertThat( carDtos ).isNull();
}
@ProcessorTest
public void shouldMapMapRegardlessOfIterableNullArgOnConfig() {
//when
Map<Integer, CarDto> carDtoMap = CarMapperIterableSettingOnConfig.INSTANCE.carsToCarDtoMap( null );
//then
assertThat( carDtoMap ).isEmpty();
}
@ProcessorTest
public void shouldMapExpressionAndConstantRegardlessOfMapNullArgOnConfig() {
//when
CarDto carDto = CarMapperMapSettingOnConfig.INSTANCE.carToCarDto( null );
//then
assertThat( carDto ).isNotNull();
assertThat( carDto.getMake() ).isNull();
assertThat( carDto.getSeatCount() ).isEqualTo( 0 );
assertThat( carDto.getModel() ).isEqualTo( "ModelT" );
assertThat( carDto.getCatalogId() ).isNotEmpty();
}
@ProcessorTest
public void shouldMapIterableRegardlessOfMapNullArgOnConfig() {
//when
List<CarDto> carDtos = CarMapperMapSettingOnConfig.INSTANCE.carsToCarDtos( null );
//then
assertThat( carDtos ).isEmpty();
}
@ProcessorTest
public void shouldMapMapToNullWithMapNullArgOnConfig() {
//when
Map<Integer, CarDto> carDtoMap = CarMapperMapSettingOnConfig.INSTANCE.carsToCarDtoMap( null );
//then
assertThat( carDtoMap ).isNull();
}
@ProcessorTest
public void shouldApplyConfiguredStrategyForMethodWithSeveralSourceParams() {
//when