CIF-2887 - Wrong page component in datalayer (#918)

* fixed page type for datalayer

Author: LSantha

bundles/core/src/main/java/com/adobe/cq/commerce/core/components/internal/models/v1/page/AbstractPageDelegator.java

@@ -26,6 +26,7 @@
 import com.adobe.cq.wcm.core.components.models.NavigationItem;
 import com.adobe.cq.wcm.core.components.models.Page;
 import com.adobe.cq.wcm.core.components.models.datalayer.ComponentData;
+import com.adobe.cq.wcm.core.components.models.datalayer.builder.DataLayerBuilder;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 abstract class AbstractPageDelegator implements Page {
@@ -150,7 +151,12 @@ public String getId() {
 
     @Override
     public ComponentData getData() {
-        return getDelegate().getData();
+        ComponentData data = getDelegate().getData();
+        if (data == null) {
+            return null;
+        }
+
+        return DataLayerBuilder.extending(data).asPage().withType(this::getExportedType).build();
     }
 
     @Override

bundles/core/src/test/java/com/adobe/cq/commerce/core/components/internal/models/v1/page/AbstractPageDelegatorTest.java

@@ -34,6 +34,7 @@
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertTrue;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -129,9 +130,12 @@ public void testDelegation() {
         when(mock.getId()).thenReturn("id");
         assertEquals("id", subject.getId());
 
+        assertNull(subject.getData());
         ComponentData data = mock(ComponentData.class);
+        when(data.getId()).thenReturn("myId");
         when(mock.getData()).thenReturn(data);
-        assertEquals(data, subject.getData());
+        assertEquals(data.getId(), subject.getData().getId());
+        assertEquals("type", subject.getData().getType());
 
         when(mock.getAppliedCssClasses()).thenReturn("my-page__root");
         assertEquals("my-page__root", subject.getAppliedCssClasses());