Skip to content

Commit

Permalink
test fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
v1r3n committed Dec 18, 2023
1 parent a44c3c9 commit 57b1fa0
Show file tree
Hide file tree
Showing 11 changed files with 49 additions and 12 deletions.
39 changes: 33 additions & 6 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,46 @@ plugins {
}

dependencies {

implementation project(':conductor-rest')
implementation project(':conductor-core')
implementation project(':conductor-rest')
implementation project(':conductor-grpc-server')

//Event Systems
implementation project(':conductor-amqp')
implementation project(':conductor-nats')
implementation project(':conductor-nats-streaming')
implementation project(':conductor-awssqs-event-queue')

//External Payload Storage
implementation project(':conductor-azureblob-storage')
implementation project(':conductor-postgres-external-storage')
implementation project(':conductor-awss3-storage')


//Persistence
implementation project(':conductor-redis-persistence')
implementation project(':conductor-cassandra-persistence')
implementation project(':conductor-es6-persistence')
implementation project(':conductor-grpc-server')
implementation project(':conductor-postgres-persistence')
implementation project(':conductor-mysql-persistence')

//Indexing (note: Elasticsearch 6 is deprecated)
implementation project(':conductor-es7-persistence')


implementation project(':conductor-redis-lock')
implementation project(':conductor-redis-concurrency-limit')

//System Tasks
implementation project(':conductor-http-task')
implementation project(':conductor-json-jq-task')
implementation project(':conductor-awss3-storage')
implementation project(':conductor-awssqs-event-queue')
implementation project(':conductor-kafka')

//Metrics
implementation project(':conductor-metrics')

//Event Listener
implementation project(':conductor-workflow-event-listener')


implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-validation'
Expand Down
8 changes: 4 additions & 4 deletions workflow-event-listener/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ dependencies {

implementation project(':conductor-common')
implementation project(':conductor-core')
implementation project(':conductor-redis-persistence')

compileOnly 'org.springframework.boot:spring-boot-starter'
compileOnly 'org.springframework.boot:spring-boot-starter-web'

testImplementation project(':conductor-server')
testImplementation "org.apache.groovy:groovy-all:${revGroovy}"
testImplementation "org.spockframework:spock-core:${revSpock}"
testImplementation "org.spockframework:spock-spring:${revSpock}"

implementation "org.springframework.boot:spring-boot-starter-log4j2"


implementation project(':conductor-server')
testImplementation 'org.springframework.retry:spring-retry'
testImplementation 'org.springframework.boot:spring-boot-starter-web'
testImplementation "com.netflix.dyno-queues:dyno-queues-redis:${revDynoQueues}"
testImplementation project(':conductor-test-util').sourceSets.test.output

//In memory
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright 2023 Netflix, Inc.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
Expand All @@ -14,8 +15,6 @@
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;


import jakarta.annotation.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -24,6 +23,8 @@
import com.netflix.conductor.metrics.Monitors;
import com.netflix.conductor.model.WorkflowModel;

import jakarta.annotation.*;

public class ArchivingWithTTLWorkflowStatusListener implements WorkflowStatusListener {

private static final Logger LOGGER =
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright 2023 Netflix, Inc.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright 2023 Netflix, Inc.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright 2023 Netflix, Inc.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright 2023 Netflix, Inc.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright 2023 Netflix, Inc.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright 2023 Netflix, Inc.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright 2023 Netflix, Inc.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright 2023 Netflix, Inc.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
Expand Down Expand Up @@ -51,6 +52,7 @@
@RunWith(SpringRunner.class)
@SpringBootTest(
properties = {
"conductor.db.type=memory",
"conductor.workflow-status-listener.type=queue_publisher",
"conductor.workflow-status-listener.queue-publisher.successQueue=dummy",
"conductor.workflow-status-listener.queue-publisher.failureQueue=dummy",
Expand Down

0 comments on commit 57b1fa0

Please sign in to comment.