|
10 | 10 |
|
11 | 11 | import javax.annotation.Nonnull; |
12 | 12 | import java.util.*; |
| 13 | +import java.util.concurrent.ExecutionException; |
| 14 | +import java.util.concurrent.TimeUnit; |
| 15 | +import java.util.concurrent.TimeoutException; |
13 | 16 | import java.util.stream.Collectors; |
14 | 17 |
|
15 | 18 | /** |
@@ -69,24 +72,27 @@ public Mono<GetAuthorizedCapabilitiesForEntityResponse> handleRequest(GetAuthori |
69 | 72 |
|
70 | 73 | Map<String, List<CompositeRootCriteria>> criteriaMap = extractUserPermisionCriteria(capabilities); |
71 | 74 |
|
72 | | - return Mono.fromFuture(getMatchingCriteriaExecutor.execute( |
73 | | - new GetMatchingCriteriaRequest(criteriaMap, |
74 | | - resource.getProjectId().get(), |
75 | | - request.entityIri()), |
76 | | - executionContext)) |
77 | | - .map(matchResp -> { |
78 | | - var filteredCapabilities = capabilities.stream() |
79 | | - .filter(capability -> { |
80 | | - if (capability instanceof ContextAwareCapability cap) { |
81 | | - return matchResp.matchingKeys().contains(cap.id()); |
82 | | - } |
83 | | - return true; |
84 | | - }) |
85 | | - .collect(Collectors.toSet()); |
86 | | - return new GetAuthorizedCapabilitiesForEntityResponse( |
87 | | - ImmutableSet.copyOf(filteredCapabilities) |
88 | | - ); |
89 | | - }); |
| 75 | + try { |
| 76 | + GetMatchingCriteriaResponse matchResp = getMatchingCriteriaExecutor.execute( |
| 77 | + new GetMatchingCriteriaRequest(criteriaMap, |
| 78 | + resource.getProjectId().get(), |
| 79 | + request.entityIri()), |
| 80 | + executionContext).get(5, TimeUnit.SECONDS); |
| 81 | + var filteredCapabilities = capabilities.stream() |
| 82 | + .filter(capability -> { |
| 83 | + if (capability instanceof ContextAwareCapability cap) { |
| 84 | + return matchResp.matchingKeys().contains(cap.id()); |
| 85 | + } |
| 86 | + return true; |
| 87 | + }) |
| 88 | + .collect(Collectors.toSet()); |
| 89 | + return Mono.just(new GetAuthorizedCapabilitiesForEntityResponse( |
| 90 | + ImmutableSet.copyOf(filteredCapabilities)) |
| 91 | + ); |
| 92 | + } catch (InterruptedException | ExecutionException | TimeoutException e) { |
| 93 | + logger.error("Error on fetching data", e); |
| 94 | + throw new RuntimeException(e); |
| 95 | + } |
90 | 96 | } |
91 | 97 |
|
92 | 98 | private Map<String, List<CompositeRootCriteria>> extractUserPermisionCriteria(Set<Capability> capabilities) { |
|
0 commit comments