From e82c98f19e6d8f0d3857280f829bd963f8b9adad Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 19 May 2023 10:47:54 +0200
Subject: [PATCH] OZG-3719 OZG-3799 adjust pacakge for .proto and genereated
sources; use formcycle-interface snapshot version
---
formcycle-adapter/formcycle-adapter-impl/pom.xml | 2 +-
.../eingang/formcycle/FormCycleFormDataMapper.java | 1 -
.../de/ozgcloud/eingang/formcycle/FormDataController.java | 7 +------
.../eingang/formcycle/FormcycleAdapterApplication.java | 2 +-
.../formcycle/FormCycleAttachmentGroupTestFactory.java | 2 --
.../eingang/formcycle/FormCycleFormDataMapperTest.java | 1 -
.../eingang/formcycle/FormCycleFormDataTestFactory.java | 4 +---
.../eingang/formcycle/FormCycleFormHeaderTestFactory.java | 3 +--
.../formcycle/FormCyclePostfachAddressTestFactory.java | 3 +--
.../formcycle/FormCycleServiceKontoTestFactory.java | 4 +---
.../ozgcloud/eingang/formcycle/FormDataControllerTest.java | 6 +-----
.../src/main/protobuf/form-data.model.proto | 4 ++--
formsolutions-adapter/pom.xml | 2 +-
intelliform-adapter/pom.xml | 2 +-
14 files changed, 12 insertions(+), 31 deletions(-)
diff --git a/formcycle-adapter/formcycle-adapter-impl/pom.xml b/formcycle-adapter/formcycle-adapter-impl/pom.xml
index 3780ceaf9..5c0ce0339 100644
--- a/formcycle-adapter/formcycle-adapter-impl/pom.xml
+++ b/formcycle-adapter/formcycle-adapter-impl/pom.xml
@@ -36,7 +36,7 @@
<name>EM - Formcycle Adapter - Implementation</name>
<properties>
- <formcycle-interface.version>1.3.0</formcycle-interface.version>
+ <formcycle-interface.version>1.10.0-SNAPSHOT</formcycle-interface.version>
</properties>
<dependencies>
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapper.java b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapper.java
index 9af9edb81..776acf93c 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapper.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapper.java
@@ -26,7 +26,6 @@ package de.ozgcloud.eingang.formcycle;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData;
import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper;
import de.ozgcloud.eingang.common.formdata.FormData;
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java
index b1c18ae56..4d9717afc 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java
@@ -39,18 +39,13 @@ import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleAttachmentGroup;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleConfirmationResponse;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCyclePostfachAddress;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleServiceKonto;
import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
import de.ozgcloud.eingang.common.formdata.ServiceKonto;
-import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
+import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
import de.ozgcloud.eingang.semantik.SemantikAdapter;
import de.ozgcloud.eingang.semantik.enginebased.FilesMapperHelper;
import lombok.RequiredArgsConstructor;
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormcycleAdapterApplication.java b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormcycleAdapterApplication.java
index 89e485f5a..f686a4723 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormcycleAdapterApplication.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormcycleAdapterApplication.java
@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean;
import de.ozgcloud.eingang.semantik.enginebased.EngineBasedSemantikAdapter;
import de.ozgcloud.eingang.semantik.enginebased.formcycle.FormCycleEngineBasedAdapter;
-@SpringBootApplication(scanBasePackages = "de.itvsh.kop")
+@SpringBootApplication(scanBasePackages = { "de.itvsh.kop", "de.ozgcloud.*" })
public class FormcycleAdapterApplication {
public static void main(String[] args) {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleAttachmentGroupTestFactory.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleAttachmentGroupTestFactory.java
index df3aeae15..0d7eed096 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleAttachmentGroupTestFactory.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleAttachmentGroupTestFactory.java
@@ -23,7 +23,6 @@
*/
package de.ozgcloud.eingang.formcycle;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleAttachmentGroup;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
@@ -37,6 +36,5 @@ public class FormCycleAttachmentGroupTestFactory {
return FormCycleAttachmentGroup.newBuilder()
.setName(IncomingFileGroupTestFactory.NAME)
.addFileId(IncomingFileTestFactory.NAME);
-
}
}
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java
index 409e8e2d2..f8217b257 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataMapperTest.java
@@ -32,7 +32,6 @@ import org.mockito.InjectMocks;
import org.mockito.Spy;
import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper;
-import de.ozgcloud.eingang.formcycle.FormCycleFormDataMapper;
class FormCycleFormDataMapperTest {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataTestFactory.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataTestFactory.java
index 4ed6d89cf..24a160529 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataTestFactory.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormDataTestFactory.java
@@ -23,11 +23,9 @@
*/
package de.ozgcloud.eingang.formcycle;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleAttachmentGroup;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData.Builder;
import de.itvsh.kop.pluto.common.grpc.GrpcFormDataTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
+import de.ozgcloud.eingang.formcycle.FormCycleFormData.Builder;
class FormCycleFormDataTestFactory {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormHeaderTestFactory.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormHeaderTestFactory.java
index 124c3d624..43b5accd0 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormHeaderTestFactory.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleFormHeaderTestFactory.java
@@ -23,8 +23,7 @@
*/
package de.ozgcloud.eingang.formcycle;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormHeader;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormHeader.Builder;
+import de.ozgcloud.eingang.formcycle.FormCycleFormHeader.Builder;
public class FormCycleFormHeaderTestFactory {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCyclePostfachAddressTestFactory.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCyclePostfachAddressTestFactory.java
index dd017cd43..574486449 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCyclePostfachAddressTestFactory.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCyclePostfachAddressTestFactory.java
@@ -2,9 +2,8 @@ package de.ozgcloud.eingang.formcycle;
import java.util.UUID;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCyclePostfachAddress;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCyclePostfachAddress.Builder;
import de.ozgcloud.eingang.common.formdata.PostfachAddressTestFactory;
+import de.ozgcloud.eingang.formcycle.FormCyclePostfachAddress.Builder;
public class FormCyclePostfachAddressTestFactory {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoTestFactory.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoTestFactory.java
index 3c2fbe87b..486eb12a5 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoTestFactory.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormCycleServiceKontoTestFactory.java
@@ -25,9 +25,7 @@ package de.ozgcloud.eingang.formcycle;
import java.util.UUID;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCyclePostfachAddress;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleServiceKonto;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleServiceKonto.Builder;
+import de.ozgcloud.eingang.formcycle.FormCycleServiceKonto.Builder;
public class FormCycleServiceKontoTestFactory {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerTest.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerTest.java
index 77dc6e37d..04df09b1e 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerTest.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerTest.java
@@ -46,17 +46,13 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleConfirmationResponse;
-import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
import de.ozgcloud.eingang.common.formdata.FormHeader;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
-import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
import de.ozgcloud.eingang.common.formdata.ServiceKonto.PostfachAddress;
-import de.ozgcloud.eingang.formcycle.FormCycleFormDataMapper;
-import de.ozgcloud.eingang.formcycle.FormDataController;
+import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
import de.ozgcloud.eingang.formcycle.common.protobuf.ProtobufMessageConverter;
import de.ozgcloud.eingang.semantik.SemantikAdapter;
import lombok.SneakyThrows;
diff --git a/formcycle-adapter/formcycle-adapter-interface/src/main/protobuf/form-data.model.proto b/formcycle-adapter/formcycle-adapter-interface/src/main/protobuf/form-data.model.proto
index 1514a00a2..b476eac4e 100644
--- a/formcycle-adapter/formcycle-adapter-interface/src/main/protobuf/form-data.model.proto
+++ b/formcycle-adapter/formcycle-adapter-interface/src/main/protobuf/form-data.model.proto
@@ -23,13 +23,13 @@
*/
syntax = "proto3";
-package de.itvsh.kop.eingangsadapter.formcycle;
+package de.ozgcloud.eingang.formcycle;
/*import "common.model.proto";*/
import "vorgangmodel.proto";
option java_multiple_files = true;
-option java_package = "de.itvsh.kop.eingangsadapter.formcycle";
+option java_package = "de.ozgcloud.eingang.formcycle";
option java_outer_classname = "FormcycleFormDataProto";
message FormCycleConfirmationResponse {
diff --git a/formsolutions-adapter/pom.xml b/formsolutions-adapter/pom.xml
index 11a4d7387..143e6af44 100644
--- a/formsolutions-adapter/pom.xml
+++ b/formsolutions-adapter/pom.xml
@@ -144,7 +144,7 @@
</executions>
<configuration>
<schemaLanguage>WSDL</schemaLanguage>
- <generatePackage>de.itvsh.kop.eingangsadapter.formsolutions</generatePackage>
+ <generatePackage>de.ozgcloud.eingang.formsolutions</generatePackage>
<schemas>
<schema>
<fileset>
diff --git a/intelliform-adapter/pom.xml b/intelliform-adapter/pom.xml
index 426682ce6..12c342127 100644
--- a/intelliform-adapter/pom.xml
+++ b/intelliform-adapter/pom.xml
@@ -189,7 +189,7 @@
<configuration>
<strict>false</strict>
<schemaLanguage>WSDL</schemaLanguage>
- <generatePackage>de.itvsh.kop.eingangsadapter.intelliform</generatePackage>
+ <generatePackage>de.ozgcloud.eingang.intelliform</generatePackage>
<schemas>
<schema>
<fileset>
--
GitLab