Skip to content

Commit

Permalink
Merge pull request #25 from CiscoM31/ISICO-14903
Browse files Browse the repository at this point in the history
ISICO-14903: TaskNotification extends TaskLog
  • Loading branch information
sarmuru2 authored Oct 31, 2023
2 parents ba491d1 + 3783508 commit 709b814
Showing 1 changed file with 4 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@
*/
package com.netflix.conductor.contribs.listener.task;

import java.util.LinkedHashMap;

import com.netflix.conductor.common.run.TaskLog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.netflix.conductor.common.metadata.tasks.Task;
import com.netflix.conductor.common.run.TaskSummary;

import com.fasterxml.jackson.annotation.JsonFilter;
import com.fasterxml.jackson.core.JsonProcessingException;
Expand All @@ -27,14 +26,11 @@
import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;

@JsonFilter("SecretRemovalFilter")
public class TaskNotification extends TaskSummary {
public class TaskNotification extends TaskLog {

private static final Logger LOGGER = LoggerFactory.getLogger(TaskStatusPublisher.class);

public String workflowTaskType;
private String domainGroupMoId = "";
private String accountMoId = "";

/**
* following attributes doesnt exist in TaskSummary so add it here. Not adding in TaskSummary as
* it belongs to conductor-common
Expand All @@ -47,14 +43,6 @@ public class TaskNotification extends TaskSummary {

private ObjectMapper objectMapper = new ObjectMapper();

public String getDomainGroupMoId() {
return domainGroupMoId;
}

public String getAccountMoId() {
return accountMoId;
}

public String getReferenceTaskName() {
return referenceTaskName;
}
Expand All @@ -80,19 +68,9 @@ public TaskNotification(Task task) {
if (!isFusionMetaPresent) {
return;
}

LinkedHashMap fusionMeta = (LinkedHashMap) task.getInputData().get("_ioMeta");
domainGroupMoId =
fusionMeta.containsKey("DomainGroupMoId")
? fusionMeta.get("DomainGroupMoId").toString()
: "";
accountMoId =
fusionMeta.containsKey("AccountMoId")
? fusionMeta.get("AccountMoId").toString()
: "";
}

String toJsonString() {
public String toJsonString() {
String jsonString;
SimpleBeanPropertyFilter theFilter =
SimpleBeanPropertyFilter.serializeAllExcept("input", "output");
Expand All @@ -112,7 +90,7 @@ String toJsonString() {
* To enable Workflow/Task Summary Input/Output JSON Serialization, use the following:
* conductor.app.summary-input-output-json-serialization.enabled=true
*/
String toJsonStringWithInputOutput() {
public String toJsonStringWithInputOutput() {
String jsonString;
try {
SimpleBeanPropertyFilter emptyFilter = SimpleBeanPropertyFilter.serializeAllExcept();
Expand Down

0 comments on commit 709b814

Please sign in to comment.