Skip to content

Commit ed9d501

Browse files
committed
520 Move embedded webhook endpoints to embedded-webhook-rest module
1 parent 64bcf81 commit ed9d501

File tree

14 files changed

+341
-280
lines changed

14 files changed

+341
-280
lines changed

server/apps/server-app/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ dependencies {
168168
implementation(project(":server:ee:libs:embedded:embedded-swagger"))
169169
implementation(project(":server:ee:libs:embedded:embedded-unified:embedded-unified-rest"))
170170
implementation(project(":server:ee:libs:embedded:embedded-unified:embedded-unified-service"))
171+
implementation(project(":server:ee:libs:embedded:embedded-webhook:embedded-webhook-rest"))
171172
implementation(project(":server:ee:libs:embedded:embedded-workflow:embedded-workflow-coordinator"))
172173
implementation(project(":server:ee:libs:embedded:embedded-workflow:embedded-workflow-execution:embedded-workflow-execution-rest"))
173174
implementation(project(":server:ee:libs:embedded:embedded-workflow:embedded-workflow-execution:embedded-workflow-execution-service"))

server/ee/apps/execution-app/build.gradle.kts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,15 @@ dependencies {
3333
implementation(project(":server:libs:config:jackson-config"))
3434
implementation(project(":server:libs:config:jdbc-config"))
3535
implementation(project(":server:libs:config:logback-config"))
36-
implementation(project(":server:libs:config:messages-config"))
3736
implementation(project(":server:libs:config:liquibase-config"))
3837
implementation(project(":server:libs:core:commons:commons-data"))
3938
implementation(project(":server:libs:core:commons:commons-util"))
4039
implementation(project(":server:libs:core:evaluator:evaluator-impl"))
41-
implementation(project(":server:libs:core:file-storage:file-storage-base64-service"))
42-
implementation(project(":server:libs:core:file-storage:file-storage-filesystem-service"))
43-
implementation(project(":server:libs:core:message:message-broker:message-broker-amqp"))
44-
implementation(project(":server:libs:core:message:message-broker:message-broker-kafka"))
45-
implementation(project(":server:libs:core:message:message-broker:message-broker-redis"))
46-
implementation(project(":server:libs:core:message:message-event:message-event-impl"))
4740
implementation(project(":server:libs:core:rest:rest-impl"))
48-
implementation(project(":server:libs:platform:platform-data-storage:platform-data-storage-jdbc:platform-data-storage-jdbc-service"))
4941
implementation(project(":server:libs:platform:platform-file-storage:platform-file-storage-impl"))
50-
implementation(project(":server:libs:platform:platform-webhook:platform-webhook-impl"))
5142
implementation(project(":server:libs:platform:platform-workflow:platform-workflow-execution:platform-workflow-execution-rest:platform-workflow-execution-rest-impl"))
5243
implementation(project(":server:libs:platform:platform-workflow:platform-workflow-execution:platform-workflow-execution-service"))
5344

54-
implementation(project(":server:ee:libs:atlas:atlas-execution:atlas-execution-remote-rest"))
5545
implementation(project(":server:ee:libs:automation:automation-configuration:automation-configuration-remote-client"))
5646
implementation(project(":server:ee:libs:config:observability-config"))
5747
implementation(project(":server:ee:libs:config:tenant-multi-data-config"))
@@ -66,16 +56,12 @@ dependencies {
6656
implementation(project(":server:ee:libs:embedded:embedded-swagger"))
6757
implementation(project(":server:ee:libs:platform:platform-component:platform-component-remote-client"))
6858
implementation(project(":server:ee:libs:platform:platform-configuration:platform-configuration-remote-client"))
69-
implementation(project(":server:ee:libs:platform:platform-data-storage:platform-data-storage-jdbc:platform-data-storage-jdbc-remote-rest"))
70-
implementation(project(":server:ee:libs:platform:platform-notification:platform-notification-remote-client"))
7159
implementation(project(":server:ee:libs:platform:platform-scheduler:platform-scheduler-remote-client"))
7260
implementation(project(":server:ee:libs:platform:platform-workflow:platform-workflow-execution:platform-workflow-execution-remote-rest"))
7361
implementation(project(":server:ee:libs:platform:platform-workflow:platform-workflow-task-dispatcher:platform-workflow-task-dispatcher-registry:platform-workflow-task-dispatcher-registry-remote-client"))
74-
implementation(project(":server:ee:libs:platform:platform-workflow:platform-workflow-worker:platform-workflow-worker-remote-client"))
7562

7663
runtimeOnly("org.postgresql:postgresql")
7764
runtimeOnly("com.zaxxer:HikariCP")
7865

79-
testImplementation(project(":server:libs:core:message:message-broker:message-broker-memory"))
8066
testImplementation(project(":server:libs:test:test-int-support"))
8167
}

server/ee/apps/execution-app/src/main/java/com/bytechef/execution/config/JdbcConfiguration.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import com.bytechef.commons.data.jdbc.converter.StringToExecutionErrorConverter;
1818
import com.bytechef.commons.data.jdbc.converter.StringToFileEntryConverter;
1919
import com.bytechef.commons.data.jdbc.converter.StringToMapWrapperConverter;
20-
import com.bytechef.platform.data.storage.jdbc.repository.converter.DataEntryValueWrapperToStringConverter;
21-
import com.bytechef.platform.data.storage.jdbc.repository.converter.StringToDataEntryValueWrapperConverter;
2220
import com.bytechef.platform.workflow.execution.repository.converter.StringToTriggerStateValueConverter;
2321
import com.bytechef.platform.workflow.execution.repository.converter.StringToWorkflowExecutionIdConverter;
2422
import com.bytechef.platform.workflow.execution.repository.converter.StringToWorkflowTriggerConverter;
@@ -51,11 +49,9 @@ public JdbcConfiguration(ObjectMapper objectMapper) {
5149
protected List<?> userConverters() {
5250
// TODO Use JsonUtils directly
5351
return Arrays.asList(
54-
new DataEntryValueWrapperToStringConverter(),
5552
new ExecutionErrorToStringConverter(objectMapper),
5653
new FileEntryToStringConverter(objectMapper),
5754
new MapWrapperToStringConverter(objectMapper),
58-
new StringToDataEntryValueWrapperConverter(),
5955
new StringToExecutionErrorConverter(objectMapper),
6056
new StringToFileEntryConverter(objectMapper),
6157
new StringToMapWrapperConverter(objectMapper),

server/ee/apps/webhook-app/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ dependencies {
4545
implementation(project(":server:ee:libs:core:discovery:discovery-redis"))
4646
implementation(project(":server:ee:libs:embedded:embedded-configuration:embedded-configuration-instance-impl"))
4747
implementation(project(":server:ee:libs:embedded:embedded-configuration:embedded-configuration-remote-client"))
48+
implementation(project(":server:ee:libs:embedded:embedded-connected-user:embedded-connected-user-remote-client"))
49+
implementation(project(":server:ee:libs:embedded:embedded-webhook:embedded-webhook-rest"))
4850
implementation(project(":server:ee:libs:embedded:embedded-workflow:embedded-workflow-coordinator"))
4951
implementation(project(":server:ee:libs:platform:platform-component:platform-component-remote-client"))
5052
implementation(project(":server:ee:libs:platform:platform-configuration:platform-configuration-remote-client"))

server/ee/libs/embedded/embedded-execution/embedded-execution-public-rest/build.gradle.kts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,10 @@ dependencies {
5454
implementation(project(":server:libs:core:rest:rest-api"))
5555
implementation(project(":server:libs:platform:platform-api"))
5656
implementation(project(":server:libs:platform:platform-component:platform-component-api"))
57-
implementation(project(":server:libs:platform:platform-file-storage:platform-file-storage-api"))
58-
implementation(project(":server:libs:platform:platform-webhook:platform-webhook-api"))
59-
implementation(project(":server:libs:platform:platform-webhook:platform-webhook-rest:platform-webhook-rest-api"))
6057
implementation(project(":server:libs:platform:platform-workflow:platform-workflow-execution:platform-workflow-execution-api"))
6158

62-
implementation(project(":server:ee:libs:embedded:embedded-configuration:embedded-configuration-api"))
63-
implementation(project(":server:ee:libs:embedded:embedded-connected-user:embedded-connected-user-api"))
59+
// implementation(project(":server:ee:libs:embedded:embedded-configuration:embedded-configuration-api"))
60+
// implementation(project(":server:ee:libs:embedded:embedded-connected-user:embedded-connected-user-api"))
6461
implementation(project(":server:ee:libs:embedded:embedded-execution:embedded-execution-api"))
6562

6663
testImplementation("org.springframework:spring-webflux")

0 commit comments

Comments
 (0)