ISICO-15301: module change as per manan's comments

common/README.md

@@ -0,0 +1,15 @@
+# common project which contains base/framework/common classes across projects
+
+Utility project which has rest notification related properties and utility to send rest requests
+
+## Published Artifacts
+
+Group: `com.netflix.conductor`
+
+| Published Artifact        | Description                              |
+|---------------------------|------------------------------------------| 
+| conductor-communit-common | Utility classes to publish rest requests |
+
+
+## Configuration
+

common/build.gradle

@@ -0,0 +1,21 @@
+plugins {
+    id 'groovy'
+}
+dependencies {
+
+    implementation "com.netflix.conductor:conductor-annotations:${revConductor}"
+
+    implementation group: 'javax.inject', name: 'javax.inject', version: '1'
+    implementation "org.apache.commons:commons-lang3:"
+    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14'
+
+    compileOnly 'org.springframework.boot:spring-boot-starter'
+    compileOnly 'org.springframework.boot:spring-boot-starter-web'
+
+    testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}"
+    testImplementation "org.spockframework:spock-core:${revSpock}"
+    testImplementation "org.spockframework:spock-spring:${revSpock}"
+
+    testImplementation 'org.springframework.boot:spring-boot-starter-web'
+    testImplementation project(':conductor-test-util').sourceSets.test.output
+}

common/dependencies.lock

@@ -0,0 +1,123 @@
+{
+    "annotationProcessor": {
+        "org.springframework.boot:spring-boot-configuration-processor": {
+            "locked": "2.6.7"
+        }
+    },
+    "compileClasspath": {
+        "org.apache.logging.log4j:log4j-api": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-core": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-jul": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-slf4j-impl": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-web": {
+            "locked": "2.17.1"
+        },
+        "org.springframework.boot:spring-boot-starter": {
+            "locked": "2.6.7"
+        },
+        "org.springframework.boot:spring-boot-starter-web": {
+            "locked": "2.6.7"
+        }
+    },
+    "runtimeClasspath": {
+        "org.apache.logging.log4j:log4j-api": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-core": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-jul": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-slf4j-impl": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-web": {
+            "locked": "2.17.1"
+        }
+    },
+    "testCompileClasspath": {
+        "org.apache.logging.log4j:log4j-api": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-core": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-jul": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-slf4j-impl": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-web": {
+            "locked": "2.17.1"
+        },
+        "org.codehaus.groovy:groovy-all": {
+            "locked": "3.0.9"
+        },
+        "org.junit.vintage:junit-vintage-engine": {
+            "locked": "5.8.2"
+        },
+        "org.spockframework:spock-core": {
+            "locked": "2.1-groovy-3.0"
+        },
+        "org.spockframework:spock-spring": {
+            "locked": "2.1-groovy-3.0"
+        },
+        "org.springframework.boot:spring-boot-starter-log4j2": {
+            "locked": "2.6.7"
+        },
+        "org.springframework.boot:spring-boot-starter-test": {
+            "locked": "2.6.7"
+        },
+        "org.springframework.boot:spring-boot-starter-web": {
+            "locked": "2.6.7"
+        }
+    },
+    "testRuntimeClasspath": {
+        "org.apache.logging.log4j:log4j-api": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-core": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-jul": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-slf4j-impl": {
+            "locked": "2.17.1"
+        },
+        "org.apache.logging.log4j:log4j-web": {
+            "locked": "2.17.1"
+        },
+        "org.codehaus.groovy:groovy-all": {
+            "locked": "3.0.9"
+        },
+        "org.junit.vintage:junit-vintage-engine": {
+            "locked": "5.8.2"
+        },
+        "org.spockframework:spock-core": {
+            "locked": "2.1-groovy-3.0"
+        },
+        "org.spockframework:spock-spring": {
+            "locked": "2.1-groovy-3.0"
+        },
+        "org.springframework.boot:spring-boot-starter-log4j2": {
+            "locked": "2.6.7"
+        },
+        "org.springframework.boot:spring-boot-starter-test": {
+            "locked": "2.6.7"
+        },
+        "org.springframework.boot:spring-boot-starter-web": {
+            "locked": "2.6.7"
+        }
+    }
+}

webhook/src/main/java/com/netflix/conductor/contribs/publisher/ConductorWebhookNotificationProperties.java → common/src/main/java/com/netflix/conductor/common/rest/ConductorRestNotificationProperties.java

@@ -9,14 +9,14 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.netflix.conductor.contribs.publisher;
+package com.netflix.conductor.common.rest;
 
 import java.util.List;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-@ConfigurationProperties("conductor.webhook.notification")
-public class ConductorWebhookNotificationProperties {
+@ConfigurationProperties("conductor.rest.notification")
+public class ConductorRestNotificationProperties {
 
     private String url;
 

webhook/src/main/java/com/netflix/conductor/contribs/publisher/RestClientManager.java → common/src/main/java/com/netflix/conductor/common/rest/RestClientManager.java

@@ -9,7 +9,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.netflix.conductor.contribs.publisher;
+package com.netflix.conductor.common.rest;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -38,17 +38,17 @@
 
 public class RestClientManager {
     private static final Logger logger = LoggerFactory.getLogger(RestClientManager.class);
-    private ConductorWebhookNotificationProperties config;
+    private ConductorRestNotificationProperties config;
     private CloseableHttpClient client;
     private String notifType;
     private String notifId;
 
-    enum NotificationType {
+    public enum NotificationType {
         TASK,
         WORKFLOW
     };
 
-    public RestClientManager(ConductorWebhookNotificationProperties config) {
+    public RestClientManager(ConductorRestNotificationProperties config) {
         logger.info("created RestClientManager" + System.currentTimeMillis());
         this.config = config;
         this.client = prepareClient();
@@ -177,7 +177,7 @@ private CloseableHttpClient prepareClient() {
                 .build();
     }
 
-    void postNotification(
+    public void postNotification(
             RestClientManager.NotificationType notifType,
             String data,
             String domainGroupMoId,

community-server/build.gradle

@@ -47,7 +47,7 @@ dependencies {
     //implementation project(':task:conductor-kafka')
 
     implementation project(':conductor-workflow-event-listener')
-    implementation project(':conductor-webhook')
+    implementation project(':common')
 
     implementation 'org.springframework.boot:spring-boot-starter'
     implementation 'org.springframework.boot:spring-boot-starter-validation'

settings.gradle

@@ -25,7 +25,8 @@ include 'index'
 include 'test-util'
 include 'lock'
 include 'workflow-event-listener'
-include 'webhook'
+include 'common'
+include 'task-event-listener'
 
 include 'persistence:common-persistence'
 include 'persistence:mysql-persistence'
@@ -43,13 +44,13 @@ include 'community-server'
 rootProject.children.stream()
         .filter(p -> p.name.equals("persistence") || p.name.equals("index") ||
                 p.name.equals("external-payload-storage") || p.name.equals("event-queue") ||
-                p.name.equals("lock") || p.name.equals("task"))
+                p.name.equals("lock") || p.name.equals("task") || p.name.equals("common") || p.name.equals("task-event-listener"))
         .forEach(it -> it.children
                 .forEach(c -> c.name = "conductor-" + c.name))
 
 rootProject.children.stream()
         .filter(p -> !p.name.equals("persistence") && !p.name.equals("index") &&
                 !p.name.equals("external-payload-storage") && !p.name.equals("event-queue") &&
-                !p.name.equals("lock") && !p.name.equals("task"))
+                !p.name.equals("lock") && !p.name.equals("task") && !p.name.equals("common") && !p.name.equals("task-event-listener"))
         .forEach(it -> it.name = "conductor-" + it.name)
 

webhook/build.gradle → task-event-listener/build.gradle

@@ -6,6 +6,7 @@ dependencies {
     implementation "com.cisco.conductor:conductor-core:${revConductorCustom}"
     implementation "com.cisco.conductor:conductor-common:${revConductorCustom}"
 
+    implementation project(':common')
 
     implementation "com.netflix.conductor:conductor-annotations:${revConductor}"
     implementation group: 'javax.inject', name: 'javax.inject', version: '1'

webhook/src/main/java/com/netflix/conductor/contribs/publisher/TaskNotification.java → task-event-listener/src/main/java/com/netflix/conductor/contribs/listener/task/TaskNotification.java

@@ -9,7 +9,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.netflix.conductor.contribs.publisher;
+package com.netflix.conductor.contribs.listener.task;
 
 import java.util.LinkedHashMap;
 

webhook/src/main/java/com/netflix/conductor/contribs/publisher/TaskStatusPublisher.java → task-event-listener/src/main/java/com/netflix/conductor/contribs/listener/task/TaskStatusPublisher.java

@@ -9,7 +9,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.netflix.conductor.contribs.publisher;
+package com.netflix.conductor.contribs.listener.task;
 
 import java.io.IOException;
 import java.util.List;
@@ -19,6 +19,7 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import com.netflix.conductor.common.rest.RestClientManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

webhook/src/main/java/com/netflix/conductor/contribs/publisher/TaskStatusPublisherConfiguration.java → task-event-listener/src/main/java/com/netflix/conductor/contribs/listener/task/TaskStatusPublisherConfiguration.java

@@ -9,8 +9,10 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package com.netflix.conductor.contribs.publisher;
+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;
@@ -20,15 +22,15 @@
 import com.netflix.conductor.core.listener.TaskStatusListener;
 
 @Configuration
-@EnableConfigurationProperties(ConductorWebhookNotificationProperties.class)
+@EnableConfigurationProperties(ConductorRestNotificationProperties.class)
 @ConditionalOnProperty(name = "conductor.task-status-listener.type", havingValue = "task_publisher")
 public class TaskStatusPublisherConfiguration {
 
     @Bean
     public TaskStatusListener getTaskStatusListener(
             RestClientManager rcm,
             ExecutionDAOFacade executionDAOFacade,
-            ConductorWebhookNotificationProperties config) {
+            ConductorRestNotificationProperties config) {
 
         return new TaskStatusPublisher(rcm, executionDAOFacade, config.getSubscribedTaskStatuses());
     }