Skip to content

Commit

Permalink
issue #1351 - Updates after code review
Browse files Browse the repository at this point in the history 
Signed-off-by: Troy Biesterfeld <tbieste@us.ibm.com>
  • Loading branch information
@tbieste
tbieste committed Oct 26, 2020
1 parent 1feaa61 commit c7d9192
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 70 deletions.
2 changes: 1 addition & 1 deletion fhir-search/src/main/java/com/ibm/fhir/search/exception/SearchExceptionUtil.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* (C) Copyright IBM Corp. 2019
* (C) Copyright IBM Corp. 2019, 2020
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down
105 changes: 37 additions & 68 deletions fhir-search/src/main/java/com/ibm/fhir/search/util/SearchUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ public class SearchUtil {
// Other Constants
private static final String SEARCH_PARAM_COMBINATION_ANY = "*";
private static final String SEARCH_PARAM_COMBINATION_DELIMITER = "\\+";
private static final String SEARCH_PROPERTY_TYPE_INCLUDE = "_include";
private static final String SEARCH_PROPERTY_TYPE_REVINCLUDE = "_revinclude";

// The functionality is split into a new class.
private static final Sort sort = new Sort();
Expand Down Expand Up @@ -1006,14 +1008,16 @@ private static List<Set<String>> getSearchParameterCombinations(String resourceT
if (combinations != null) {
spCombinations = new ArrayList<>();
for (String combination : combinations) {
combination = combination.trim();
Set<String> combinationSet = new HashSet<>();
if (!combination.isEmpty()) {
// If any search parameter combination is allowed, return null
if (SEARCH_PARAM_COMBINATION_ANY.equals(combination)) {
return null;
}
for (String spString : combination.split(SEARCH_PARAM_COMBINATION_DELIMITER)) {
if (spString.trim().isEmpty()) {
spString = spString.trim();
if (spString.isEmpty()) {
throw SearchExceptionUtil.buildNewIllegalStateException();
}
combinationSet.add(spString);
Expand Down Expand Up @@ -1677,8 +1681,8 @@ private static void parseInclusionParameter(Class<?> resourceType, FHIRSearchCon
InclusionParameter newInclusionParm;
List<InclusionParameter> newInclusionParms = null;

List<String> allowedIncludes = getSearchIncludeRestrictions(resourceType.getSimpleName());
List<String> allowedRevIncludes = getSearchRevIncludeRestrictions(resourceType.getSimpleName());
List<String> allowedIncludes = getSearchPropertyRestrictions(resourceType.getSimpleName(), SEARCH_PROPERTY_TYPE_INCLUDE);
List<String> allowedRevIncludes = getSearchPropertyRestrictions(resourceType.getSimpleName(), SEARCH_PROPERTY_TYPE_REVINCLUDE);

for (String inclusionValue : inclusionValues) {

Expand Down Expand Up @@ -1760,88 +1764,53 @@ private static void parseInclusionParameter(Class<?> resourceType, FHIRSearchCon
}

/**
* Retrieves the search include restrictions.
* Retrieves the search property restrictions.
*
* @param resourceType
* the resource type
* @return list of allowed search _include values, or null if no restrictions
* @param propertyType the property type
* @return list of allowed values for the search property, or null if no restrictions
* @throws Exception
* an exception
*/
private static List<String> getSearchIncludeRestrictions(String resourceType) throws Exception {

// Retrieve the "resources" config property group.
PropertyGroup rsrcsGroup = FHIRConfigHelper.getPropertyGroup(FHIRConfiguration.PROPERTY_RESOURCES);
if (rsrcsGroup != null) {
List<PropertyEntry> rsrcsEntries = rsrcsGroup.getProperties();
if (rsrcsEntries != null && !rsrcsEntries.isEmpty()) {

// Try to find search includes property for matching resource type
for (PropertyEntry rsrcsEntry : rsrcsEntries) {
if (resourceType.equals(rsrcsEntry.getName())) {
PropertyGroup resourceTypeGroup = (PropertyGroup) rsrcsEntry.getValue();
if (resourceTypeGroup != null) {
return resourceTypeGroup.getStringListProperty(FHIRConfiguration.PROPERTY_FIELD_RESOURCES_SEARCH_INCLUDES);
}
}
}

// Otherwise, try to find search includes property for "Resource" resource type
for (PropertyEntry rsrcsEntry : rsrcsEntries) {

// Check if matching resource type
if (SearchConstants.RESOURCE_RESOURCE.equals(rsrcsEntry.getName())) {
PropertyGroup resourceTypeGroup = (PropertyGroup) rsrcsEntry.getValue();
if (resourceTypeGroup != null) {
return resourceTypeGroup.getStringListProperty(FHIRConfiguration.PROPERTY_FIELD_RESOURCES_SEARCH_INCLUDES);
}
}
}
}
private static List<String> getSearchPropertyRestrictions(String resourceType, String propertyType) throws Exception {
String propertyField = null;
if (SEARCH_PROPERTY_TYPE_INCLUDE.equals(propertyType)) {
propertyField = FHIRConfiguration.PROPERTY_FIELD_RESOURCES_SEARCH_INCLUDES;
}
else if (SEARCH_PROPERTY_TYPE_REVINCLUDE.equals(propertyType)) {
propertyField = FHIRConfiguration.PROPERTY_FIELD_RESOURCES_SEARCH_REV_INCLUDES;
}

return null;
}

/**
* Retrieves the search revinclude restrictions.
*
* @param resourceType
* the resource type
* @return list of allowed search _revinclude values, or null if no restrictions
* @throws Exception
* an exception
*/
private static List<String> getSearchRevIncludeRestrictions(String resourceType) throws Exception {

// Retrieve the "resources" config property group.
PropertyGroup rsrcsGroup = FHIRConfigHelper.getPropertyGroup(FHIRConfiguration.PROPERTY_RESOURCES);
if (rsrcsGroup != null) {
List<PropertyEntry> rsrcsEntries = rsrcsGroup.getProperties();
if (rsrcsEntries != null && !rsrcsEntries.isEmpty()) {
if (propertyField != null) {
PropertyGroup rsrcsGroup = FHIRConfigHelper.getPropertyGroup(FHIRConfiguration.PROPERTY_RESOURCES);
if (rsrcsGroup != null) {
List<PropertyEntry> rsrcsEntries = rsrcsGroup.getProperties();
if (rsrcsEntries != null && !rsrcsEntries.isEmpty()) {

// Try find search revincludes property for matching resource type
for (PropertyEntry rsrcsEntry : rsrcsEntries) {
if (resourceType.equals(rsrcsEntry.getName())) {
PropertyGroup resourceTypeGroup = (PropertyGroup) rsrcsEntry.getValue();
if (resourceTypeGroup != null) {
return resourceTypeGroup.getStringListProperty(FHIRConfiguration.PROPERTY_FIELD_RESOURCES_SEARCH_REV_INCLUDES);
// Try to find search property for matching resource type
for (PropertyEntry rsrcsEntry : rsrcsEntries) {
if (resourceType.equals(rsrcsEntry.getName())) {
PropertyGroup resourceTypeGroup = (PropertyGroup) rsrcsEntry.getValue();
if (resourceTypeGroup != null) {
return resourceTypeGroup.getStringListProperty(propertyField);
}
}
}
}

// Otherwise, try find search revincludes property for "Resource" resource type
for (PropertyEntry rsrcsEntry : rsrcsEntries) {
// Otherwise, try to find search property for "Resource" resource type
for (PropertyEntry rsrcsEntry : rsrcsEntries) {

// Check if matching resource type
if (SearchConstants.RESOURCE_RESOURCE.equals(rsrcsEntry.getName())) {
PropertyGroup resourceTypeGroup = (PropertyGroup) rsrcsEntry.getValue();
if (resourceTypeGroup != null) {
return resourceTypeGroup.getStringListProperty(FHIRConfiguration.PROPERTY_FIELD_RESOURCES_SEARCH_REV_INCLUDES);
// Check if matching resource type
if (SearchConstants.RESOURCE_RESOURCE.equals(rsrcsEntry.getName())) {
PropertyGroup resourceTypeGroup = (PropertyGroup) rsrcsEntry.getValue();
if (resourceTypeGroup != null) {
return resourceTypeGroup.getStringListProperty(propertyField);
}
}
}
}

}
}

Expand Down
2 changes: 1 addition & 1 deletion fhir-search/src/test/java/com/ibm/fhir/search/parameters/SearchParameterRestrictionTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* (C) Copyright IBM Corp. 2019, 2020
* (C) Copyright IBM Corp. 2020
*
* SPDX-License-Identifier: Apache-2.0
*/
Expand Down

0 comments on commit c7d9192

Please sign in to comment.