Merge pull request 'OZG-6668 update protos and change package name' (#11) from...

Merge pull request 'OZG-6668 update protos and change package name' (#11) from OZG-6668-update-protos into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/fachstellen-proxy/pulls/11


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>
Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

api/gateway-config.yml

@@ -6,5 +6,5 @@ http:
     - selector: de.ozgcloud.fachstellenproxy.FachstelleRegistrationService.Register
       post: /api/fachstellen
       body: "*"
-    - selector: de.ozgcloud.fachstellenproxy.CollaborationService.FindVorgang
+    - selector: de.ozgcloud.collaboration.CollaborationService.FindVorgang
       get: /api/vorgang/{vorgangId}/{samlToken}

api/openapi-config.yml

@@ -50,7 +50,7 @@ openapiOptions:
     - service: de.ozgcloud.fachstellenproxy.FachstelleRegistrationService
       option:
         description: "Service to proxy between Fachstelle and ZufiManager in OZG-Cloud"
-    - service: de.ozgcloud.fachstellenproxy.CollaborationService
+    - service: de.ozgcloud.collaboration.CollaborationService
       option:
         description: "Service to proxy between Fachstelle and CollaborationManager in OZG-Cloud"
   method:
@@ -65,7 +65,7 @@ openapiOptions:
             description: Returned when the request payload is not suitable.
           "503":
             description: Returned when the resource is temporarily unavailable.
-    - method: de.ozgcloud.fachstellenproxy.CollaborationService.FindVorgang
+    - method: de.ozgcloud.collaboration.CollaborationService.FindVorgang
       option:
         description: "Find vorgang by its id"
         summary: "Summary: FindVorgang rpc"
@@ -76,7 +76,7 @@ openapiOptions:
             description: Returned when the resource is temporarily unavailable.
           "404":
             description: Returned when the resource does not exist.
-    - method: de.ozgcloud.fachstellenproxy.CollaborationService.GetFileContent
+    - method: de.ozgcloud.collaboration.CollaborationService.GetFileContent
       option:
         description: "Get file content by file id"
         summary: "Summary: GetFileContent rpc"

api/proto/collaboration.model.proto

@@ -21,13 +21,16 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-
 syntax = "proto3";
 
-package de.ozgcloud.fachstellenproxy;
+package de.ozgcloud.collaboration;
 
 option go_package = "de.ozgcloud.fachstellenproxy";
 
+option java_multiple_files = true;
+option java_package = "de.ozgcloud.collaboration";
+option java_outer_classname = "CollaborationModelProto";
+
 message GrpcFindVorgangRequest {
   string vorgangId = 1;
   string samlToken = 2;
@@ -45,7 +48,6 @@ message GrpcVorgang {
 
   GrpcVorgangHeader header = 5;
   GrpcEingang eingang = 6;
-  GrpcCollaborationRequest collaborationRequest = 7;
 }
 
 message GrpcVorgangHeader {
@@ -53,11 +55,6 @@ message GrpcVorgangHeader {
   string aktenzeichen = 2;
 }
 
-message GrpcCollaborationRequest {
-  string title = 1;
-  string text = 2;
-}
-
 message GrpcEingang {
   GrpcAntragsteller antragsteller = 1;
 

api/proto/collaboration.proto

@@ -21,17 +21,23 @@
  * Die sprachspezifischen Genehmigungen und Beschränkungen
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
-
 syntax = "proto3";
 
-package de.ozgcloud.fachstellenproxy;
+package de.ozgcloud.collaboration;
 
 import "collaboration.model.proto";
 
 option go_package = "de.ozgcloud.fachstellenproxy";
 
+option java_multiple_files = true;
+option java_package = "de.ozgcloud.collaboration";
+option java_outer_classname = "CollaborationProto";
+
 service CollaborationService {
-  rpc FindVorgang(GrpcFindVorgangRequest) returns (GrpcFindVorgangResponse);
 
-  rpc GetFileContent(GrpcGetFileContentRequest) returns (stream GrpcGetFileContentResponse);
+  rpc FindVorgang(GrpcFindVorgangRequest) returns (GrpcFindVorgangResponse) {
+  }
+
+  rpc GetFileContent(GrpcGetFileContentRequest) returns (stream GrpcGetFileContentResponse) {
+  }
 }
\ No newline at end of file

config/config.yml

@@ -2,9 +2,11 @@ http:
   server:
     port: 8082
 grpc:
-  mock: true
+  mock: false
   collaboration:
     router:
       port: 50051
+    server:
+      port: 9090
 logging:
   level: "INFO"
\ No newline at end of file