From 8c02c94a86f102089ec627b596782941eaa031d8 Mon Sep 17 00:00:00 2001
From: TCHERNIATINSKY <philippe.tcherniatinsky@inrae.fr>
Date: Wed, 20 Apr 2022 15:56:21 +0200
Subject: [PATCH] correction #38
---
.../java/fr/inra/oresing/rest/AuthorizationService.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/fr/inra/oresing/rest/AuthorizationService.java b/src/main/java/fr/inra/oresing/rest/AuthorizationService.java
index 5fda84fc3..9e3ebe6e2 100644
--- a/src/main/java/fr/inra/oresing/rest/AuthorizationService.java
+++ b/src/main/java/fr/inra/oresing/rest/AuthorizationService.java
@@ -259,14 +259,15 @@ public class AuthorizationService {
}
private ImmutableSortedSet<GetGrantableResult.DataGroup> getDataGroups(Application application, String dataType) {
- ImmutableSortedSet<GetGrantableResult.DataGroup> dataGroups = ImmutableSortedSet.of();
+ ImmutableSortedSet<GetGrantableResult.DataGroup> dataGroups =
Optional.of(application.getConfiguration().getDataTypes().get(dataType))
.map(Configuration.DataTypeDescription::getAuthorization)
.map(Configuration.AuthorizationDescription::getDataGroups)
.map(dg -> dg.entrySet().stream()
.map(dataGroupEntry -> new GetGrantableResult.DataGroup(dataGroupEntry.getKey(), dataGroupEntry.getValue().getLabel()))
- .collect(ImmutableSortedSet.toImmutableSortedSet(Comparator.comparing(GetGrantableResult.DataGroup::getId))))
- .orElseGet(ImmutableSortedSet::of);
+ .collect(ImmutableSortedSet.toImmutableSortedSet(Comparator.comparing(GetGrantableResult.DataGroup::getId)) )
+ )
+ .orElseGet(ImmutableSortedSet::of);
return dataGroups;
}
--
GitLab