From 136f11a3f13bb021e1adb60a999be06ebbf72f59 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 26 Nov 2020 15:26:47 +0100
Subject: [PATCH] OZG-94 make grpc usable
---
pluto-interface/lombok.config | 5 +++++
pluto-interface/pom.xml | 3 +++
.../src/main/protobuf/vorgang.proto | 18 +++++++++++++++++-
pluto-server/lombok.config | 5 +++++
.../ozg/pluto/vorgang/GrpcVorgangService.java | 5 ++++-
5 files changed, 34 insertions(+), 2 deletions(-)
create mode 100644 pluto-interface/lombok.config
create mode 100644 pluto-server/lombok.config
diff --git a/pluto-interface/lombok.config b/pluto-interface/lombok.config
new file mode 100644
index 000000000..18425cbe7
--- /dev/null
+++ b/pluto-interface/lombok.config
@@ -0,0 +1,5 @@
+lombok.log.fieldName=LOG
+lombok.log.slf4j.flagUsage = ERROR
+lombok.log.log4j.flagUsage = ERROR
+lombok.data.flagUsage = ERROR
+lombok.nonNull.exceptionType = IllegalArgumentException
\ No newline at end of file
diff --git a/pluto-interface/pom.xml b/pluto-interface/pom.xml
index ff5071b8b..60798971c 100644
--- a/pluto-interface/pom.xml
+++ b/pluto-interface/pom.xml
@@ -11,6 +11,9 @@
<description>Interface for Pluto Server</description>
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
<java.version>15</java.version>
<grpc.version>1.33.1</grpc.version>
diff --git a/pluto-interface/src/main/protobuf/vorgang.proto b/pluto-interface/src/main/protobuf/vorgang.proto
index f2d9eec73..8a397d8f4 100644
--- a/pluto-interface/src/main/protobuf/vorgang.proto
+++ b/pluto-interface/src/main/protobuf/vorgang.proto
@@ -19,7 +19,23 @@ message CreateVorgangRequest {
message Eingang {
string id = 1;
EingangHeader header = 2;
- repeated SubForm form = 3;
+ Antragsteller antragsteller = 3;
+
+ repeated Field field = 10;
+ repeated SubForm form = 11;
+}
+
+message Antragsteller {
+ string anrede = 1;
+ string nachname = 2;
+ string vorname = 3;
+ string geburtsdatum = 4;
+ string geburtsort = 5;
+
+ string geburtsname = 20;
+
+ repeated Field otherField = 30;
+ repeated SubForm subForm = 31;
}
message EingangHeader {
diff --git a/pluto-server/lombok.config b/pluto-server/lombok.config
new file mode 100644
index 000000000..18425cbe7
--- /dev/null
+++ b/pluto-server/lombok.config
@@ -0,0 +1,5 @@
+lombok.log.fieldName=LOG
+lombok.log.slf4j.flagUsage = ERROR
+lombok.log.log4j.flagUsage = ERROR
+lombok.data.flagUsage = ERROR
+lombok.nonNull.exceptionType = IllegalArgumentException
\ No newline at end of file
diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/GrpcVorgangService.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/GrpcVorgangService.java
index e88aed68c..b68e07a39 100644
--- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/GrpcVorgangService.java
+++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/GrpcVorgangService.java
@@ -1,15 +1,18 @@
package de.itvsh.ozg.pluto.vorgang;
import io.grpc.stub.StreamObserver;
+import lombok.extern.log4j.Log4j2;
import net.devh.boot.grpc.server.service.GrpcService;
@GrpcService
+@Log4j2
class GrpcVorgangService extends VorgangServiceGrpc.VorgangServiceImplBase {
@Override
public void createVorgang(de.itvsh.ozg.pluto.vorgang.CreateVorgangRequest request, StreamObserver<CreateVorgangReply> responseObserver) {
- System.out.println("creating vorgang: " + request.toString());
+ LOG.info("creating vorgang:\n{}", request.toString());
+
var reply = CreateVorgangReply.newBuilder().setMessage("ok").build();
responseObserver.onNext(reply);
responseObserver.onCompleted();
--
GitLab