From d91b26e69b62733345af6def75d9954f4a659172 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 9 Nov 2021 06:13:18 +1100 Subject: [PATCH] Add getServerVersion to tooling client --- .../hl7/fhir/convertors/txClient/TerminologyClientR2.java | 5 +++++ .../hl7/fhir/convertors/txClient/TerminologyClientR3.java | 5 +++++ .../hl7/fhir/convertors/txClient/TerminologyClientR4.java | 5 +++++ .../hl7/fhir/convertors/txClient/TerminologyClientR5.java | 5 +++++ .../org/hl7/fhir/dstu2/utils/client/FHIRToolingClient.java | 4 ++++ .../org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java | 4 ++++ .../java/org/hl7/fhir/r4/utils/client/FHIRToolingClient.java | 4 ++++ .../org/hl7/fhir/r5/terminologies/TerminologyClient.java | 1 + .../java/org/hl7/fhir/r5/utils/client/FHIRToolingClient.java | 4 ++++ 9 files changed, 37 insertions(+) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR2.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR2.java index 5c5fbb69e..5e7d1d6c1 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR2.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR2.java @@ -159,4 +159,9 @@ public class TerminologyClientR2 implements TerminologyClient { client.setUserAgent(userAgent); return this; } + + @Override + public String getServerVersion() { + return client.getServerVersion(); + } } \ No newline at end of file diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR3.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR3.java index 68f03ba60..27082bd05 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR3.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR3.java @@ -168,4 +168,9 @@ public class TerminologyClientR3 implements TerminologyClient { client.setUserAgent(userAgent); return this; } + + @Override + public String getServerVersion() { + return client.getServerVersion(); + } } \ No newline at end of file diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR4.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR4.java index d9e6431e0..b91ba2f85 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR4.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR4.java @@ -168,4 +168,9 @@ public class TerminologyClientR4 implements TerminologyClient { client.setUserAgent(userAgent); return this; } + + @Override + public String getServerVersion() { + return client.getServerVersion(); + } } \ No newline at end of file diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR5.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR5.java index cffbc1503..25cf47be6 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR5.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR5.java @@ -154,4 +154,9 @@ public class TerminologyClientR5 implements TerminologyClient { client.setUserAgent(userAgent); return this; } + + @Override + public String getServerVersion() { + return client.getServerVersion(); + } } \ No newline at end of file diff --git a/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/client/FHIRToolingClient.java b/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/client/FHIRToolingClient.java index 5308f7c98..fa0f4966a 100644 --- a/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/client/FHIRToolingClient.java +++ b/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/client/FHIRToolingClient.java @@ -866,4 +866,8 @@ public class FHIRToolingClient { public void setUserAgent(String userAgent) { utils.setUserAgent(userAgent); } + + public String getServerVersion() { + return conf == null ? null : conf.getSoftware().getVersion(); + } } \ No newline at end of file diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java index 8239deb2e..d2e75610f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java @@ -580,5 +580,9 @@ public class FHIRToolingClient { public void setUserAgent(String userAgent) { this.userAgent = userAgent; } + + public String getServerVersion() { + return capabilities == null ? null : capabilities.getSoftware().getVersion(); + } } diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/FHIRToolingClient.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/FHIRToolingClient.java index c45db06a2..26de85171 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/FHIRToolingClient.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/FHIRToolingClient.java @@ -553,5 +553,9 @@ public class FHIRToolingClient { public void setUserAgent(String userAgent) { this.userAgent = userAgent; } + + public String getServerVersion() { + return capabilities == null ? null : capabilities.getSoftware().getVersion(); + } } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/TerminologyClient.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/TerminologyClient.java index 2d4c4f291..18891abd1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/TerminologyClient.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/TerminologyClient.java @@ -40,6 +40,7 @@ import java.util.Map; public interface TerminologyClient { String getAddress(); + String getServerVersion(); TerminologyCapabilities getTerminologyCapabilities() throws FHIRException; ValueSet expandValueset(ValueSet vs, Parameters p, Map params) throws FHIRException; Parameters validateCS(Parameters pin) throws FHIRException; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/FHIRToolingClient.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/FHIRToolingClient.java index ade033db5..23c93c528 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/FHIRToolingClient.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/FHIRToolingClient.java @@ -587,6 +587,10 @@ public class FHIRToolingClient { public void setUserAgent(String userAgent) { this.userAgent = userAgent; } + + public String getServerVersion() { + return capabilities == null ? null : capabilities.getSoftware().getVersion(); + } }