[Code Improv] Added Mappers

openmetadata-service/src/main/java/org/openmetadata/service/governance/workflows/elements/nodes/userTask/impl/CreateApprovalTaskImpl.java

@@ -26,7 +26,7 @@
 import org.openmetadata.service.exception.EntityNotFoundException;
 import org.openmetadata.service.governance.workflows.WorkflowHandler;
 import org.openmetadata.service.jdbi3.FeedRepository;
-import org.openmetadata.service.resources.feeds.FeedResource;
+import org.openmetadata.service.resources.feeds.FeedMapper;
 import org.openmetadata.service.resources.feeds.MessageParser;
 import org.openmetadata.service.util.WebsocketNotificationHandler;
 
@@ -91,7 +91,7 @@ private Thread createApprovalTask(GlossaryTerm entity, List<EntityReference> ass
     } catch (EntityNotFoundException ex) {
       TaskDetails taskDetails =
           new TaskDetails()
-              .withAssignees(FeedResource.formatAssignees(assignees))
+              .withAssignees(FeedMapper.formatAssignees(assignees))
               .withType(TaskType.RequestApproval)
               .withStatus(TaskStatus.Open);
 

openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java

@@ -2053,11 +2053,12 @@ public final void validateUsers(List<EntityReference> entityReferences) {
     }
   }
 
-  private boolean validateIfAllRefsAreEntityType(List<EntityReference> list, String entityType) {
+  private static boolean validateIfAllRefsAreEntityType(
+      List<EntityReference> list, String entityType) {
     return list.stream().allMatch(obj -> obj.getType().equals(entityType));
   }
 
-  public final void validateReviewers(List<EntityReference> entityReferences) {
+  public static void validateReviewers(List<EntityReference> entityReferences) {
     if (!nullOrEmpty(entityReferences)) {
       boolean areAllTeam = validateIfAllRefsAreEntityType(entityReferences, TEAM);
       boolean areAllUsers = validateIfAllRefsAreEntityType(entityReferences, USER);
@@ -2415,7 +2416,7 @@ protected void checkSystemEntityDeletion(T entity) {
     }
   }
 
-  public final List<EntityReference> validateOwners(List<EntityReference> owners) {
+  public static List<EntityReference> validateOwners(List<EntityReference> owners) {
     if (nullOrEmpty(owners)) {
       return null;
     }

openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseRepository.java

@@ -33,7 +33,6 @@
 import org.openmetadata.schema.EntityTimeSeriesInterface;
 import org.openmetadata.schema.api.feed.CloseTask;
 import org.openmetadata.schema.api.feed.ResolveTask;
-import org.openmetadata.schema.api.tests.CreateTestCaseResult;
 import org.openmetadata.schema.entity.data.Table;
 import org.openmetadata.schema.entity.teams.User;
 import org.openmetadata.schema.tests.TestCase;
@@ -304,26 +303,10 @@ private void updateLogicalTestSuite(UUID testSuiteId) {
 
   public RestUtil.PutResponse<TestCaseResult> addTestCaseResult(
       String updatedBy, UriInfo uriInfo, String fqn, TestCaseResult testCaseResult) {
-    // TODO: REMOVED ONCE DEPRECATED IN TEST CASE RESOURCE
-    CreateTestCaseResult createTestCaseResult =
-        new CreateTestCaseResult()
-            .withTimestamp(testCaseResult.getTimestamp())
-            .withTestCaseStatus(testCaseResult.getTestCaseStatus())
-            .withResult(testCaseResult.getResult())
-            .withSampleData(testCaseResult.getSampleData())
-            .withTestResultValue(testCaseResult.getTestResultValue())
-            .withPassedRows(testCaseResult.getPassedRows())
-            .withFailedRows(testCaseResult.getFailedRows())
-            .withPassedRowsPercentage(testCaseResult.getPassedRowsPercentage())
-            .withFailedRowsPercentage(testCaseResult.getFailedRowsPercentage())
-            .withIncidentId(testCaseResult.getIncidentId())
-            .withMaxBound(testCaseResult.getMaxBound())
-            .withMinBound(testCaseResult.getMinBound());
-
     TestCaseResultRepository testCaseResultRepository =
         (TestCaseResultRepository) Entity.getEntityTimeSeriesRepository(TEST_CASE_RESULT);
     Response response =
-        testCaseResultRepository.addTestCaseResult(updatedBy, uriInfo, fqn, createTestCaseResult);
+        testCaseResultRepository.addTestCaseResult(updatedBy, uriInfo, fqn, testCaseResult);
     return new RestUtil.PutResponse<>(
         Response.Status.CREATED, (TestCaseResult) response.getEntity(), ENTITY_UPDATED);
   }

openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TestCaseResultRepository.java

@@ -17,7 +17,6 @@
 import javax.ws.rs.core.UriInfo;
 import lombok.SneakyThrows;
 import org.openmetadata.common.utils.CommonUtil;
-import org.openmetadata.schema.api.tests.CreateTestCaseResult;
 import org.openmetadata.schema.tests.ResultSummary;
 import org.openmetadata.schema.tests.TestCase;
 import org.openmetadata.schema.tests.TestSuite;
@@ -80,9 +79,8 @@ public ResultList<TestCaseResult> getTestCaseResults(String fqn, Long startTs, L
   }
 
   public Response addTestCaseResult(
-      String updatedBy, UriInfo uriInfo, String fqn, CreateTestCaseResult createTestCaseResult) {
+      String updatedBy, UriInfo uriInfo, String fqn, TestCaseResult testCaseResult) {
     TestCase testCase = Entity.getEntityByName(TEST_CASE, fqn, "", Include.ALL);
-    TestCaseResult testCaseResult = getTestCaseResult(createTestCaseResult, testCase);
     if (testCaseResult.getTestCaseStatus() == TestCaseStatus.Success) {
       testCaseRepository.deleteTestCaseFailedRowsSample(testCase.getId());
     }
@@ -299,24 +297,4 @@ public boolean hasTestCaseFailure(String fqn) throws IOException {
         .anyMatch(
             testCaseResult -> testCaseResult.getTestCaseStatus().equals(TestCaseStatus.Failed));
   }
-
-  private TestCaseResult getTestCaseResult(
-      CreateTestCaseResult createTestCaseResults, TestCase testCase) {
-    RestUtil.validateTimestampMilliseconds(createTestCaseResults.getTimestamp());
-    return new TestCaseResult()
-        .withId(UUID.randomUUID())
-        .withTestCaseFQN(testCase.getFullyQualifiedName())
-        .withTimestamp(createTestCaseResults.getTimestamp())
-        .withTestCaseStatus(createTestCaseResults.getTestCaseStatus())
-        .withResult(createTestCaseResults.getResult())
-        .withSampleData(createTestCaseResults.getSampleData())
-        .withTestResultValue(createTestCaseResults.getTestResultValue())
-        .withPassedRows(createTestCaseResults.getPassedRows())
-        .withFailedRows(createTestCaseResults.getFailedRows())
-        .withPassedRowsPercentage(createTestCaseResults.getPassedRowsPercentage())
-        .withFailedRowsPercentage(createTestCaseResults.getFailedRowsPercentage())
-        .withIncidentId(createTestCaseResults.getIncidentId())
-        .withMaxBound(createTestCaseResults.getMaxBound())
-        .withMinBound(createTestCaseResults.getMinBound());
-  }
 }

openmetadata-service/src/main/java/org/openmetadata/service/mapper/EntityMapper.java

@@ -0,0 +1,45 @@
+package org.openmetadata.service.mapper;
+
+import static org.openmetadata.schema.type.Include.NON_DELETED;
+import static org.openmetadata.service.jdbi3.EntityRepository.validateOwners;
+import static org.openmetadata.service.jdbi3.EntityRepository.validateReviewers;
+import static org.openmetadata.service.util.EntityUtil.getEntityReferences;
+
+import java.util.List;
+import java.util.UUID;
+import org.openmetadata.common.utils.CommonUtil;
+import org.openmetadata.schema.CreateEntity;
+import org.openmetadata.schema.EntityInterface;
+import org.openmetadata.schema.type.EntityReference;
+import org.openmetadata.service.Entity;
+
+public interface EntityMapper<T extends EntityInterface, C extends CreateEntity> {
+  T createToEntity(C create, String user);
+
+  default T copy(T entity, CreateEntity request, String updatedBy) {
+    List<EntityReference> owners = validateOwners(request.getOwners());
+    EntityReference domain = validateDomain(request.getDomain());
+    validateReviewers(request.getReviewers());
+    entity.setId(UUID.randomUUID());
+    entity.setName(request.getName());
+    entity.setDisplayName(request.getDisplayName());
+    entity.setDescription(request.getDescription());
+    entity.setOwners(owners);
+    entity.setDomain(domain);
+    entity.setTags(request.getTags());
+    entity.setDataProducts(getEntityReferences(Entity.DATA_PRODUCT, request.getDataProducts()));
+    entity.setLifeCycle(request.getLifeCycle());
+    entity.setExtension(request.getExtension());
+    entity.setUpdatedBy(updatedBy);
+    entity.setUpdatedAt(System.currentTimeMillis());
+    entity.setReviewers(request.getReviewers());
+    return entity;
+  }
+
+  default EntityReference validateDomain(String domainFqn) {
+    if (CommonUtil.nullOrEmpty(domainFqn)) {
+      return null;
+    }
+    return Entity.getEntityReferenceByName(Entity.DOMAIN, domainFqn, NON_DELETED);
+  }
+}

openmetadata-service/src/main/java/org/openmetadata/service/mapper/EntityTimeSeriesMapper.java

@@ -0,0 +1,7 @@
+package org.openmetadata.service.mapper;
+
+import org.openmetadata.schema.EntityTimeSeriesInterface;
+
+public interface EntityTimeSeriesMapper<T extends EntityTimeSeriesInterface, C> {
+  T createToEntity(C create, String user);
+}

openmetadata-service/src/main/java/org/openmetadata/service/resources/analytics/WebAnalyticEventMapper.java

@@ -0,0 +1,17 @@
+package org.openmetadata.service.resources.analytics;
+
+import org.openmetadata.schema.analytics.WebAnalyticEvent;
+import org.openmetadata.schema.api.tests.CreateWebAnalyticEvent;
+import org.openmetadata.service.mapper.EntityMapper;
+
+public class WebAnalyticEventMapper
+    implements EntityMapper<WebAnalyticEvent, CreateWebAnalyticEvent> {
+  @Override
+  public WebAnalyticEvent createToEntity(CreateWebAnalyticEvent create, String user) {
+    return copy(new WebAnalyticEvent(), create, user)
+        .withName(create.getName())
+        .withDisplayName(create.getDisplayName())
+        .withDescription(create.getDescription())
+        .withEventType(create.getEventType());
+  }
+}

openmetadata-service/src/main/java/org/openmetadata/service/resources/analytics/WebAnalyticEventResource.java

@@ -70,6 +70,7 @@ public class WebAnalyticEventResource
   public static final String COLLECTION_PATH = WebAnalyticEventRepository.COLLECTION_PATH;
   static final String FIELDS = "owners";
   private static final Pattern HTML_PATTERN = Pattern.compile(".*\\<[^>]+>.*", Pattern.DOTALL);
+  private final WebAnalyticEventMapper mapper = new WebAnalyticEventMapper();
 
   public WebAnalyticEventResource(Authorizer authorizer, Limits limits) {
     super(Entity.WEB_ANALYTIC_EVENT, authorizer, limits);
@@ -169,7 +170,7 @@ public Response create(
       @Context SecurityContext securityContext,
       @Valid CreateWebAnalyticEvent create) {
     WebAnalyticEvent webAnalyticEvent =
-        getWebAnalyticEvent(create, securityContext.getUserPrincipal().getName());
+        mapper.createToEntity(create, securityContext.getUserPrincipal().getName());
     return create(uriInfo, securityContext, webAnalyticEvent);
   }
 
@@ -192,7 +193,7 @@ public Response createOrUpdate(
       @Context SecurityContext securityContext,
       @Valid CreateWebAnalyticEvent create) {
     WebAnalyticEvent webAnalyticEvent =
-        getWebAnalyticEvent(create, securityContext.getUserPrincipal().getName());
+        mapper.createToEntity(create, securityContext.getUserPrincipal().getName());
     return createOrUpdate(uriInfo, securityContext, webAnalyticEvent);
   }
 
@@ -554,15 +555,6 @@ public ResultList<WebAnalyticEventData> listWebAnalyticEventData(
     return repository.getWebAnalyticEventData(eventType, startTs, endTs);
   }
 
-  private WebAnalyticEvent getWebAnalyticEvent(CreateWebAnalyticEvent create, String user) {
-    return repository
-        .copy(new WebAnalyticEvent(), create, user)
-        .withName(create.getName())
-        .withDisplayName(create.getDisplayName())
-        .withDescription(create.getDescription())
-        .withEventType(create.getEventType());
-  }
-
   public static WebAnalyticEventData sanitizeWebAnalyticEventData(
       WebAnalyticEventData webAnalyticEventDataInput) {
     Object inputData = webAnalyticEventDataInput.getEventData();

openmetadata-service/src/main/java/org/openmetadata/service/resources/apis/APICollectionMapper.java

@@ -0,0 +1,20 @@
+package org.openmetadata.service.resources.apis;
+
+import static org.openmetadata.service.util.EntityUtil.getEntityReference;
+import static org.openmetadata.service.util.EntityUtil.getEntityReferences;
+
+import org.openmetadata.schema.api.data.CreateAPICollection;
+import org.openmetadata.schema.entity.data.APICollection;
+import org.openmetadata.service.Entity;
+import org.openmetadata.service.mapper.EntityMapper;
+
+public class APICollectionMapper implements EntityMapper<APICollection, CreateAPICollection> {
+  @Override
+  public APICollection createToEntity(CreateAPICollection create, String user) {
+    return copy(new APICollection(), create, user)
+        .withService(getEntityReference(Entity.API_SERVICE, create.getService()))
+        .withEndpointURL(create.getEndpointURL())
+        .withApiEndpoints(getEntityReferences(Entity.API_ENDPOINT, create.getApiEndpoints()))
+        .withSourceHash(create.getSourceHash());
+  }
+}

openmetadata-service/src/main/java/org/openmetadata/service/resources/apis/APICollectionResource.java

@@ -73,6 +73,7 @@
 @Collection(name = "apiCollections")
 public class APICollectionResource extends EntityResource<APICollection, APICollectionRepository> {
   public static final String COLLECTION_PATH = "v1/apiCollections/";
+  private final APICollectionMapper mapper = new APICollectionMapper();
   static final String FIELDS = "owners,apiEndpoints,tags,extension,domain,sourceHash";
 
   @Override
@@ -310,7 +311,7 @@ public Response create(
       @Context SecurityContext securityContext,
       @Valid CreateAPICollection create) {
     APICollection apiCollection =
-        getAPICollection(create, securityContext.getUserPrincipal().getName());
+        mapper.createToEntity(create, securityContext.getUserPrincipal().getName());
     return create(uriInfo, securityContext, apiCollection);
   }
 
@@ -392,7 +393,7 @@ public Response createOrUpdate(
       @Context SecurityContext securityContext,
       @Valid CreateAPICollection create) {
     APICollection apiCollection =
-        getAPICollection(create, securityContext.getUserPrincipal().getName());
+        mapper.createToEntity(create, securityContext.getUserPrincipal().getName());
     return createOrUpdate(uriInfo, securityContext, apiCollection);
   }
 
@@ -510,13 +511,4 @@ public Response restore(
       @Valid RestoreEntity restore) {
     return restoreEntity(uriInfo, securityContext, restore.getId());
   }
-
-  private APICollection getAPICollection(CreateAPICollection create, String user) {
-    return repository
-        .copy(new APICollection(), create, user)
-        .withService(getEntityReference(Entity.API_SERVICE, create.getService()))
-        .withEndpointURL(create.getEndpointURL())
-        .withApiEndpoints(getEntityReferences(Entity.API_ENDPOINT, create.getApiEndpoints()))
-        .withSourceHash(create.getSourceHash());
-  }
 }

openmetadata-service/src/main/java/org/openmetadata/service/resources/apis/APIEndpointMapper.java

@@ -0,0 +1,21 @@
+package org.openmetadata.service.resources.apis;
+
+import static org.openmetadata.service.util.EntityUtil.getEntityReference;
+
+import org.openmetadata.schema.api.data.CreateAPIEndpoint;
+import org.openmetadata.schema.entity.data.APIEndpoint;
+import org.openmetadata.service.Entity;
+import org.openmetadata.service.mapper.EntityMapper;
+
+public class APIEndpointMapper implements EntityMapper<APIEndpoint, CreateAPIEndpoint> {
+  @Override
+  public APIEndpoint createToEntity(CreateAPIEndpoint create, String user) {
+    return copy(new APIEndpoint(), create, user)
+        .withApiCollection(getEntityReference(Entity.API_COLLCECTION, create.getApiCollection()))
+        .withRequestMethod(create.getRequestMethod())
+        .withEndpointURL(create.getEndpointURL())
+        .withRequestSchema(create.getRequestSchema())
+        .withResponseSchema(create.getResponseSchema())
+        .withSourceHash(create.getSourceHash());
+  }
+}

openmetadata-service/src/main/java/org/openmetadata/service/resources/apis/APIEndpointResource.java

@@ -69,6 +69,8 @@
 @Collection(name = "apiEndpoints")
 public class APIEndpointResource extends EntityResource<APIEndpoint, APIEndpointRepository> {
   public static final String COLLECTION_PATH = "v1/apiEndpoints/";
+  private final APIEndpointMapper mapper = new APIEndpointMapper();
+
   static final String FIELDS = "owners,followers,tags,extension,domain,dataProducts,sourceHash";
 
   @Override
@@ -304,7 +306,8 @@ public Response create(
       @Context UriInfo uriInfo,
       @Context SecurityContext securityContext,
       @Valid CreateAPIEndpoint create) {
-    APIEndpoint apiEndpoint = getAPIEndpoint(create, securityContext.getUserPrincipal().getName());
+    APIEndpoint apiEndpoint =
+        mapper.createToEntity(create, securityContext.getUserPrincipal().getName());
     return create(uriInfo, securityContext, apiEndpoint);
   }
 
@@ -385,7 +388,8 @@ public Response createOrUpdate(
       @Context UriInfo uriInfo,
       @Context SecurityContext securityContext,
       @Valid CreateAPIEndpoint create) {
-    APIEndpoint apiEndpoint = getAPIEndpoint(create, securityContext.getUserPrincipal().getName());
+    APIEndpoint apiEndpoint =
+        mapper.createToEntity(create, securityContext.getUserPrincipal().getName());
     return createOrUpdate(uriInfo, securityContext, apiEndpoint);
   }
 
@@ -552,15 +556,4 @@ public Response restore(
       @Valid RestoreEntity restore) {
     return restoreEntity(uriInfo, securityContext, restore.getId());
   }
-
-  private APIEndpoint getAPIEndpoint(CreateAPIEndpoint create, String user) {
-    return repository
-        .copy(new APIEndpoint(), create, user)
-        .withApiCollection(getEntityReference(Entity.API_COLLCECTION, create.getApiCollection()))
-        .withRequestMethod(create.getRequestMethod())
-        .withEndpointURL(create.getEndpointURL())
-        .withRequestSchema(create.getRequestSchema())
-        .withResponseSchema(create.getResponseSchema())
-        .withSourceHash(create.getSourceHash());
-  }
 }