Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vorgang-manager
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OZG-Cloud
app
vorgang-manager
Commits
692dc220
Commit
692dc220
authored
1 month ago
by
Krzysztof Witukiewicz
Browse files
Options
Downloads
Patches
Plain Diff
OZG-7573 OZG-7991 Use StreamingFileSender from common-lib
parent
ac2444a7
No related branches found
No related tags found
1 merge request
!27
OZG-7573 Dateien Weiterleiten
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
vorgang-manager-server/pom.xml
+1
-1
1 addition, 1 deletion
vorgang-manager-server/pom.xml
vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/EingangForwarder.java
+8
-8
8 additions, 8 deletions
...e/ozgcloud/vorgang/vorgang/redirect/EingangForwarder.java
with
9 additions
and
9 deletions
vorgang-manager-server/pom.xml
+
1
−
1
View file @
692dc220
...
...
@@ -51,7 +51,7 @@
<spring-boot.build-image.imageName>
docker.ozg-sh.de/vorgang-manager:build-latest
</spring-boot.build-image.imageName>
<zufi-manager-interface.version>
1.6.0
</zufi-manager-interface.version>
<common-lib.version>
4.1
2
.0
</common-lib.version>
<common-lib.version>
4.1
3
.0
-OZG-7573-files-weiterleitung-bug-SNAPSHOT
</common-lib.version>
<user-manager-interface.version>
2.12.0
</user-manager-interface.version>
<processor-manager.version>
0.5.0
</processor-manager.version>
<nachrichten-manager.version>
2.19.0
</nachrichten-manager.version>
...
...
This diff is collapsed.
Click to expand it.
vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/EingangForwarder.java
+
8
−
8
View file @
692dc220
...
...
@@ -11,6 +11,7 @@ import java.util.function.Function;
import
com.google.protobuf.ByteString
;
import
de.ozgcloud.common.binaryfile.GrpcFileUploadUtils
;
import
de.ozgcloud.common.binaryfile.StreamingFileSender
;
import
de.ozgcloud.eingang.forwarder.RouteForwardingServiceGrpc
;
import
de.ozgcloud.eingang.forwarding.GrpcAttachment
;
import
de.ozgcloud.eingang.forwarding.GrpcFileContent
;
...
...
@@ -93,15 +94,14 @@ class EingangForwarder {
private
CompletableFuture
<
GrpcRouteForwardingResponse
>
sendAttachmentFile
(
String
groupName
,
IncomingFile
file
)
{
var
fileContentStream
=
fileService
.
getUploadedFileStream
(
file
.
getId
());
var
sender
=
createAttachmentFileSender
(
groupName
,
file
,
fileContentStream
).
send
(
responseObserver:
:
registerOnReadyHandler
);
var
sender
=
createAttachmentFileSender
(
groupName
,
file
,
fileContentStream
).
send
();
return
sender
.
getResultFuture
();
}
GrpcFileUploadUtils
.
FileSender
<
GrpcRouteForwardingRequest
,
GrpcRouteForwardingResponse
>
createAttachmentFileSender
(
String
groupName
,
Streaming
FileSender
<
GrpcRouteForwardingRequest
,
GrpcRouteForwardingResponse
>
createAttachmentFileSender
(
String
groupName
,
IncomingFile
file
,
InputStream
fileContentStream
)
{
return
createSenderWithoutMetadata
(
this
::
buildAttachmentChunk
,
fileContentStream
)
.
withMetaData
(
buildGrpcAttachmentFile
(
groupName
,
file
));
return
createSenderWithoutMetadata
(
this
::
buildAttachmentChunk
,
fileContentStream
).
withMetaData
(
buildGrpcAttachmentFile
(
groupName
,
file
));
}
GrpcRouteForwardingRequest
buildAttachmentChunk
(
byte
[]
chunk
,
int
length
)
{
...
...
@@ -136,11 +136,11 @@ class EingangForwarder {
private
CompletableFuture
<
GrpcRouteForwardingResponse
>
sendRepresentationFile
(
IncomingFile
file
)
{
var
fileContentStream
=
fileService
.
getUploadedFileStream
(
file
.
getId
());
var
sender
=
createRepresentationFileSender
(
file
,
fileContentStream
).
send
(
responseObserver:
:
registerOnReadyHandler
);
var
sender
=
createRepresentationFileSender
(
file
,
fileContentStream
).
send
();
return
sender
.
getResultFuture
();
}
GrpcFileUploadUtils
.
FileSender
<
GrpcRouteForwardingRequest
,
GrpcRouteForwardingResponse
>
createRepresentationFileSender
(
IncomingFile
file
,
Streaming
FileSender
<
GrpcRouteForwardingRequest
,
GrpcRouteForwardingResponse
>
createRepresentationFileSender
(
IncomingFile
file
,
InputStream
fileContentStream
)
{
return
createSenderWithoutMetadata
(
this
::
buildRepresentationChunk
,
fileContentStream
).
withMetaData
(
buildGrpcRepresentationFile
(
file
));
}
...
...
@@ -171,9 +171,9 @@ class EingangForwarder {
return
fileContentBuilder
.
build
();
}
GrpcFileUploadUtils
.
FileSender
<
GrpcRouteForwardingRequest
,
GrpcRouteForwardingResponse
>
createSenderWithoutMetadata
(
Streaming
FileSender
<
GrpcRouteForwardingRequest
,
GrpcRouteForwardingResponse
>
createSenderWithoutMetadata
(
BiFunction
<
byte
[],
Integer
,
GrpcRouteForwardingRequest
>
chunkBuilder
,
InputStream
fileContentStream
)
{
return
GrpcFileUploadUtils
.
createSender
(
chunkBuilder
,
fileContentStream
,
response
->
requestObserver
,
false
);
return
GrpcFileUploadUtils
.
createS
treamSharingS
ender
(
chunkBuilder
,
fileContentStream
,
requestObserver
,
responseObserver:
:
registerOnReadyHandler
);
}
@RequiredArgsConstructor
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment