BAEL-9511 - Review comments

Author: maenolis

mapstruct-3/src/main/java/com/baeldung/mapper/OrderMapperWithAfterMapping.java

@@ -4,13 +4,15 @@
 import com.baeldung.entity.Order;
 import org.mapstruct.AfterMapping;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
 
 import java.util.ArrayList;
 
 @Mapper(uses = PaymentMapper.class)
 public interface OrderMapperWithAfterMapping {
 
+    @Mapping(source = "payment", target = "paymentDto")
     OrderDto toDto(Order order);
 
     @AfterMapping

mapstruct-3/src/main/java/com/baeldung/mapper/OrderMapperWithBeanMappingStrategy.java

@@ -0,0 +1,42 @@
+package com.baeldung.mapper;
+
+import com.baeldung.dto.AncestorDto;
+import com.baeldung.entity.GrandDad;
+import com.baeldung.entity.Identity;
+import org.junit.Test;
+import org.mapstruct.factory.Mappers;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class AncestorMapperTest {
+
+    @Test
+    public void whenAncestorMapperToDtoMapsGrandad_thenSourceValuesAreUsed() {
+        AncestorMapper mapper = Mappers.getMapper(AncestorMapper.class);
+        GrandDad source = new GrandDad(
+                new Identity("Thomas", "Tom"),
+                "80.00",
+                "1234556"
+        );
+        AncestorDto mapped = mapper.toDto(source);
+        assertEquals("Thomas", mapped.getFirstName());
+        assertEquals( 80.0d, mapped.getWeight(), 0.01d);
+        assertEquals("1234556", mapped.getVatNumber());
+    }
+
+    @Test
+    public void whenAncestorMapperToDtoMapsGrandadWithEmptyValues_thenNullValuesAreMapped() {
+        AncestorMapper mapper = Mappers.getMapper(AncestorMapper.class);
+        GrandDad source = new GrandDad(
+                null,
+                null,
+                "1234556"
+        );
+        AncestorDto mapped = mapper.toDto(source);
+        assertNull(mapped.getFirstName());
+        assertNull(mapped.getWeight());
+        assertEquals("1234556", mapped.getVatNumber());
+    }
+
+}

mapstruct-3/src/main/java/com/baeldung/mapper/OrderMapperWithStrategy.java

@@ -0,0 +1,43 @@
+package com.baeldung.mapper;
+
+
+import com.baeldung.dto.OrderDto;
+import com.baeldung.entity.Order;
+import com.baeldung.entity.Payment;
+import org.junit.Test;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class OrderMapperWithAfterMappingTest {
+
+    @Test
+    public void whenOrderMapperWithAfterMappingToDtoMapsOrderWithEmptyProperties_thenDefaultValuesAreUsed() {
+        OrderMapperWithAfterMapping mapper = Mappers.getMapper(OrderMapperWithAfterMapping.class);
+        Order orderSource = new Order();
+        orderSource.setPayment(new Payment("Cash"));
+        OrderDto mapped = mapper.toDto(orderSource);
+        assertEquals("Cash", mapped.getPaymentDto().getType());
+        assertEquals("N/A", mapped.getTransactionId());
+        assertNotNull(mapped.getOrderItemIds());
+        assertEquals(0, mapped.getOrderItemIds().size());
+    }
+
+    @Test
+    public void whenOrderMapperWithAfterMappingToDtoMapsOrderWithNonEmptyProperties_thenSourceValuesAreUsed() {
+        OrderMapperWithAfterMapping mapper = Mappers.getMapper(OrderMapperWithAfterMapping.class);
+        Order orderSource = new Order();
+        orderSource.setPayment(new Payment("Cash"));
+        orderSource.setOrderItemIds(List.of("item1", "item2"));
+        orderSource.setTransactionId("orderTransaction");
+        OrderDto mapped = mapper.toDto(orderSource);
+        assertEquals("Cash", mapped.getPaymentDto().getType());
+        assertEquals("orderTransaction", mapped.getTransactionId());
+        assertNotNull(mapped.getOrderItemIds());
+        assertEquals(2, mapped.getOrderItemIds().size());
+    }
+
+}

mapstruct-3/src/test/java/com/baeldung/mapper/AncestorMapperTest.java

@@ -0,0 +1,40 @@
+package com.baeldung.mapper;
+
+import com.baeldung.dto.OrderDto;
+import com.baeldung.entity.Order;
+import com.baeldung.entity.Payment;
+import org.junit.Test;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class OrderMapperWithDefaultTest {
+
+    @Test
+    public void whenOrderMapperWithDefaultToDtoMapsOrderWithEmptyProperties_thenDefaultValuesAreUsed() {
+        OrderMapperWithDefault mapper = Mappers.getMapper(OrderMapperWithDefault.class);
+        Order orderSource = new Order();
+        orderSource.setPayment(new Payment("Cash"));
+        OrderDto mapped = mapper.toDto(orderSource);
+        assertEquals("Cash", mapped.getPaymentDto().getType());
+        assertEquals("N/A", mapped.getTransactionId());
+        assertNull(mapped.getOrderItemIds());
+    }
+
+    @Test
+    public void whenOrderMapperWithDefaultToDtoMapsOrderWithNonEmptyProperties_thenSourceValuesAreUsed() {
+        OrderMapperWithDefault mapper = Mappers.getMapper(OrderMapperWithDefault.class);
+        Order orderSource = new Order();
+        orderSource.setPayment(new Payment("Cash"));
+        orderSource.setOrderItemIds(List.of("item1", "item2"));
+        orderSource.setTransactionId("orderTransaction");
+        OrderDto mapped = mapper.toDto(orderSource);
+        assertEquals("Cash", mapped.getPaymentDto().getType());
+        assertEquals("orderTransaction", mapped.getTransactionId());
+        assertNotNull(mapped.getOrderItemIds());
+        assertEquals(2, mapped.getOrderItemIds().size());
+    }
+
+}