Skip to content

Commit 9c2857d

Browse files
committed
chore: fixes NPE in case of unfavorable SD entries and improves logging to find a hidden exceptions
1 parent 41f56d1 commit 9c2857d

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

iris-client-bff/src/main/java/iris/client_bff/status/eps/EPSStatusClient.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import java.net.ConnectException;
1515
import java.net.SocketTimeoutException;
1616
import java.util.List;
17+
import java.util.Objects;
1718
import java.util.Set;
1819

1920
import javax.validation.Valid;
@@ -43,6 +44,7 @@ public Apps getAvailableApps() {
4344
return epsRpcClient.invoke(methodName, null, Directory.class).entries().stream()
4445
.filter(directoryEntry -> directoryEntry.groups().contains("checkin-apps"))
4546
.map(DirectoryEntry::name)
47+
.filter(Objects::nonNull)
4648
.map(App::new)
4749
.collect(collectingAndThen(toList(), Apps::new));
4850

iris-client-bff/src/main/java/iris/client_bff/status/web/AppStatusController.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import iris.client_bff.status.web.AppStatusController.AppStatusInfo.Info;
99
import lombok.AllArgsConstructor;
1010
import lombok.Value;
11+
import lombok.extern.slf4j.Slf4j;
1112

1213
import java.util.List;
1314

@@ -27,6 +28,7 @@
2728
@RequestMapping("/status/checkin-apps")
2829
@Validated
2930
@AllArgsConstructor
31+
@Slf4j
3032
public class AppStatusController {
3133

3234
private StatusService statusService;
@@ -37,6 +39,9 @@ public List<App> getApps() {
3739
try {
3840
return statusService.getApps().toList();
3941
} catch (Exception e) {
42+
43+
log.error("Can't get apps from StatusService: ", e);
44+
4045
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage());
4146
}
4247
}

0 commit comments

Comments
 (0)