From c37d0fbe778208bc36661b448fb52091c2cc44e2 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Mon, 17 Mar 2025 14:10:17 +0100
Subject: [PATCH] OZG-7573 use vorgang-maanger-interface proto messages
---
eingang-manager-interface/pom.xml | 15 +++++
.../src/main/protobuf/common.model.proto | 46 ---------------
...arding.model.proto => forward.model.proto} | 58 ++-----------------
.../{forwarding.proto => forward.proto} | 6 +-
4 files changed, 22 insertions(+), 103 deletions(-)
delete mode 100644 eingang-manager-interface/src/main/protobuf/common.model.proto
rename eingang-manager-interface/src/main/protobuf/{forwarding.model.proto => forward.model.proto} (65%)
rename eingang-manager-interface/src/main/protobuf/{forwarding.proto => forward.proto} (90%)
diff --git a/eingang-manager-interface/pom.xml b/eingang-manager-interface/pom.xml
index dc3858f82..2aa828f6c 100644
--- a/eingang-manager-interface/pom.xml
+++ b/eingang-manager-interface/pom.xml
@@ -45,6 +45,7 @@
<inceptionYear>2025</inceptionYear>
<properties>
+ <vorgang-manager.version>2.23.0</vorgang-manager.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -68,6 +69,19 @@
</dependencyManagement>
<dependencies>
+ <!-- OZG-Cloud -->
+ <dependency>
+ <groupId>de.ozgcloud.vorgang</groupId>
+ <artifactId>vorgang-manager-interface</artifactId>
+ <version>${vorgang-manager.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.ozgcloud.vorgang</groupId>
+ <artifactId>vorgang-manager-interface</artifactId>
+ <classifier>sources</classifier>
+ <scope>provided</scope>
+ <version>${vorgang-manager.version}</version>
+ </dependency>
<!-- GRPC -->
<dependency>
<groupId>io.grpc</groupId>
@@ -106,6 +120,7 @@
</goals>
<configuration>
<protocVersion>${protobuf.version}</protocVersion>
+ <includeMavenTypes>direct</includeMavenTypes>
<outputTargets>
<outputTarget>
<type>java</type>
diff --git a/eingang-manager-interface/src/main/protobuf/common.model.proto b/eingang-manager-interface/src/main/protobuf/common.model.proto
deleted file mode 100644
index 25067f3e9..000000000
--- a/eingang-manager-interface/src/main/protobuf/common.model.proto
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2023 Das Land Schleswig-Holstein vertreten durch den
- * Ministerpräsidenten des Landes Schleswig-Holstein
- * Staatskanzlei
- * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
- *
- * Lizenziert unter der EUPL, Version 1.2 oder - sobald
- * diese von der Europäischen Kommission genehmigt wurden -
- * Folgeversionen der EUPL ("Lizenz");
- * Sie dürfen dieses Werk ausschließlich gemäß
- * dieser Lizenz nutzen.
- * Eine Kopie der Lizenz finden Sie hier:
- *
- * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
- * Sofern nicht durch anwendbare Rechtsvorschriften
- * gefordert oder in schriftlicher Form vereinbart, wird
- * die unter der Lizenz verbreitete Software "so wie sie
- * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
- * ausdrücklich oder stillschweigend - verbreitet.
- * Die sprachspezifischen Genehmigungen und Beschränkungen
- * unter der Lizenz sind dem Lizenztext zu entnehmen.
- */
-syntax = "proto3";
-
-package de.ozgcloud.eingang.common;
-
-option java_multiple_files = true;
-option java_package = "de.ozgcloud.eingang.common";
-option java_outer_classname = "CommonModelProto";
-
-message GrpcObject {
- repeated GrpcProperty property = 1;
- repeated GrpcSubObject subObject = 2;
-}
-
-message GrpcProperty {
- string name = 1;
- repeated string value = 2;
-}
-
-message GrpcSubObject {
- string name = 1;
- repeated GrpcProperty property = 2;
- repeated GrpcSubObject subObject = 3;
-}
\ No newline at end of file
diff --git a/eingang-manager-interface/src/main/protobuf/forwarding.model.proto b/eingang-manager-interface/src/main/protobuf/forward.model.proto
similarity index 65%
rename from eingang-manager-interface/src/main/protobuf/forwarding.model.proto
rename to eingang-manager-interface/src/main/protobuf/forward.model.proto
index 64a281597..963450aa4 100644
--- a/eingang-manager-interface/src/main/protobuf/forwarding.model.proto
+++ b/eingang-manager-interface/src/main/protobuf/forward.model.proto
@@ -25,7 +25,7 @@ syntax = "proto3";
package de.ozgcloud.eingang.forwarder;
-import "common.model.proto";
+import "vorgang.model.proto";
option java_multiple_files = true;
option java_package = "de.ozgcloud.eingang.forwarding";
@@ -50,59 +50,9 @@ message GrpcRouteForwarding {
}
message GrpcEingangStub {
- GrpcEingangHeader header = 1;
- GrpcAntragsteller antragsteller = 2;
- GrpcFormData formData = 3;
-}
-
-message GrpcEingangHeader {
- string requestId = 1;
- string vorgangNummer = 2;
- string createdAt = 3;
- string formId = 4;
- string formName = 5;
- string formEngineName = 6;
- string sender = 7;
- GrpcServiceKonto serviceKonto = 8;
-}
-
-message GrpcServiceKonto {
- string type = 1;
- repeated GrpcPostfachAddress postfachAddresses = 2;
- string trustLevel = 3;
-}
-
-message GrpcPostfachAddress {
- string version = 1;
- de.ozgcloud.eingang.common.GrpcObject identifier = 2;
- int32 type = 3;
-}
-
-message GrpcAntragsteller {
- string anrede = 1;
- string nachname = 2;
- string vorname = 3;
- string geburtsdatum = 4;
- string geburtsort = 5;
- string geburtsname = 6;
- string email = 7;
- string telefon = 8;
- string strasse = 9;
- string hausnummer = 10;
- string plz = 11;
- string ort = 12;
- GrpcFormData data = 13;
- string firmaName = 14;
-}
-
-message GrpcFormData {
- repeated GrpcFormField field = 1;
- repeated GrpcFormData form = 2;
-}
-
-message GrpcFormField {
- string name = 1;
- string value = 2;
+ de.ozgcloud.vorgang.vorgang.GrpcEingangHeader header = 1;
+ de.ozgcloud.vorgang.vorgang.GrpcAntragsteller antragsteller = 2;
+ de.ozgcloud.vorgang.vorgang.GrpcFormData formData = 3;
}
message GrpcRouteCriteria {
diff --git a/eingang-manager-interface/src/main/protobuf/forwarding.proto b/eingang-manager-interface/src/main/protobuf/forward.proto
similarity index 90%
rename from eingang-manager-interface/src/main/protobuf/forwarding.proto
rename to eingang-manager-interface/src/main/protobuf/forward.proto
index 0d6c4100d..6d6085eba 100644
--- a/eingang-manager-interface/src/main/protobuf/forwarding.proto
+++ b/eingang-manager-interface/src/main/protobuf/forward.proto
@@ -25,7 +25,7 @@ syntax = "proto3";
package de.ozgcloud.eingang.forwarder;
-import "forwarding.model.proto";
+import "forward.model.proto";
option java_multiple_files = true;
option java_package = "de.ozgcloud.eingang.forwarder";
@@ -33,7 +33,7 @@ option java_outer_classname = "RouteForwardingProto";
service RouteForwardingService {
- rpc RouteForwarding(stream GrpcRouteForwardingRequest) returns (GrpcRouteForwardingResponse) {
- }
+ rpc RouteForwarding(stream GrpcRouteForwardingRequest) returns (GrpcRouteForwardingResponse) {
+ }
}
\ No newline at end of file
--
GitLab