diff --git a/pluto-interface/pom.xml b/pluto-interface/pom.xml index 67d210ac1bca34606cde35055a07278327a644e1..ff5071b8bf73f45eab3e1e8d94d2ab5992958969 100644 --- a/pluto-interface/pom.xml +++ b/pluto-interface/pom.xml @@ -68,6 +68,11 @@ <outputTargets> <outputTarget> <type>java</type> + <!-- <outputOptions>lite</outputOptions> --> + </outputTarget> + <outputTarget> + <type>grpc-java</type> + <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.33.1</pluginArtifact> </outputTarget> </outputTargets> </configuration> @@ -75,12 +80,6 @@ </executions> </plugin> - - <!-- <plugin> <groupId>org.xolstice.maven.plugins</groupId> <artifactId>protobuf-maven-plugin</artifactId> - <version>${protocol-buffer-plugin.version}</version> <configuration> <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact> - <pluginId>grpc-java</pluginId> <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact> - </configuration> <executions> <execution> <goals> <goal>compile</goal> <goal>compile-custom</goal> - </goals> </execution> </executions> </plugin> --> </plugins> </build> diff --git a/pluto-interface/src/main/protobuf/vorgang.proto b/pluto-interface/src/main/protobuf/vorgang.proto index 0507f596f9adae90d27a5cd7081d5cd873dbb1ad..f2d9eec73b9d7b681c9d50d04364ccadce01f2b9 100644 --- a/pluto-interface/src/main/protobuf/vorgang.proto +++ b/pluto-interface/src/main/protobuf/vorgang.proto @@ -18,7 +18,26 @@ message CreateVorgangRequest { message Eingang { string id = 1; - string name=2; + EingangHeader header = 2; + repeated SubForm form = 3; +} + +message EingangHeader { + string requestId = 1; + string formId = 2; + string formName = 3; +} + +message SubForm { + string title = 1; + repeated Field field = 2; + repeated SubForm subForm = 3; + +} + +message Field { + string name = 1; + string value = 2; } message CreateVorgangReply { diff --git a/pluto-server/pom.xml b/pluto-server/pom.xml index fa4e2f5e0af0dc1493999d4509d24afe323dea43..e4639f8879463c5ad63a6b5c79b935432a921821 100644 --- a/pluto-server/pom.xml +++ b/pluto-server/pom.xml @@ -17,7 +17,7 @@ <properties> <java.version>15</java.version> - + <grpc.spring-boot-starter.version>2.10.1.RELEASE</grpc.spring-boot-starter.version> </properties> @@ -28,17 +28,17 @@ <artifactId>spring-boot-starter-data-mongodb</artifactId> </dependency> <dependency> - <groupId>net.devh</groupId> - <artifactId>grpc-server-spring-boot-starter</artifactId> - <version>${grpc.spring-boot-starter.version}</version> - </dependency> - - <!-- own projects --> - <dependency> - <groupId>de.itvsh.ozg.pluto</groupId> - <artifactId>pluto-interface</artifactId> - <version>${project.version}</version> - </dependency> + <groupId>net.devh</groupId> + <artifactId>grpc-server-spring-boot-starter</artifactId> + <version>${grpc.spring-boot-starter.version}</version> + </dependency> + + <!-- own projects --> + <dependency> + <groupId>de.itvsh.ozg.pluto</groupId> + <artifactId>pluto-interface</artifactId> + <version>${project.version}</version> + </dependency> <!-- Dev --> <dependency> diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/PlutoServerApplication.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/PlutoServerApplication.java index 0fde7e9f45de5e66fc74e6e102698b1ca5f9efef..df8e8f034bd2c4e637a2bac4ab2108f7a044f38d 100644 --- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/PlutoServerApplication.java +++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/PlutoServerApplication.java @@ -10,4 +10,5 @@ public class PlutoServerApplication { SpringApplication.run(PlutoServerApplication.class, args); } + } 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 new file mode 100644 index 0000000000000000000000000000000000000000..e88aed68cede22ff37fd50da834b7d7c64facbd3 --- /dev/null +++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/GrpcVorgangService.java @@ -0,0 +1,17 @@ +package de.itvsh.ozg.pluto.vorgang; + +import io.grpc.stub.StreamObserver; +import net.devh.boot.grpc.server.service.GrpcService; + +@GrpcService +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()); + var reply = CreateVorgangReply.newBuilder().setMessage("ok").build(); + responseObserver.onNext(reply); + responseObserver.onCompleted(); + } +}