honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code review updates

This commit is contained in:
Nick Goupinets 2021-04-27 09:29:08 -04:00
parent 08934d2364
commit 82bf8cdc9d
3 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hapi-fhir-base/src/main/java/ca/uhn/fhir/util/TerserUtil.java
View File

@ -25,6 +25,7 @@ import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition;
import ca.uhn.fhir.context.BaseRuntimeElementDefinition;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.context.RuntimeResourceDefinition;
import org.apache.commons.lang3.Validate;
import org.apache.commons.lang3.tuple.Triple;
import org.hl7.fhir.instance.model.api.IBase;
import org.hl7.fhir.instance.model.api.IBaseResource;
@ -172,9 +173,7 @@ public final class TerserUtil {
RuntimeResourceDefinition definition = theFhirContext.getResourceDefinition(theFrom);
BaseRuntimeChildDefinition childDefinition = definition.getChildByName(theField);
if (childDefinition == null) {
throw new IllegalArgumentException(String.format("Unable to find child definition %s in %s", theField, theFrom));
}
Validate.notNull(childDefinition);
List<IBase> theFromFieldValues = childDefinition.getAccessor().getValues(theFrom);
List<IBase> theToFieldValues = childDefinition.getAccessor().getValues(theTo);
@ -226,9 +225,7 @@ public final class TerserUtil {
}
final Method method = getMethod(theItem1, EQUALS_DEEP);
if (method == null) {
throw new IllegalArgumentException(String.format("Instance %s do not provide %s method", theItem1, EQUALS_DEEP));
}
Validate.notNull(method);
return equals(theItem1, theItem2, method);
}
@ -315,9 +312,7 @@ public final class TerserUtil {
*/
public static void replaceField(FhirContext theFhirContext, String theFieldName, IBaseResource theFrom, IBaseResource theTo) {
RuntimeResourceDefinition definition = theFhirContext.getResourceDefinition(theFrom);
if (definition == null) {
throw new IllegalArgumentException(String.format("Field %s does not exist in %s", theFieldName, theFrom));
}
Validate.notNull(definition);
replaceField(theFrom, theTo, theFhirContext.getResourceDefinition(theFrom).getChildByName(theFieldName));
}
@ -343,9 +338,7 @@ public final class TerserUtil {
public static void clearField(FhirContext theFhirContext, String theFieldName, IBase theBase) {
BaseRuntimeElementDefinition definition = theFhirContext.getElementDefinition(theBase.getClass());
BaseRuntimeChildDefinition childDefinition = definition.getChildByName(theFieldName);
if (childDefinition == null) {
throw new IllegalStateException(String.format("Field %s does not exist", theFieldName));
}
Validate.notNull(childDefinition);
childDefinition.getAccessor().getValues(theBase).clear();
}
@ -528,9 +521,7 @@ public final class TerserUtil {
private static BaseRuntimeChildDefinition getBaseRuntimeChildDefinition(FhirContext theFhirContext, String theFieldName, IBaseResource theFrom) {
RuntimeResourceDefinition definition = theFhirContext.getResourceDefinition(theFrom);
BaseRuntimeChildDefinition childDefinition = definition.getChildByName(theFieldName);
if (childDefinition == null) {
throw new IllegalStateException(String.format("Field %s does not exist", theFieldName));
}
Validate.notNull(childDefinition);
return childDefinition;
}
@ -593,9 +584,7 @@ public final class TerserUtil {
*/
public static <T extends IBase> T newElement(FhirContext theFhirContext, String theElementType, Object theConstructorParam) {
BaseRuntimeElementDefinition def = theFhirContext.getElementDefinition(theElementType);
if (def == null) {
throw new IllegalArgumentException(String.format("Unable to find element type definition for %s", theElementType));
}
Validate.notNull(def);
return (T) def.newInstance(theConstructorParam);
}

20
hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/address/impl/LoquateAddressValidator.java
View File

@ -32,6 +32,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
import org.apache.http.entity.ContentType;
import org.hl7.fhir.instance.model.api.IBase;
import org.hl7.fhir.instance.model.api.IBaseExtension;
@ -68,28 +69,19 @@ public class LoquateAddressValidator extends BaseRestfulValidator {
public LoquateAddressValidator(Properties theProperties) {
super(theProperties);
if (!theProperties.containsKey(PROPERTY_SERVICE_KEY)) {
if (!theProperties.containsKey(PROPERTY_SERVICE_ENDPOINT)) {
throw new IllegalArgumentException("Expected service key or custom service endpoint in the configuration, but got " + theProperties);
}
}
Validate.isTrue(theProperties.containsKey(PROPERTY_SERVICE_KEY) || !theProperties.containsKey(PROPERTY_SERVICE_ENDPOINT),
"Expected service key or custom service endpoint in the configuration, but got " + theProperties);
}
@Override
protected AddressValidationResult getValidationResult(AddressValidationResult theResult, JsonNode response, FhirContext theFhirContext) {
if (!response.isArray() || response.size() < 1) {
throw new AddressValidationException("Invalid response - expected to get an array of validated addresses");
}
Validate.isTrue(response.isArray() && response.size() >= 1, "Invalid response - expected to get an array of validated addresses");
JsonNode firstMatch = response.get(0);
if (!firstMatch.has("Matches")) {
throw new AddressValidationException("Invalid response - matches are unavailable");
}
Validate.isTrue(firstMatch.has("Matches"), "Invalid response - matches are unavailable");
JsonNode matches = firstMatch.get("Matches");
if (!matches.isArray()) {
throw new AddressValidationException("Invalid response - expected to get a validated match in the response");
}
Validate.isTrue(matches.isArray(), "Invalid response - expected to get a validated match in the response");
JsonNode match = matches.get(0);
return toAddressValidationResult(theResult, match, theFhirContext);

1
hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/validation/fields/FieldValidatingInterceptor.java
View File

@ -115,7 +115,6 @@ public class FieldValidatingInterceptor {
private void setValidationStatus(FhirContext ctx, IBase theBase, boolean isValid) {
ExtensionUtil.clearExtensionsByUrl(theBase, getValidationExtensionUrl());
IBaseExtension<?, ?> validationResultExtension = ExtensionUtil.addExtension(theBase, getValidationExtensionUrl());
ExtensionUtil.setExtension(ctx, theBase, getValidationExtensionUrl(), "boolean", !isValid);
}