Commit fdc22f9b authored by R.W.Majeed's avatar R.W.Majeed
Browse files

new schematron validation release. 

allow info messages in validation response
parent 38257287

cda-server/src/main/java/org/aktin/cda/etl/fhir/ValidationErrorsToOperationOutcome.java

+4 −0
Original line number Diff line number Diff line
@@ -19,5 +19,9 @@ public class ValidationErrorsToOperationOutcome implements ValidationErrorHandle 
	public void error(String message, Throwable cause) {

		outcome.addIssue(Severity.error, IssueType.exception, message);

	}

	@Override

	public void info(String message) {

		outcome.addIssue(Severity.information, IssueType.informational, message);

	}



}

cda-server/src/main/java/org/aktin/cda/etl/xds/ValidationErrorsToRegistryError.java

+10 −2
Original line number Diff line number Diff line
@@ -28,5 +28,13 @@ public class ValidationErrorsToRegistryError implements ValidationErrorHandler{ 
		e.setErrorCode(XDSConstants.ERR_DOC_INVALID_CONTENT);

		rel.getRegistryError().add(e);

	}

	@Override

	public void info(String message) {

		RegistryError e = new RegistryError();

		e.setSeverity(XDSConstants.SEVERITY_WARNING);

		e.setCodeContext(message); // free error message

		e.setErrorCode(XDSConstants.ERR_DOC_INVALID_CONTENT);

		rel.getRegistryError().add(e);

	}



}

cda-validation/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
		<version>0.13-SNAPSHOT</version>

	</parent>

	<properties>

		<schematronVersion>20170302T140447</schematronVersion>

		<examplesVersion>20170105T160149</examplesVersion> 

		<schematronVersion>20180323T201638</schematronVersion>

		<examplesVersion>20180322T121703</examplesVersion> 

		<schematronArchive>aktin-runtime-${schematronVersion}</schematronArchive>            

		<examplesArchive>aktin-xml-${examplesVersion}</examplesArchive>            

	</properties>

cda-validation/src/main/java/org/aktin/cda/ValidationErrorHandler.java

+1 −0
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ public interface ValidationErrorHandler { 


	void warning(String message, Throwable cause);

	void error(String message, Throwable cause);

	void info(String message);



}

cda-validation/src/main/java/org/aktin/cda/ValidationErrorPrinter.java

+10 −2
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ public class ValidationErrorPrinter implements ValidationErrorHandler { 
	private String systemId;

	@Override

	public void warning(String message, Throwable cause) {

		System.err.println("Validation warning for "+systemId);

		System.err.print("Validation WARNING for "+systemId+": ");

		System.err.println(message);

		if( cause != null ){

			cause.printStackTrace();

		}
@@ -18,7 +19,8 @@ public class ValidationErrorPrinter implements ValidationErrorHandler { 


	@Override

	public void error(String message, Throwable cause) {

		System.err.println("Validation ERROR for "+systemId);

		System.err.print("Validation ERROR for "+systemId+": ");

		System.err.println(message);

		if( cause != null ){

			cause.printStackTrace();

		}
@@ -26,4 +28,10 @@ public class ValidationErrorPrinter implements ValidationErrorHandler { 
	public void setSystemId(String systemId){

		this.systemId = systemId;

	}



	@Override

	public void info(String message) {

		System.err.print("Validation INFO for "+systemId+": ");

		System.err.println(message);

	}

}