ISICO-15301: bug fixes on recent build changes

CiscoM31 · Oct 17, 2023 · 6c32a29 · 6c32a29
1 parent be9a7d9
commit 6c32a29
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 25 deletions.
diff --git a/community-server/build.gradle b/community-server/build.gradle
@@ -47,6 +47,7 @@ dependencies {
     //implementation project(':task:conductor-kafka')
 
     implementation project(':conductor-workflow-event-listener')
+    implementation project(':task-event-listener')
     implementation project(':common')
 
     implementation 'org.springframework.boot:spring-boot-starter'

diff --git a/...tener/src/main/java/com/netflix/conductor/contribs/listener/task/TaskStatusPublisher.java b/...tener/src/main/java/com/netflix/conductor/contribs/listener/task/TaskStatusPublisher.java
@@ -19,10 +19,10 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import com.netflix.conductor.common.rest.RestClientManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.netflix.conductor.common.rest.RestClientManager;
 import com.netflix.conductor.core.dal.ExecutionDAOFacade;
 import com.netflix.conductor.core.listener.TaskStatusListener;
 import com.netflix.conductor.model.TaskModel;
@@ -127,8 +127,7 @@ public void onTaskScheduled(TaskModel task) {
                     "Failed to enqueue task: Id {} Type {} of workflow {} ",
                     task.getTaskId(),
                     task.getTaskType(),
-                    task.getWorkflowInstanceId());
-            LOGGER.error(e.toString());
+                    task.getWorkflowInstanceId(),e);
         }
     }
 
@@ -140,8 +139,7 @@ private void enqueueTask(TaskModel task) {
                     "Failed to enqueue task: Id {} Type {} of workflow {} ",
                     task.getTaskId(),
                     task.getTaskType(),
-                    task.getWorkflowInstanceId());
-            LOGGER.debug(e.toString());
+                    task.getWorkflowInstanceId(),e);
         }
     }
 

diff --git a/...n/java/com/netflix/conductor/contribs/listener/task/TaskStatusPublisherConfiguration.java b/...n/java/com/netflix/conductor/contribs/listener/task/TaskStatusPublisherConfiguration.java
@@ -11,13 +11,13 @@
  */
 package com.netflix.conductor.contribs.listener.task;
 
-import com.netflix.conductor.common.rest.ConductorRestNotificationProperties;
-import com.netflix.conductor.common.rest.RestClientManager;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.netflix.conductor.common.rest.ConductorRestNotificationProperties;
+import com.netflix.conductor.common.rest.RestClientManager;
 import com.netflix.conductor.core.dal.ExecutionDAOFacade;
 import com.netflix.conductor.core.listener.TaskStatusListener;
 

diff --git a/workflow-event-listener/build.gradle b/workflow-event-listener/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 
     compileOnly 'org.springframework.boot:spring-boot-starter'
     implementation group: 'javax.inject', name: 'javax.inject', version: '1'
+    implementation "com.netflix.conductor:conductor-annotations:${revConductor}"
     compileOnly 'org.springframework.boot:spring-boot-starter-web'
 
     implementation project(':common')

diff --git a/.../src/main/java/com/netflix/conductor/contribs/listener/workflow/WorkflowNotification.java b/.../src/main/java/com/netflix/conductor/contribs/listener/workflow/WorkflowNotification.java
@@ -11,18 +11,20 @@
  */
 package com.netflix.conductor.contribs.listener.workflow;
 
+import java.util.LinkedHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.netflix.conductor.common.run.Workflow;
+import com.netflix.conductor.common.run.WorkflowSummary;
+
 import com.fasterxml.jackson.annotation.JsonFilter;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ser.FilterProvider;
 import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
 import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
-import com.netflix.conductor.common.run.Workflow;
-import com.netflix.conductor.common.run.WorkflowSummary;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.LinkedHashMap;
 
 @JsonFilter("SecretRemovalFilter")
 class WorkflowNotification extends WorkflowSummary {

diff --git a/...c/main/java/com/netflix/conductor/contribs/listener/workflow/WorkflowStatusPublisher.java b/...c/main/java/com/netflix/conductor/contribs/listener/workflow/WorkflowStatusPublisher.java
@@ -11,18 +11,20 @@
  */
 package com.netflix.conductor.contribs.listener.workflow;
 
+import java.io.IOException;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingDeque;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.netflix.conductor.common.rest.RestClientManager;
 import com.netflix.conductor.core.dal.ExecutionDAOFacade;
 import com.netflix.conductor.core.listener.WorkflowStatusListener;
 import com.netflix.conductor.model.WorkflowModel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.io.IOException;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingDeque;
 
 @Singleton
 public class WorkflowStatusPublisher implements WorkflowStatusListener {

diff --git a/...om/netflix/conductor/contribs/listener/workflow/WorkflowStatusPublisherConfiguration.java b/...om/netflix/conductor/contribs/listener/workflow/WorkflowStatusPublisherConfiguration.java
@@ -11,17 +11,18 @@
  */
 package com.netflix.conductor.contribs.listener.workflow;
 
-import com.netflix.conductor.common.rest.ConductorRestNotificationProperties;
-import com.netflix.conductor.common.rest.RestClientManager;
-import com.netflix.conductor.core.dal.ExecutionDAOFacade;
-import com.netflix.conductor.core.listener.WorkflowStatusListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.netflix.conductor.common.rest.ConductorRestNotificationProperties;
+import com.netflix.conductor.common.rest.RestClientManager;
+import com.netflix.conductor.core.dal.ExecutionDAOFacade;
+import com.netflix.conductor.core.listener.WorkflowStatusListener;
+
 @Configuration
 @EnableConfigurationProperties(ConductorRestNotificationProperties.class)
 @ConditionalOnProperty(