#3061 - Fix NPE when Measure refers to non-existent library #3187
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
I applied a fix before the holiday that corrected a category of NPE errors related to execution against a measure or library resources that don't exist. It turns out that wasn't the core of the issue 3061. This goes back and addresses when a valid measure reference is used, but that Measure refers to a Library resource that does not exist. I also added some handling that allows resolution of Library resources by reference in addition to by canonical URL in the registry and also updated the error handling around retrieving the primary library reference from the Measure resource. Signed-off-by: Corey Sanders <corey.thecolonel@gmail.com>
lmsurpre
approved these changes
Jan 13, 2022
|
please update the copyright dates. otherwise, looks good to me. |
prb112
reviewed
Jan 13, 2022
| Bundle.Builder reports = Bundle.builder().type(BundleType.COLLECTION); | ||
|
|
||
| AtomicInteger count = new AtomicInteger(0); | ||
| cursor.forEach(resource -> { | ||
| for(Object resource : cursor) { |
There was a problem hiding this comment.
Suggested change
| for(Object resource : cursor) { | |
| for (Object resource : cursor) { |
prb112
reviewed
Jan 13, 2022
Comment on lines
63
to
64
|
|
||
|
|
prb112
reviewed
Jan 13, 2022
| return loadResourceById(resourceHelper, ResourceType.MEASURE, reference); | ||
| } | ||
|
|
||
| public static Library loadLibraryByReference(FHIRResourceHelpers resourceHelper, String reference) throws FHIROperationException { |
There was a problem hiding this comment.
javadocs for consistency would be great.
prb112
reviewed
Jan 13, 2022
Comment on lines
72
to
73
|
|
||
|
|
prb112
reviewed
Jan 13, 2022
| when(resourceHelper.doRead(eq("Library"), eq(primaryLibrary.getId()), anyBoolean(), anyBoolean(), any())).thenAnswer(x -> TestHelper.asResult(primaryLibrary)); | ||
|
|
||
| fhirLibraries.stream().forEach( l -> when(mockRegistry.getResource( canonical(l.getUrl(), l.getVersion()).getValue(), Library.class )).thenReturn(l) ); | ||
| if( exists ) { |
There was a problem hiding this comment.
Suggested change
| if( exists ) { | |
| if (exists) { |
punktilious
reviewed
Jan 13, 2022
| @@ -86,19 +79,16 @@ public RetrieveProvider getRetrieveProvider(FHIRResourceHelpers resourceHelper, | |||
| return retrieveProvider; | |||
| } | |||
|
|
|||
| public MeasureReport.Builder doMeasureEvaluation(Measure measure, ZoneOffset zoneOffset, Interval measurementPeriod, String subjectOrPractitionerId, | |||
| public MeasureReport.Builder doMeasureEvaluation(FHIRResourceHelpers resourceHelpers, Measure measure, ZoneOffset zoneOffset, Interval measurementPeriod, String subjectOrPractitionerId, | |||
prb112
approved these changes
Jan 13, 2022
punktilious
reviewed
Jan 13, 2022
| * Utility methods for working with Measure resources | ||
| */ | ||
| public class MeasureHelper { | ||
| public static String getPrimaryLibraryId(Measure measure) throws FHIROperationException { |
punktilious
reviewed
Jan 13, 2022
| public class MeasureHelper { | ||
| public static String getPrimaryLibraryId(Measure measure) throws FHIROperationException { | ||
| String primaryLibraryId = null; | ||
| if( measure.getLibrary() != null && measure.getLibrary().size() == 1 ) { |
There was a problem hiding this comment.
if (measure.getLibrary() ...
punktilious
reviewed
Jan 13, 2022
| @@ -98,16 +98,16 @@ protected Parameters doInvoke(FHIROperationContext operationContext, Class<? ext | |||
| } | |||
| } | |||
|
|
|||
| protected Bundle processAllMeasures(FHIRBundleCursor cursor, String subject, ZoneOffset zoneOffset, Interval measurementPeriod, FHIRResourceHelpers resourceHelper, TerminologyProvider termProvider, Map<String,DataProvider> dataProviders) { | |||
| protected Bundle processAllMeasures(FHIRBundleCursor cursor, String subject, ZoneOffset zoneOffset, Interval measurementPeriod, FHIRResourceHelpers resourceHelper, TerminologyProvider termProvider, Map<String,DataProvider> dataProviders) throws FHIROperationException { | |||
There was a problem hiding this comment.
javadoc nice to have (must have for public methods)
punktilious
reviewed
Jan 13, 2022
| import com.ibm.fhir.registry.FHIRRegistry; | ||
| import com.ibm.fhir.server.spi.operation.FHIRResourceHelpers; | ||
|
|
||
| public class OperationHelper { |
punktilious
reviewed
Jan 13, 2022
| return result; | ||
| } | ||
|
|
||
| public static Measure loadMeasureByReference(FHIRResourceHelpers resourceHelper, String reference) throws FHIROperationException { |
There was a problem hiding this comment.
javadoc...for all the public methods in this class
punktilious
reviewed
Jan 13, 2022
| when(resourceHelper.doRead(eq("Library"), eq(primaryLibrary.getId()), anyBoolean(), anyBoolean(), any())).thenAnswer(x -> TestHelper.asResult(primaryLibrary)); | ||
|
|
||
| fhirLibraries.stream().forEach( l -> when(mockRegistry.getResource( canonical(l.getUrl(), l.getVersion()).getValue(), Library.class )).thenReturn(l) ); | ||
| if( exists ) { |
Signed-off-by: Corey Sanders <corey.thecolonel@gmail.com>
Signed-off-by: Corey Sanders <corey.thecolonel@gmail.com>
csandersdev
force-pushed
the
issue-3061
branch
from
4d78598
to
03bae4e
Compare
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.
I applied a fix before the holiday that corrected a category of NPE
errors related to execution against measure or library resources that
don't exist. It turns out that wasn't the core of the issue 3061. This
goes back and addresses when a valid measure reference is used, but that
Measure refers to a Library resource that does not exist. I also added
some handling that allows resolution of Library resources by reference
in addition to by canonical URL in the registry and also updated the
error handling around retrieving the primary library reference from the
Measure resource.
Signed-off-by: Corey Sanders corey.thecolonel@gmail.com