From b13c7f58fd884294c2ebb31fa091699769c4985f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=B6sle?= <37705369+lmoesle@users.noreply.github.com> Date: Wed, 3 Apr 2024 10:45:35 +0200 Subject: [PATCH] refactor: connect maven module structure (#258) **Issue** **Description** Refactor maven module structure in connect-core to remove unnecessary maven parent modules. **Checklist** * Code is easy to understand * No obvious errors or bugs * CI/CD Pipelines did run successfully * Tests were implemented * Documentation was created --- connect/camunda7-remote/message/pom.xml | 2 +- connect/camunda7-remote/process/pom.xml | 2 +- connect/camunda7-remote/worker/pom.xml | 2 +- connect/camunda8/message/pom.xml | 2 +- connect/camunda8/process/pom.xml | 2 +- connect/camunda8/worker/pom.xml | 2 +- .../element-template-api/pom.xml | 6 +++--- .../elementtemplate/api/BPMNElementType.java | 0 .../elementtemplate/api/ElementTemplate.java | 0 .../api/ElementTemplateProperty.java | 0 .../elementtemplate/api/PropertyType.java | 0 connect/core/element-templates/pom.xml | 20 ------------------- .../core/{message => }/message-api/pom.xml | 4 ++-- .../message/MessageAutoConfiguration.java | 0 .../message/api/CorrelateMessageCommand.java | 0 .../connect/message/api/MessageApi.java | 0 .../message/impl/DeliverMessagePort.java | 0 .../impl/MessageCorrelationException.java | 0 .../connect/message/impl/MessageService.java | 0 ...ot.autoconfigure.AutoConfiguration.imports | 0 connect/core/message/pom.xml | 20 ------------------- connect/core/pom.xml | 10 +++++----- .../core/{process/api => process-api}/pom.xml | 4 ++-- .../process/ProcessAutoConfiguration.java | 0 .../connect/process/api/ProcessApi.java | 0 .../process/api/ProcessStartingException.java | 0 .../process/api/StartProcessCommand.java | 0 .../connect/process/impl/ProcessApiImpl.java | 0 .../process/impl/StartProcessPort.java | 0 ...ot.autoconfigure.AutoConfiguration.imports | 0 .../java/io/miranum/platform/connect/.gitkeep | 0 connect/core/process/pom.xml | 20 ------------------- connect/core/{task => }/task-api/pom.xml | 4 ++-- .../connect/task/TaskAutoConfiguration.java | 0 .../connect/task/api/CompleteTaskCommand.java | 0 .../platform/connect/task/api/TaskApi.java | 0 .../connect/task/impl/CompleteTaskPort.java | 0 .../connect/task/impl/TaskApiImpl.java | 0 ...ot.autoconfigure.AutoConfiguration.imports | 0 .../java/io/miranum/platform/connect/.gitkeep | 0 connect/core/task/pom.xml | 20 ------------------- connect/core/{worker => }/worker-api/pom.xml | 4 ++-- .../worker/WorkerAutoConfiguration.java | 0 .../connect/worker/api/BusinessException.java | 0 .../worker/api/TechnicalException.java | 0 .../platform/connect/worker/api/Worker.java | 0 .../connect/worker/api/WorkerExecuteApi.java | 0 .../connect/worker/api/WorkerInterceptor.java | 0 .../connect/worker/api/WorkerRegistry.java | 0 .../worker/api/WorkerSubscription.java | 0 .../WorkerAnnotationBeanPostProcessor.java | 0 .../worker/impl/WorkerExecuteApiImpl.java | 0 .../connect/worker/impl/WorkerExecutor.java | 0 .../worker/impl/WorkerRegistryImpl.java | 0 ...ot.autoconfigure.AutoConfiguration.imports | 0 .../worker/impl/WorkerExecuteApiImplTest.java | 0 connect/core/worker/pom.xml | 20 ------------------- .../generator-maven-plugin-core/pom.xml | 6 +++--- platform/engine/core/pom.xml | 4 ++-- 59 files changed, 27 insertions(+), 127 deletions(-) rename connect/core/{element-templates => }/element-template-api/pom.xml (87%) rename connect/core/{element-templates => }/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/BPMNElementType.java (100%) rename connect/core/{element-templates => }/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplate.java (100%) rename connect/core/{element-templates => }/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplateProperty.java (100%) rename connect/core/{element-templates => }/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/PropertyType.java (100%) delete mode 100644 connect/core/element-templates/pom.xml rename connect/core/{message => }/message-api/pom.xml (92%) rename connect/core/{message => }/message-api/src/main/java/io/miranum/platform/connect/message/MessageAutoConfiguration.java (100%) rename connect/core/{message => }/message-api/src/main/java/io/miranum/platform/connect/message/api/CorrelateMessageCommand.java (100%) rename connect/core/{message => }/message-api/src/main/java/io/miranum/platform/connect/message/api/MessageApi.java (100%) rename connect/core/{message => }/message-api/src/main/java/io/miranum/platform/connect/message/impl/DeliverMessagePort.java (100%) rename connect/core/{message => }/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageCorrelationException.java (100%) rename connect/core/{message => }/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageService.java (100%) rename connect/core/{message => }/message-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) delete mode 100644 connect/core/message/pom.xml rename connect/core/{process/api => process-api}/pom.xml (92%) rename connect/core/{process/api => process-api}/src/main/java/io/miranum/platform/connect/process/ProcessAutoConfiguration.java (100%) rename connect/core/{process/api => process-api}/src/main/java/io/miranum/platform/connect/process/api/ProcessApi.java (100%) rename connect/core/{process/api => process-api}/src/main/java/io/miranum/platform/connect/process/api/ProcessStartingException.java (100%) rename connect/core/{process/api => process-api}/src/main/java/io/miranum/platform/connect/process/api/StartProcessCommand.java (100%) rename connect/core/{process/api => process-api}/src/main/java/io/miranum/platform/connect/process/impl/ProcessApiImpl.java (100%) rename connect/core/{process/api => process-api}/src/main/java/io/miranum/platform/connect/process/impl/StartProcessPort.java (100%) rename connect/core/{process/api => process-api}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename connect/core/{process/api => process-api}/src/test/java/io/miranum/platform/connect/.gitkeep (100%) delete mode 100644 connect/core/process/pom.xml rename connect/core/{task => }/task-api/pom.xml (92%) rename connect/core/{task => }/task-api/src/main/java/io/miranum/platform/connect/task/TaskAutoConfiguration.java (100%) rename connect/core/{task => }/task-api/src/main/java/io/miranum/platform/connect/task/api/CompleteTaskCommand.java (100%) rename connect/core/{task => }/task-api/src/main/java/io/miranum/platform/connect/task/api/TaskApi.java (100%) rename connect/core/{task => }/task-api/src/main/java/io/miranum/platform/connect/task/impl/CompleteTaskPort.java (100%) rename connect/core/{task => }/task-api/src/main/java/io/miranum/platform/connect/task/impl/TaskApiImpl.java (100%) rename connect/core/{task => }/task-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename connect/core/{task => }/task-api/src/test/java/io/miranum/platform/connect/.gitkeep (100%) delete mode 100644 connect/core/task/pom.xml rename connect/core/{worker => }/worker-api/pom.xml (94%) rename connect/core/{worker => }/worker-api/src/main/java/io/miranum/platform/connect/worker/WorkerAutoConfiguration.java (100%) rename connect/core/{worker => }/worker-api/src/main/java/io/miranum/platform/connect/worker/api/BusinessException.java (100%) rename connect/core/{worker => }/worker-api/src/main/java/io/miranum/platform/connect/worker/api/TechnicalException.java (100%) rename connect/core/{worker => }/worker-api/src/main/java/io/miranum/platform/connect/worker/api/Worker.java (100%) rename connect/core/{worker => }/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerExecuteApi.java (100%) rename connect/core/{worker => }/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerInterceptor.java (100%) rename connect/core/{worker => }/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerRegistry.java (100%) rename connect/core/{worker => }/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerSubscription.java (100%) rename connect/core/{worker => }/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerAnnotationBeanPostProcessor.java (100%) rename connect/core/{worker => }/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImpl.java (100%) rename connect/core/{worker => }/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecutor.java (100%) rename connect/core/{worker => }/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerRegistryImpl.java (100%) rename connect/core/{worker => }/worker-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename connect/core/{worker => }/worker-api/src/test/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImplTest.java (100%) delete mode 100644 connect/core/worker/pom.xml diff --git a/connect/camunda7-remote/message/pom.xml b/connect/camunda7-remote/message/pom.xml index 42c5e80f2..ce3e5d740 100644 --- a/connect/camunda7-remote/message/pom.xml +++ b/connect/camunda7-remote/message/pom.xml @@ -16,7 +16,7 @@ io.miranum.platform - message-api + connect-message-api ${project.version} diff --git a/connect/camunda7-remote/process/pom.xml b/connect/camunda7-remote/process/pom.xml index 2d62012c0..345b24103 100644 --- a/connect/camunda7-remote/process/pom.xml +++ b/connect/camunda7-remote/process/pom.xml @@ -16,7 +16,7 @@ io.miranum.platform - process-api + connect-process-api ${project.version} diff --git a/connect/camunda7-remote/worker/pom.xml b/connect/camunda7-remote/worker/pom.xml index 6620a61b7..6f907b237 100644 --- a/connect/camunda7-remote/worker/pom.xml +++ b/connect/camunda7-remote/worker/pom.xml @@ -17,7 +17,7 @@ io.miranum.platform - worker-api + connect-worker-api ${project.version} diff --git a/connect/camunda8/message/pom.xml b/connect/camunda8/message/pom.xml index 55d34993a..8a6b4f698 100644 --- a/connect/camunda8/message/pom.xml +++ b/connect/camunda8/message/pom.xml @@ -16,7 +16,7 @@ io.miranum.platform - message-api + connect-message-api ${project.version} diff --git a/connect/camunda8/process/pom.xml b/connect/camunda8/process/pom.xml index 92117c599..753e4dc4f 100644 --- a/connect/camunda8/process/pom.xml +++ b/connect/camunda8/process/pom.xml @@ -16,7 +16,7 @@ io.miranum.platform - process-api + connect-process-api ${project.version} diff --git a/connect/camunda8/worker/pom.xml b/connect/camunda8/worker/pom.xml index bbf52e736..1839b608b 100644 --- a/connect/camunda8/worker/pom.xml +++ b/connect/camunda8/worker/pom.xml @@ -17,7 +17,7 @@ io.miranum.platform - worker-api + connect-worker-api ${project.version} diff --git a/connect/core/element-templates/element-template-api/pom.xml b/connect/core/element-template-api/pom.xml similarity index 87% rename from connect/core/element-templates/element-template-api/pom.xml rename to connect/core/element-template-api/pom.xml index ba9106f32..31d53716f 100644 --- a/connect/core/element-templates/element-template-api/pom.xml +++ b/connect/core/element-template-api/pom.xml @@ -2,14 +2,14 @@ - element-template-api + connect-element-template-api element-template-api 4.0.0 jar io.miranum.platform - connect-element-templates + connect-core ${revision} @@ -26,4 +26,4 @@ - \ No newline at end of file + diff --git a/connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/BPMNElementType.java b/connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/BPMNElementType.java similarity index 100% rename from connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/BPMNElementType.java rename to connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/BPMNElementType.java diff --git a/connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplate.java b/connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplate.java similarity index 100% rename from connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplate.java rename to connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplate.java diff --git a/connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplateProperty.java b/connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplateProperty.java similarity index 100% rename from connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplateProperty.java rename to connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplateProperty.java diff --git a/connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/PropertyType.java b/connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/PropertyType.java similarity index 100% rename from connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/PropertyType.java rename to connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/PropertyType.java diff --git a/connect/core/element-templates/pom.xml b/connect/core/element-templates/pom.xml deleted file mode 100644 index 2ed4d10db..000000000 --- a/connect/core/element-templates/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - connect-element-templates - connect-element-templates - 4.0.0 - pom - - - io.miranum.platform - connect-core - ${revision} - - - - element-template-api - - - \ No newline at end of file diff --git a/connect/core/message/message-api/pom.xml b/connect/core/message-api/pom.xml similarity index 92% rename from connect/core/message/message-api/pom.xml rename to connect/core/message-api/pom.xml index e80900541..360d6ba40 100644 --- a/connect/core/message/message-api/pom.xml +++ b/connect/core/message-api/pom.xml @@ -2,14 +2,14 @@ - message-api + connect-message-api message-api 4.0.0 jar io.miranum.platform - connect-message + connect-core ${revision} diff --git a/connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/MessageAutoConfiguration.java b/connect/core/message-api/src/main/java/io/miranum/platform/connect/message/MessageAutoConfiguration.java similarity index 100% rename from connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/MessageAutoConfiguration.java rename to connect/core/message-api/src/main/java/io/miranum/platform/connect/message/MessageAutoConfiguration.java diff --git a/connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/api/CorrelateMessageCommand.java b/connect/core/message-api/src/main/java/io/miranum/platform/connect/message/api/CorrelateMessageCommand.java similarity index 100% rename from connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/api/CorrelateMessageCommand.java rename to connect/core/message-api/src/main/java/io/miranum/platform/connect/message/api/CorrelateMessageCommand.java diff --git a/connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/api/MessageApi.java b/connect/core/message-api/src/main/java/io/miranum/platform/connect/message/api/MessageApi.java similarity index 100% rename from connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/api/MessageApi.java rename to connect/core/message-api/src/main/java/io/miranum/platform/connect/message/api/MessageApi.java diff --git a/connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/impl/DeliverMessagePort.java b/connect/core/message-api/src/main/java/io/miranum/platform/connect/message/impl/DeliverMessagePort.java similarity index 100% rename from connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/impl/DeliverMessagePort.java rename to connect/core/message-api/src/main/java/io/miranum/platform/connect/message/impl/DeliverMessagePort.java diff --git a/connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageCorrelationException.java b/connect/core/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageCorrelationException.java similarity index 100% rename from connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageCorrelationException.java rename to connect/core/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageCorrelationException.java diff --git a/connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageService.java b/connect/core/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageService.java similarity index 100% rename from connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageService.java rename to connect/core/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageService.java diff --git a/connect/core/message/message-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/connect/core/message-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from connect/core/message/message-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to connect/core/message-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/connect/core/message/pom.xml b/connect/core/message/pom.xml deleted file mode 100644 index f71f10f94..000000000 --- a/connect/core/message/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - connect-message - connect-message - 4.0.0 - pom - - - io.miranum.platform - connect-core - ${revision} - - - - message-api - - - diff --git a/connect/core/pom.xml b/connect/core/pom.xml index daf65a370..19e2690e3 100644 --- a/connect/core/pom.xml +++ b/connect/core/pom.xml @@ -13,13 +13,13 @@ - task - message - worker - process + task-api + message-api + worker-api + process-api json s3 - element-templates + element-template-api shared diff --git a/connect/core/process/api/pom.xml b/connect/core/process-api/pom.xml similarity index 92% rename from connect/core/process/api/pom.xml rename to connect/core/process-api/pom.xml index 003ab1ed6..f4aa357f7 100644 --- a/connect/core/process/api/pom.xml +++ b/connect/core/process-api/pom.xml @@ -2,14 +2,14 @@ - process-api + connect-process-api process-core 4.0.0 jar io.miranum.platform - connect-process + connect-core ${revision} diff --git a/connect/core/process/api/src/main/java/io/miranum/platform/connect/process/ProcessAutoConfiguration.java b/connect/core/process-api/src/main/java/io/miranum/platform/connect/process/ProcessAutoConfiguration.java similarity index 100% rename from connect/core/process/api/src/main/java/io/miranum/platform/connect/process/ProcessAutoConfiguration.java rename to connect/core/process-api/src/main/java/io/miranum/platform/connect/process/ProcessAutoConfiguration.java diff --git a/connect/core/process/api/src/main/java/io/miranum/platform/connect/process/api/ProcessApi.java b/connect/core/process-api/src/main/java/io/miranum/platform/connect/process/api/ProcessApi.java similarity index 100% rename from connect/core/process/api/src/main/java/io/miranum/platform/connect/process/api/ProcessApi.java rename to connect/core/process-api/src/main/java/io/miranum/platform/connect/process/api/ProcessApi.java diff --git a/connect/core/process/api/src/main/java/io/miranum/platform/connect/process/api/ProcessStartingException.java b/connect/core/process-api/src/main/java/io/miranum/platform/connect/process/api/ProcessStartingException.java similarity index 100% rename from connect/core/process/api/src/main/java/io/miranum/platform/connect/process/api/ProcessStartingException.java rename to connect/core/process-api/src/main/java/io/miranum/platform/connect/process/api/ProcessStartingException.java diff --git a/connect/core/process/api/src/main/java/io/miranum/platform/connect/process/api/StartProcessCommand.java b/connect/core/process-api/src/main/java/io/miranum/platform/connect/process/api/StartProcessCommand.java similarity index 100% rename from connect/core/process/api/src/main/java/io/miranum/platform/connect/process/api/StartProcessCommand.java rename to connect/core/process-api/src/main/java/io/miranum/platform/connect/process/api/StartProcessCommand.java diff --git a/connect/core/process/api/src/main/java/io/miranum/platform/connect/process/impl/ProcessApiImpl.java b/connect/core/process-api/src/main/java/io/miranum/platform/connect/process/impl/ProcessApiImpl.java similarity index 100% rename from connect/core/process/api/src/main/java/io/miranum/platform/connect/process/impl/ProcessApiImpl.java rename to connect/core/process-api/src/main/java/io/miranum/platform/connect/process/impl/ProcessApiImpl.java diff --git a/connect/core/process/api/src/main/java/io/miranum/platform/connect/process/impl/StartProcessPort.java b/connect/core/process-api/src/main/java/io/miranum/platform/connect/process/impl/StartProcessPort.java similarity index 100% rename from connect/core/process/api/src/main/java/io/miranum/platform/connect/process/impl/StartProcessPort.java rename to connect/core/process-api/src/main/java/io/miranum/platform/connect/process/impl/StartProcessPort.java diff --git a/connect/core/process/api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/connect/core/process-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from connect/core/process/api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to connect/core/process-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/connect/core/process/api/src/test/java/io/miranum/platform/connect/.gitkeep b/connect/core/process-api/src/test/java/io/miranum/platform/connect/.gitkeep similarity index 100% rename from connect/core/process/api/src/test/java/io/miranum/platform/connect/.gitkeep rename to connect/core/process-api/src/test/java/io/miranum/platform/connect/.gitkeep diff --git a/connect/core/process/pom.xml b/connect/core/process/pom.xml deleted file mode 100644 index b3614d1f2..000000000 --- a/connect/core/process/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - connect-process - connect-process - 4.0.0 - pom - - - io.miranum.platform - connect-core - ${revision} - - - - api - - - diff --git a/connect/core/task/task-api/pom.xml b/connect/core/task-api/pom.xml similarity index 92% rename from connect/core/task/task-api/pom.xml rename to connect/core/task-api/pom.xml index e92a4c946..1fa353c6c 100644 --- a/connect/core/task/task-api/pom.xml +++ b/connect/core/task-api/pom.xml @@ -2,14 +2,14 @@ - task-api + connect-task-api task-api 4.0.0 jar io.miranum.platform - connect-task + connect-core ${revision} diff --git a/connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/TaskAutoConfiguration.java b/connect/core/task-api/src/main/java/io/miranum/platform/connect/task/TaskAutoConfiguration.java similarity index 100% rename from connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/TaskAutoConfiguration.java rename to connect/core/task-api/src/main/java/io/miranum/platform/connect/task/TaskAutoConfiguration.java diff --git a/connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/api/CompleteTaskCommand.java b/connect/core/task-api/src/main/java/io/miranum/platform/connect/task/api/CompleteTaskCommand.java similarity index 100% rename from connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/api/CompleteTaskCommand.java rename to connect/core/task-api/src/main/java/io/miranum/platform/connect/task/api/CompleteTaskCommand.java diff --git a/connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/api/TaskApi.java b/connect/core/task-api/src/main/java/io/miranum/platform/connect/task/api/TaskApi.java similarity index 100% rename from connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/api/TaskApi.java rename to connect/core/task-api/src/main/java/io/miranum/platform/connect/task/api/TaskApi.java diff --git a/connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/impl/CompleteTaskPort.java b/connect/core/task-api/src/main/java/io/miranum/platform/connect/task/impl/CompleteTaskPort.java similarity index 100% rename from connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/impl/CompleteTaskPort.java rename to connect/core/task-api/src/main/java/io/miranum/platform/connect/task/impl/CompleteTaskPort.java diff --git a/connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/impl/TaskApiImpl.java b/connect/core/task-api/src/main/java/io/miranum/platform/connect/task/impl/TaskApiImpl.java similarity index 100% rename from connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/impl/TaskApiImpl.java rename to connect/core/task-api/src/main/java/io/miranum/platform/connect/task/impl/TaskApiImpl.java diff --git a/connect/core/task/task-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/connect/core/task-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from connect/core/task/task-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to connect/core/task-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/connect/core/task/task-api/src/test/java/io/miranum/platform/connect/.gitkeep b/connect/core/task-api/src/test/java/io/miranum/platform/connect/.gitkeep similarity index 100% rename from connect/core/task/task-api/src/test/java/io/miranum/platform/connect/.gitkeep rename to connect/core/task-api/src/test/java/io/miranum/platform/connect/.gitkeep diff --git a/connect/core/task/pom.xml b/connect/core/task/pom.xml deleted file mode 100644 index 96905cc6d..000000000 --- a/connect/core/task/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - connect-task - connect-task - 4.0.0 - pom - - - io.miranum.platform - connect-core - ${revision} - - - - task-api - - - diff --git a/connect/core/worker/worker-api/pom.xml b/connect/core/worker-api/pom.xml similarity index 94% rename from connect/core/worker/worker-api/pom.xml rename to connect/core/worker-api/pom.xml index 4454e01b4..608d6b3a1 100644 --- a/connect/core/worker/worker-api/pom.xml +++ b/connect/core/worker-api/pom.xml @@ -2,14 +2,14 @@ - worker-api + connect-worker-api worker-core 4.0.0 jar io.miranum.platform - connect-worker + connect-core ${revision} diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/WorkerAutoConfiguration.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/WorkerAutoConfiguration.java similarity index 100% rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/WorkerAutoConfiguration.java rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/WorkerAutoConfiguration.java diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/BusinessException.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/BusinessException.java similarity index 100% rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/BusinessException.java rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/BusinessException.java diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/TechnicalException.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/TechnicalException.java similarity index 100% rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/TechnicalException.java rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/TechnicalException.java diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/Worker.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/Worker.java similarity index 100% rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/Worker.java rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/Worker.java diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerExecuteApi.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerExecuteApi.java similarity index 100% rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerExecuteApi.java rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerExecuteApi.java diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerInterceptor.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerInterceptor.java similarity index 100% rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerInterceptor.java rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerInterceptor.java diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerRegistry.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerRegistry.java similarity index 100% rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerRegistry.java rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerRegistry.java diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerSubscription.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerSubscription.java similarity index 100% rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerSubscription.java rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerSubscription.java diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerAnnotationBeanPostProcessor.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerAnnotationBeanPostProcessor.java similarity index 100% rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerAnnotationBeanPostProcessor.java rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerAnnotationBeanPostProcessor.java diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImpl.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImpl.java similarity index 100% rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImpl.java rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImpl.java diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecutor.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecutor.java similarity index 100% rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecutor.java rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecutor.java diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerRegistryImpl.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerRegistryImpl.java similarity index 100% rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerRegistryImpl.java rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerRegistryImpl.java diff --git a/connect/core/worker/worker-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/connect/core/worker-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from connect/core/worker/worker-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to connect/core/worker-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/connect/core/worker/worker-api/src/test/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImplTest.java b/connect/core/worker-api/src/test/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImplTest.java similarity index 100% rename from connect/core/worker/worker-api/src/test/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImplTest.java rename to connect/core/worker-api/src/test/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImplTest.java diff --git a/connect/core/worker/pom.xml b/connect/core/worker/pom.xml deleted file mode 100644 index cf85bfcf4..000000000 --- a/connect/core/worker/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - connect-worker - connect-worker - 4.0.0 - pom - - - io.miranum.platform - connect-core - ${revision} - - - - worker-api - - - diff --git a/connect/templates/generator-maven-plugin-core/pom.xml b/connect/templates/generator-maven-plugin-core/pom.xml index 120b36288..518ac2031 100644 --- a/connect/templates/generator-maven-plugin-core/pom.xml +++ b/connect/templates/generator-maven-plugin-core/pom.xml @@ -22,14 +22,14 @@ io.miranum.platform - element-template-api + connect-element-template-api ${project.version} io.miranum.platform - worker-api + connect-worker-api ${revision} compile - \ No newline at end of file + diff --git a/platform/engine/core/pom.xml b/platform/engine/core/pom.xml index 0d520fb91..66d4d333b 100644 --- a/platform/engine/core/pom.xml +++ b/platform/engine/core/pom.xml @@ -68,12 +68,12 @@ io.miranum.platform - message-api + connect-message-api ${revision} io.miranum.platform - process-api + connect-process-api ${revision}