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

Still trying to get travis working!

This commit is contained in:
jamesagnew 2016-01-07 21:13:17 -05:00
parent 50a9995c55
commit cabdde8914
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/BaseDstu21Config.java
View File

@ -66,7 +66,7 @@ public class BaseDstu21Config extends BaseConfig {
} }
@Bean(name = "myJpaValidationSupportDstu21", autowire = Autowire.BY_NAME) @Bean(name = "myJpaValidationSupportDstu21", autowire = Autowire.BY_NAME)
public static ca.uhn.fhir.jpa.dao.IJpaValidationSupportDstu21 jpaValidationSupportDstu21() { public ca.uhn.fhir.jpa.dao.IJpaValidationSupportDstu21 jpaValidationSupportDstu21() {
ca.uhn.fhir.jpa.dao.JpaValidationSupportDstu21 retVal = new ca.uhn.fhir.jpa.dao.JpaValidationSupportDstu21(); ca.uhn.fhir.jpa.dao.JpaValidationSupportDstu21 retVal = new ca.uhn.fhir.jpa.dao.JpaValidationSupportDstu21();
return retVal; return retVal;
} }
@ -95,7 +95,7 @@ public class BaseDstu21Config extends BaseConfig {
} }
@Bean @Bean
public static IValidationSupport validationSupportChainDstu21() { public IValidationSupport validationSupportChainDstu21() {
return new ValidationSupportChain(new DefaultProfileValidationSupport(), jpaValidationSupportDstu21()); return new ValidationSupportChain(new DefaultProfileValidationSupport(), jpaValidationSupportDstu21());
// return new ValidationSupportChain(); // return new ValidationSupportChain();
} }

5
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaValidationSupportDstu21.java
View File

@ -57,6 +57,11 @@ public class JpaValidationSupportDstu21 implements IJpaValidationSupportDstu21 {
@Qualifier("myFhirContextDstu21") @Qualifier("myFhirContextDstu21")
private FhirContext myDstu21Ctx; private FhirContext myDstu21Ctx;
public JpaValidationSupportDstu21() {
super();
}
@Override @Override
public ValueSetExpansionComponent expandValueSet(FhirContext theCtx, ConceptSetComponent theInclude) { public ValueSetExpansionComponent expandValueSet(FhirContext theCtx, ConceptSetComponent theInclude) {
return null; return null;

18
hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestDstu21Config.java
View File

@ -44,20 +44,6 @@ public class TestDstu21Config extends BaseJavaConfigDstu21 {
@Value("${fhir.lucene.location.dstu21}") @Value("${fhir.lucene.location.dstu21}")
private String myFhirLuceneLocation; private String myFhirLuceneLocation;
@Autowired
private ApplicationContext myApplicationCtx;
@PostConstruct
public void postConstruct() {
IValidatorModule next = myApplicationCtx.getBean("myQuestionnaireResponseValidatorDstu21", IValidatorModule.class);
requestValidatingInterceptor().addValidatorModule(next);
responseValidatingInterceptor().addValidatorModule(next);
next = myApplicationCtx.getBean("myInstanceValidatorDstu21", IValidatorModule.class);
requestValidatingInterceptor().addValidatorModule(next);
responseValidatingInterceptor().addValidatorModule(next);
}
@Bean() @Bean()
public DaoConfig daoConfig() { public DaoConfig daoConfig() {
DaoConfig retVal = new DaoConfig(); DaoConfig retVal = new DaoConfig();
@ -117,6 +103,8 @@ public class TestDstu21Config extends BaseJavaConfigDstu21 {
requestValidator.setFailOnSeverity(ResultSeverityEnum.ERROR); requestValidator.setFailOnSeverity(ResultSeverityEnum.ERROR);
requestValidator.setAddResponseHeaderOnSeverity(null); requestValidator.setAddResponseHeaderOnSeverity(null);
requestValidator.setAddResponseOutcomeHeaderOnSeverity(ResultSeverityEnum.INFORMATION); requestValidator.setAddResponseOutcomeHeaderOnSeverity(ResultSeverityEnum.INFORMATION);
requestValidator.addValidatorModule(questionnaireResponseValidatorDstu21());
requestValidator.addValidatorModule(instanceValidatorDstu21());
return requestValidator; return requestValidator;
} }
@ -141,6 +129,8 @@ public class TestDstu21Config extends BaseJavaConfigDstu21 {
responseValidator.addExcludeOperationType(RestOperationTypeEnum.HISTORY_TYPE); responseValidator.addExcludeOperationType(RestOperationTypeEnum.HISTORY_TYPE);
responseValidator.addExcludeOperationType(RestOperationTypeEnum.SEARCH_SYSTEM); responseValidator.addExcludeOperationType(RestOperationTypeEnum.SEARCH_SYSTEM);
responseValidator.addExcludeOperationType(RestOperationTypeEnum.SEARCH_TYPE); responseValidator.addExcludeOperationType(RestOperationTypeEnum.SEARCH_TYPE);
responseValidator.addValidatorModule(questionnaireResponseValidatorDstu21());
responseValidator.addValidatorModule(instanceValidatorDstu21());
return responseValidator; return responseValidator;
} }