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

Merge remote-tracking branch 'remotes/origin/master' into ks-20191119-scheduler

This commit is contained in:
Ken Stevens 2019-12-11 14:17:54 -05:00
parent 7c1544d8f3 eb41510fa5
commit 7cc690ffd3
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandlerFactory.java
View File

@ -56,8 +56,8 @@ public class ClientInvocationHandlerFactory {
myMethodToLambda.put(theClientType.getMethod("setEncoding", EncodingEnum.class), new SetEncodingLambda());
myMethodToLambda.put(theClientType.getMethod("setPrettyPrint", Boolean.class), new SetPrettyPrintLambda());
myMethodToLambda.put(theClientType.getMethod("registerInterceptor", IClientInterceptor.class), new RegisterInterceptorLambda());
myMethodToLambda.put(theClientType.getMethod("unregisterInterceptor", IClientInterceptor.class), new UnregisterInterceptorLambda());
myMethodToLambda.put(theClientType.getMethod("registerInterceptor", Object.class), new RegisterInterceptorLambda());
myMethodToLambda.put(theClientType.getMethod("unregisterInterceptor", Object.class), new UnregisterInterceptorLambda());
myMethodToLambda.put(theClientType.getMethod("setSummary", SummaryEnum.class), new SetSummaryLambda());
myMethodToLambda.put(theClientType.getMethod("fetchResourceFromUrl", Class.class, String.class), new FetchResourceFromUrlLambda());

9
hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/Builder.java
View File

@ -170,10 +170,19 @@ public class Builder {
}
public void renameIndex(String theVersion, String theOldIndexName, String theNewIndexName) {
renameIndexOptional(false, theVersion, theOldIndexName, theNewIndexName);
}
public void renameIndexStub(String theVersion, String theOldIndexName, String theNewIndexName) {
renameIndexOptional(true, theVersion, theOldIndexName, theNewIndexName);
}
private void renameIndexOptional(boolean theDoNothing, String theVersion, String theOldIndexName, String theNewIndexName) {
RenameIndexTask task = new RenameIndexTask(myRelease, theVersion);
task.setOldIndexName(theOldIndexName);
task.setNewIndexName(theNewIndexName);
task.setTableName(myTableName);
task.setDoNothing(theDoNothing);
addTask(task);
}

4
hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/GenericClientDstu2Test.java
View File

@ -2658,7 +2658,7 @@ public class GenericClientDstu2Test {
}
@Override
public void registerInterceptor(IClientInterceptor theInterceptor) {
public void registerInterceptor(Object theInterceptor) {
// nothing
}
@ -2673,7 +2673,7 @@ public class GenericClientDstu2Test {
}
@Override
public void unregisterInterceptor(IClientInterceptor theInterceptor) {
public void unregisterInterceptor(Object theInterceptor) {
// nothing
}