-
Notifications
You must be signed in to change notification settings - Fork 157
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Issue 2843 - store both versioned and unversioned canonicals in ParametersMap #2929
Conversation
ParametersMap Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>
fhir-search/src/main/java/com/ibm/fhir/search/parameters/ParametersMap.java
Show resolved
Hide resolved
fhir-search/src/main/java/com/ibm/fhir/search/parameters/ParametersMap.java
Show resolved
Hide resolved
fhir-search/src/main/java/com/ibm/fhir/search/parameters/ParametersMap.java
Show resolved
Hide resolved
@Deprecated | ||
public Set<Entry<String, SearchParameter>> urlEntries() { | ||
return Collections.unmodifiableSet(urlMap.entrySet()); | ||
return Collections.unmodifiableSet(canonicalMap.entrySet().stream() | ||
.filter(e -> !e.getKey().contains("|")) | ||
.collect(Collectors.toSet())); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe just remove these deprecated methods? No other team should be depending on this behavior. While observable, it shouldn't be a problem.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i was trying to preserve backwards compatibility in the java where possible, but i'm ok removing them now if we don't want to wait
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I vote for removing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
fhir-search/src/test/java/com/ibm/fhir/search/parameters/ParametersSearchUtilTest.java
Show resolved
Hide resolved
fhir-search/src/test/java/com/ibm/fhir/search/parameters/ParametersUtilTest.java
Outdated
Show resolved
Hide resolved
fhir-search/src/main/java/com/ibm/fhir/search/parameters/ParametersMap.java
Outdated
Show resolved
Hide resolved
This changeset introduces the fhir-ig-us-core as a test dependency for fhir-search. This was strictly out of convenience...the alternative would be to create a new test-only PackagedRegistryResourceProvider that provides multiple versions of the same search parameter(s). Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>
0983d7f
to
434ad4a
Compare
otherwise we run into the following error during validation if us-core is on the path: ``` SEVERE: validateResource(json/profiles/fhir-ig-us-core/Observation-some-day-smoker.json) unexpected failure: Input resource failed validation: generated-us-core-smokingstatus-5: Constraint violation: effective.where(is(dateTime)).exists() (Observation) ``` I also added back in the fhir-examples.version variable because I think our release automation still depends on this one (I had maybe accidentally removed it while removing the other variables for dependabot). Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM (left one comment unresolved for the deprecated code)
per review feedback Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>
per review feedback Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>
To make this simpler, I also updated the way we apply the filter rules.
Note: this changeset introduces the fhir-ig-us-core as a test dependency for
fhir-search. This was strictly out of convenience...the alternative
would be to create a new test-only PackagedRegistryResourceProvider that
provides multiple versions of the same search parameter(s).