From 2ca015b25678225c62e1445b7b3d5eba1616746a Mon Sep 17 00:00:00 2001 From: James Agnew Date: Wed, 11 Dec 2019 08:45:25 -0500 Subject: [PATCH 1/3] Fix compile error --- .../java/ca/uhn/fhir/rest/client/GenericClientDstu2Test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/GenericClientDstu2Test.java b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/GenericClientDstu2Test.java index fede33ce24a..56b6d378d2f 100644 --- a/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/GenericClientDstu2Test.java +++ b/hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/GenericClientDstu2Test.java @@ -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 } From 8c7cb214b1972fc3b400a69311707435f64d288f Mon Sep 17 00:00:00 2001 From: James Agnew Date: Wed, 11 Dec 2019 11:50:17 -0500 Subject: [PATCH 2/3] One more test fix --- .../fhir/rest/client/impl/ClientInvocationHandlerFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandlerFactory.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandlerFactory.java index 74857462e0f..51b75a2a440 100644 --- a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandlerFactory.java +++ b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandlerFactory.java @@ -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()); From ae5f00accc2998d3b72a46695c58214bdebb9818 Mon Sep 17 00:00:00 2001 From: Ken Stevens Date: Wed, 11 Dec 2019 12:07:43 -0500 Subject: [PATCH 3/3] add support to stub out renameindex --- .../java/ca/uhn/fhir/jpa/migrate/tasks/api/Builder.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/Builder.java b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/Builder.java index 18248f2d6fd..5e122b98478 100644 --- a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/Builder.java +++ b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/Builder.java @@ -163,10 +163,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); }