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

A couple of compile glitches

This commit is contained in:
James Agnew 2019-04-24 21:35:49 -04:00
parent 5a9fa4e549
commit f3f5c570b1
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
example-projects/hapi-fhir-jpaserver-example-postgres/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfig.java
View File

@ -107,9 +107,10 @@ public class FhirServerConfig extends BaseJavaConfigDstu3 {
/**
* This interceptor adds some pretty syntax highlighting in responses when a browser is detected
* @return
*/
@Bean(autowire = Autowire.BY_TYPE)
public IServerInterceptor responseHighlighterInterceptor() {
public ResponseHighlighterInterceptor responseHighlighterInterceptor() {
ResponseHighlighterInterceptor retVal = new ResponseHighlighterInterceptor();
return retVal;
}

4
hapi-deployable-pom/pom.xml
View File

@ -158,8 +158,8 @@
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<groupid>org.apache.maven.plugins</groupid>
<artifactid>maven-project-info-reports-plugin</artifactid>
<configuration>
<skip>true</skip>
</configuration>

3
hapi-fhir-cli/hapi-fhir-cli-jpaserver/src/main/java/ca/uhn/fhir/jpa/demo/FhirServerConfigR4.java
View File

@ -78,9 +78,10 @@ public class FhirServerConfigR4 extends BaseJavaConfigR4 {
/**
* This interceptor adds some pretty syntax highlighting in responses when a browser is detected
* @return
*/
@Bean(autowire = Autowire.BY_TYPE)
public IServerInterceptor responseHighlighterInterceptor() {
public ResponseHighlighterInterceptor responseHighlighterInterceptor() {
ResponseHighlighterInterceptor retVal = new ResponseHighlighterInterceptor();
return retVal;
}

2
hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/RestfulServer.java
View File

@ -1643,7 +1643,7 @@ public class RestfulServer extends HttpServlet implements IRestfulServer<Servlet
* @deprecated As of HAPI FHIR 3.8.0, use {@link #getInterceptorService()} to access the interceptor service. You can register and unregister interceptors using this service.
*/
@Deprecated
public void unregisterInterceptor(IServerInterceptor theInterceptor) {
public void unregisterInterceptor(Object theInterceptor) {
Validate.notNull(theInterceptor, "Interceptor can not be null");
getInterceptorService().unregisterInterceptor(theInterceptor);
}

4
hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/interceptor/ServeMediaResourceRawInterceptorTest.java
View File

@ -47,13 +47,13 @@ public class ServeMediaResourceRawInterceptorTest {
@Before
public void before() {
myInterceptor = new ServeMediaResourceRawInterceptor();
ourServlet.registerInterceptor(myInterceptor);
ourServlet.getInterceptorService().registerInterceptor(myInterceptor);
}
@After
public void after() {
ourNextResponse = null;
ourServlet.unregisterInterceptor(myInterceptor);
ourServlet.getInterceptorService().unregisterInterceptor(myInterceptor);
}
@Test