Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
eingang-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
eingang-manager
Commits
9b808646
Commit
9b808646
authored
1 month ago
by
Felix Reichenbach
Browse files
Options
Downloads
Patches
Plain Diff
OZG-7573 refactor handleEndOfFile
parent
6fd81468
No related branches found
No related tags found
1 merge request
!9
Ozg 7573 forward vorgang
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
forwarder/src/main/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserver.java
+13
-5
13 additions, 5 deletions
.../eingang/forwarder/EingangStubReceiverStreamObserver.java
with
13 additions
and
5 deletions
forwarder/src/main/java/de/ozgcloud/eingang/forwarder/EingangStubReceiverStreamObserver.java
+
13
−
5
View file @
9b808646
...
@@ -33,7 +33,6 @@ import java.util.HashMap;
...
@@ -33,7 +33,6 @@ import java.util.HashMap;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Objects
;
import
java.util.Objects
;
import
java.util.Optional
;
import
java.util.concurrent.CompletableFuture
;
import
java.util.concurrent.CompletableFuture
;
import
java.util.concurrent.ExecutionException
;
import
java.util.concurrent.ExecutionException
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.TimeUnit
;
...
@@ -170,13 +169,22 @@ class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRouteForwa
...
@@ -170,13 +169,22 @@ class EingangStubReceiverStreamObserver implements StreamObserver<GrpcRouteForwa
void
handleEndOfFile
()
{
void
handleEndOfFile
()
{
closeOutputPipe
();
closeOutputPipe
();
var
completedIncomingFile
=
currentFile
.
toBuilder
().
file
(
getSavedFileContent
()).
build
();
var
completedIncomingFile
=
currentFile
.
toBuilder
().
file
(
getSavedFileContent
()).
build
();
Optional
.
ofNullable
(
groupName
)
if
(
Objects
.
isNull
(
groupName
))
{
.
map
(
group
->
attachments
.
computeIfAbsent
(
group
,
s
->
new
ArrayList
<>()))
addAsRepresentation
(
completedIncomingFile
);
.
orElse
(
representations
)
}
else
{
.
add
(
completedIncomingFile
);
addAsAttachment
(
completedIncomingFile
);
}
resetFileReceiving
();
resetFileReceiving
();
}
}
private
void
addAsRepresentation
(
IncomingFile
completedIncomingFile
)
{
representations
.
add
(
completedIncomingFile
);
}
private
void
addAsAttachment
(
IncomingFile
completedIncomingFile
)
{
attachments
.
computeIfAbsent
(
groupName
,
s
->
new
ArrayList
<>()).
add
(
completedIncomingFile
);
}
File
getSavedFileContent
()
{
File
getSavedFileContent
()
{
try
{
try
{
return
receivingFileContent
.
get
(
TIMEOUT_MINUTES
,
TimeUnit
.
MINUTES
);
return
receivingFileContent
.
get
(
TIMEOUT_MINUTES
,
TimeUnit
.
MINUTES
);
...
...
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