dcm4che/dcm4chee-arc-light#2101 : RESTful service: List Web Applicati…

…ons - Suppress Keycloak Client ID for local Web Services
dcm4che · Jul 30, 2019 · a53a41a · a53a41a
1 parent 1d11cac
commit a53a41a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/dcm4che-conf/dcm4che-conf-json/src/main/java/org/dcm4che3/conf/json/JsonConfiguration.java b/dcm4che-conf/dcm4che-conf-json/src/main/java/org/dcm4che3/conf/json/JsonConfiguration.java
@@ -114,13 +114,17 @@ public void writeTo(ApplicationEntityInfo aetInfo, JsonGenerator gen) {
     }
 
     public void writeTo(WebApplicationInfo webappInfo, JsonGenerator gen) {
+        writeTo(webappInfo, gen, webappInfo.getKeycloakClientID());
+    }
+
+    public void writeTo(WebApplicationInfo webappInfo, JsonGenerator gen, String keycloakClientID) {
         JsonWriter writer = new JsonWriter(gen);
         gen.writeStartObject();
         writer.writeNotNullOrDef("dicomDeviceName", webappInfo.getDeviceName(), null);
         writer.writeNotNullOrDef("dcmWebAppName", webappInfo.getApplicationName(), null);
         writer.writeNotNullOrDef("dicomDescription", webappInfo.getDescription(), null);
         writer.writeNotNullOrDef("dcmWebServicePath", webappInfo.getServicePath(), null);
-        writer.writeNotNullOrDef("dcmKeycloakClientID", webappInfo.getKeycloakClientID(), null);
+        writer.writeNotNullOrDef("dcmKeycloakClientID", keycloakClientID, null);
         writer.writeNotEmpty("dcmWebServiceClass", webappInfo.getServiceClasses());
         writer.writeNotNullOrDef("dicomAETitle", webappInfo.getAETitle(), null);
         writer.writeNotEmpty("dicomApplicationCluster", webappInfo.getApplicationClusters());