Skip to content
Snippets Groups Projects
Commit e82c98f1 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-3719 OZG-3799 adjust pacakge for .proto and genereated sources; use...

OZG-3719 OZG-3799 adjust pacakge for .proto and genereated sources; use formcycle-interface snapshot version
parent 9e46b226
No related branches found
No related tags found
No related merge requests found
Showing
with 12 additions and 31 deletions
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<name>EM - Formcycle Adapter - Implementation</name> <name>EM - Formcycle Adapter - Implementation</name>
<properties> <properties>
<formcycle-interface.version>1.3.0</formcycle-interface.version> <formcycle-interface.version>1.10.0-SNAPSHOT</formcycle-interface.version>
</properties> </properties>
<dependencies> <dependencies>
......
...@@ -26,7 +26,6 @@ package de.ozgcloud.eingang.formcycle; ...@@ -26,7 +26,6 @@ package de.ozgcloud.eingang.formcycle;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mapping; import org.mapstruct.Mapping;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormData;
import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper; import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper;
import de.ozgcloud.eingang.common.formdata.FormData; import de.ozgcloud.eingang.common.formdata.FormData;
......
...@@ -39,18 +39,13 @@ import org.springframework.web.bind.annotation.RequestPart; ...@@ -39,18 +39,13 @@ import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile; 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.errorhandling.TechnicalException;
import de.ozgcloud.eingang.common.formdata.FormData; import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.IncomingFile; import de.ozgcloud.eingang.common.formdata.IncomingFile;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroup; import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
import de.ozgcloud.eingang.common.formdata.ServiceKonto; 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.ServiceKonto.PostfachAddress;
import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
import de.ozgcloud.eingang.semantik.SemantikAdapter; import de.ozgcloud.eingang.semantik.SemantikAdapter;
import de.ozgcloud.eingang.semantik.enginebased.FilesMapperHelper; import de.ozgcloud.eingang.semantik.enginebased.FilesMapperHelper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
......
...@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean; ...@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean;
import de.ozgcloud.eingang.semantik.enginebased.EngineBasedSemantikAdapter; import de.ozgcloud.eingang.semantik.enginebased.EngineBasedSemantikAdapter;
import de.ozgcloud.eingang.semantik.enginebased.formcycle.FormCycleEngineBasedAdapter; import de.ozgcloud.eingang.semantik.enginebased.formcycle.FormCycleEngineBasedAdapter;
@SpringBootApplication(scanBasePackages = "de.itvsh.kop") @SpringBootApplication(scanBasePackages = { "de.itvsh.kop", "de.ozgcloud.*" })
public class FormcycleAdapterApplication { public class FormcycleAdapterApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
*/ */
package de.ozgcloud.eingang.formcycle; 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.IncomingFileGroupTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory; import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
...@@ -37,6 +36,5 @@ public class FormCycleAttachmentGroupTestFactory { ...@@ -37,6 +36,5 @@ public class FormCycleAttachmentGroupTestFactory {
return FormCycleAttachmentGroup.newBuilder() return FormCycleAttachmentGroup.newBuilder()
.setName(IncomingFileGroupTestFactory.NAME) .setName(IncomingFileGroupTestFactory.NAME)
.addFileId(IncomingFileTestFactory.NAME); .addFileId(IncomingFileTestFactory.NAME);
} }
} }
...@@ -32,7 +32,6 @@ import org.mockito.InjectMocks; ...@@ -32,7 +32,6 @@ import org.mockito.InjectMocks;
import org.mockito.Spy; import org.mockito.Spy;
import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper; import de.itvsh.kop.pluto.common.grpc.GrpcFormDataMapper;
import de.ozgcloud.eingang.formcycle.FormCycleFormDataMapper;
class FormCycleFormDataMapperTest { class FormCycleFormDataMapperTest {
......
...@@ -23,11 +23,9 @@ ...@@ -23,11 +23,9 @@
*/ */
package de.ozgcloud.eingang.formcycle; 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.itvsh.kop.pluto.common.grpc.GrpcFormDataTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory; import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
import de.ozgcloud.eingang.formcycle.FormCycleFormData.Builder;
class FormCycleFormDataTestFactory { class FormCycleFormDataTestFactory {
......
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
*/ */
package de.ozgcloud.eingang.formcycle; package de.ozgcloud.eingang.formcycle;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormHeader; import de.ozgcloud.eingang.formcycle.FormCycleFormHeader.Builder;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleFormHeader.Builder;
public class FormCycleFormHeaderTestFactory { public class FormCycleFormHeaderTestFactory {
......
...@@ -2,9 +2,8 @@ package de.ozgcloud.eingang.formcycle; ...@@ -2,9 +2,8 @@ package de.ozgcloud.eingang.formcycle;
import java.util.UUID; 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.common.formdata.PostfachAddressTestFactory;
import de.ozgcloud.eingang.formcycle.FormCyclePostfachAddress.Builder;
public class FormCyclePostfachAddressTestFactory { public class FormCyclePostfachAddressTestFactory {
......
...@@ -25,9 +25,7 @@ package de.ozgcloud.eingang.formcycle; ...@@ -25,9 +25,7 @@ package de.ozgcloud.eingang.formcycle;
import java.util.UUID; import java.util.UUID;
import de.itvsh.kop.eingangsadapter.formcycle.FormCyclePostfachAddress; import de.ozgcloud.eingang.formcycle.FormCycleServiceKonto.Builder;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleServiceKonto;
import de.itvsh.kop.eingangsadapter.formcycle.FormCycleServiceKonto.Builder;
public class FormCycleServiceKontoTestFactory { public class FormCycleServiceKontoTestFactory {
......
...@@ -46,17 +46,13 @@ import org.springframework.test.web.servlet.MockMvc; ...@@ -46,17 +46,13 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.setup.MockMvcBuilders; 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.FormData;
import de.ozgcloud.eingang.common.formdata.FormDataTestFactory; import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
import de.ozgcloud.eingang.common.formdata.FormHeader; import de.ozgcloud.eingang.common.formdata.FormHeader;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory; import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory; 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.common.formdata.ServiceKonto.PostfachAddress;
import de.ozgcloud.eingang.formcycle.FormCycleFormDataMapper; import de.ozgcloud.eingang.common.formdata.StringBasedIdentifier;
import de.ozgcloud.eingang.formcycle.FormDataController;
import de.ozgcloud.eingang.formcycle.common.protobuf.ProtobufMessageConverter; import de.ozgcloud.eingang.formcycle.common.protobuf.ProtobufMessageConverter;
import de.ozgcloud.eingang.semantik.SemantikAdapter; import de.ozgcloud.eingang.semantik.SemantikAdapter;
import lombok.SneakyThrows; import lombok.SneakyThrows;
......
...@@ -23,13 +23,13 @@ ...@@ -23,13 +23,13 @@
*/ */
syntax = "proto3"; syntax = "proto3";
package de.itvsh.kop.eingangsadapter.formcycle; package de.ozgcloud.eingang.formcycle;
/*import "common.model.proto";*/ /*import "common.model.proto";*/
import "vorgangmodel.proto"; import "vorgangmodel.proto";
option java_multiple_files = true; 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"; option java_outer_classname = "FormcycleFormDataProto";
message FormCycleConfirmationResponse { message FormCycleConfirmationResponse {
......
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
</executions> </executions>
<configuration> <configuration>
<schemaLanguage>WSDL</schemaLanguage> <schemaLanguage>WSDL</schemaLanguage>
<generatePackage>de.itvsh.kop.eingangsadapter.formsolutions</generatePackage> <generatePackage>de.ozgcloud.eingang.formsolutions</generatePackage>
<schemas> <schemas>
<schema> <schema>
<fileset> <fileset>
......
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
<configuration> <configuration>
<strict>false</strict> <strict>false</strict>
<schemaLanguage>WSDL</schemaLanguage> <schemaLanguage>WSDL</schemaLanguage>
<generatePackage>de.itvsh.kop.eingangsadapter.intelliform</generatePackage> <generatePackage>de.ozgcloud.eingang.intelliform</generatePackage>
<schemas> <schemas>
<schema> <schema>
<fileset> <fileset>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment