Merge remote-tracking branch 'origin/feature/EHSBP-1173' into feature/EHSBP-1173

http-validator-client/src/main/java/net/ihe/gazelle/http/validator/client/interlay/validation/HttpValidationService.java

@@ -20,6 +20,7 @@ public class HttpValidationService implements ValidationService {
 
     public static final String HTTP_VALIDATION = "http-validation";
     public static final String APP_HTTP_VALIDATOR_SERVER = System.getenv("APP_HTTP_VALIDATOR_SERVER");
+    public static final String RULES_FAILED_DURING_HTTP_VALIDATION = "Some rules failed during http-validation";
     List<ValidationItem> validationItemList = new ArrayList<>();
     private ValidationReport validationReport = new ValidationReport();
 
@@ -31,6 +32,9 @@ public class HttpValidationService implements ValidationService {
             String httpMessage = jsonMapper.writeValueAsString(validationRequestDTO);
             String response = getResponseFromHttpValidation(httpMessage);
             validationReport = jsonMapper.readValue(response, ValidationReportDTO.class);
+            if (ValidationTestResult.FAILED.equals(validationReport.getOverallResult())) {
+                addMessageToValidationItem(RULES_FAILED_DURING_HTTP_VALIDATION);
+            }
         } catch (JsonProcessingException e) {
             validationReport.setOverallResult(ValidationTestResult.FAILED);
             addMessageToValidationItem(e.getMessage());

pixm-connector-service/src/main/java/net/ihe/gazelle/business/provider/IhePatientResourceProvider.java

@@ -331,7 +331,7 @@ public class IhePatientResourceProvider implements IResourceProvider {
                 OperationOutcome.OperationOutcomeIssueComponent issue = new OperationOutcome.OperationOutcomeIssueComponent();
                 issue.setSeverity(OperationOutcome.IssueSeverity.ERROR);
                 issue.setCode(OperationOutcome.IssueType.PROCESSING);
-                issue.setDiagnostics("Error during validation with Gazelle HTTP Validator.");
+                issue.setDiagnostics(new String(item.getContent()));
                 oo.addIssue(issue);
             }
         }