From 9a7f9b15ec18db0de48ce6bc7a62611832908181 Mon Sep 17 00:00:00 2001 From: matiwinnetou Date: Fri, 7 Mar 2025 11:02:52 +0100 Subject: [PATCH] fix: avoid NPE when transaction is not found (#313) Co-authored-by: Mateusz Czeladka --- .../rosetta/api/search/controller/SearchApiImpl.java | 5 ++--- .../rosetta/common/exception/ApiException.java | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/org/cardanofoundation/rosetta/api/search/controller/SearchApiImpl.java b/api/src/main/java/org/cardanofoundation/rosetta/api/search/controller/SearchApiImpl.java index 24b957e6b..3db0a35bc 100644 --- a/api/src/main/java/org/cardanofoundation/rosetta/api/search/controller/SearchApiImpl.java +++ b/api/src/main/java/org/cardanofoundation/rosetta/api/search/controller/SearchApiImpl.java @@ -35,12 +35,11 @@ public class SearchApiImpl implements SearchApi { @Override public ResponseEntity searchTransactions( SearchTransactionsRequest searchTransactionsRequest) { - if(offlineMode) { + if (offlineMode) { throw ExceptionFactory.notSupportedInOfflineMode(); } networkService.verifyNetworkRequest(searchTransactionsRequest.getNetworkIdentifier()); - Long pageSize = Optional.ofNullable(searchTransactionsRequest.getLimit()).orElse(PAGE_SIZE); pageSize = pageSize > PAGE_SIZE ? PAGE_SIZE : pageSize; Long offset = Optional.ofNullable(searchTransactionsRequest.getOffset()).orElse(0L); @@ -51,6 +50,6 @@ public ResponseEntity searchTransactions( return ResponseEntity.ok(searchMapper.mapToSearchTransactionsResponse( blockTransactions, nextOffset)); - } + } diff --git a/api/src/main/java/org/cardanofoundation/rosetta/common/exception/ApiException.java b/api/src/main/java/org/cardanofoundation/rosetta/common/exception/ApiException.java index 6260b08b5..1fc75b123 100644 --- a/api/src/main/java/org/cardanofoundation/rosetta/common/exception/ApiException.java +++ b/api/src/main/java/org/cardanofoundation/rosetta/common/exception/ApiException.java @@ -12,7 +12,8 @@ public class ApiException extends RuntimeException { private final Error error; public ApiException(Error error) { - super(); + super(error.getMessage() == null ? "?" : error.getMessage()); this.error = error; } + }