Fixes two NPE conditions in DefaultEntityResolver return statement #1400
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
Nick-Wunderdog
commented
May 4, 2023
| @@ -163,7 +163,7 @@ public Object findOne(Repositories repositories, StoreInfo info, String reposito | |||
| public Object findOne(Repositories repositories, StoreInfo info, Class<?> domainObjClass, String repository, Serializable id) | |||
| throws HttpRequestMethodNotSupportedException { | |||
|
|
|||
| Optional<Object> domainObj = null; | |||
| Optional<Object> domainObj = Optional.empty(); | |||
There was a problem hiding this comment.
Fixes the two cases of NPE in return statement:
- if AccessDeniedException is thrown.
- if (invoker == null)
Nick-Wunderdog
commented
May 4, 2023
| @@ -55,7 +55,7 @@ | |||
| import internal.org.springframework.content.rest.utils.StoreUtils; | |||
|
|
|||
| public class DefaultEntityResolver implements EntityResolver { | |||
|
|
|||
| private static final Logger logger = org.slf4j.LoggerFactory.getLogger(DefaultEntityResolver.class); | |||
There was a problem hiding this comment.
Logging would be nice, but not mandatory.
Nick-Wunderdog
commented
May 4, 2023
| domainObj = findOneByReflection(repositories, domainObjClass, id); | ||
| } catch (AccessDeniedException ace) { |
There was a problem hiding this comment.
Catching the ACE explicitly is be good for code clarity. Regardless if you want to or not to throw ACE. The If you throw it the Servlet context calling this class should be able to process ACE to 403 HTTP response.
Nick-Wunderdog
commented
May 4, 2023
| @@ -172,13 +175,17 @@ public Object findOne(Repositories repositories, StoreInfo info, Class<?> domain | |||
| invoker = resolveRootResourceInformation(info, repository, id, new ModelAndViewContainer(), new FakeWebBinderFactory()); | |||
| if (invoker != null) { | |||
| domainObj = invoker.invokeFindById(id); | |||
| } else { | |||
| logger.warn("Could not resolve RootResourceInformation"); | |||
There was a problem hiding this comment.
domainObjNPE condition in the original code.
Nick-Wunderdog
commented
May 4, 2023
| } catch (Exception e) { | ||
|
|
||
| e.printStackTrace(); | ||
| logger.error("invoking Repository findById(id) method threw exception", e.getCause()); |
There was a problem hiding this comment.
domainObjNPE condition in the original code.
Nick-Wunderdog
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes:
First change fixes the two NullPointerExeception cases in method last return statement.
a) when
invoker == nullb) AccessDeniedException or any Expection other than ConverterNotFoundException is thrown.
2.&3. are not necessary, but I think improve the code.