feat: Added info about the used weasyprint service version

Refs: #104
SchweizerischeBundesbahnen · Jul 31, 2024 · 3f43754 · 3f43754
1 parent cd471fe
commit 3f43754
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/.../sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationInternalController.java b/.../sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationInternalController.java
@@ -64,12 +64,4 @@ public class ConfigurationInternalController {
     public @NotNull ConfigurationStatus checkWeasyPrint() {
         return ConfigurationStatusUtils.getWeasyPrintStatus();
     }
-
-    @GET
-    @Produces(MediaType.APPLICATION_JSON)
-    @Path("/configuration/weasyprint-service-version")
-    @Operation(summary = "Checks WeasyPrint Service configuration")
-    public @NotNull ConfigurationStatus checkWeasyPrintServiceVersion() {
-        return ConfigurationStatusUtils.getWeasyPrintStatus();
-    }
 }
diff --git a/...a/ch/sbb/polarion/extension/pdf/exporter/util/configuration/ConfigurationStatusUtils.java b/...a/ch/sbb/polarion/extension/pdf/exporter/util/configuration/ConfigurationStatusUtils.java
@@ -87,8 +87,8 @@ public class ConfigurationStatusUtils {
         try {
             HtmlToPdfConverter htmlToPdfConverter = new HtmlToPdfConverter();
             WeasyPrintConverter weasyPrintConverter = htmlToPdfConverter.getWeasyPrintConverter();
-            if (weasyPrintConverter instanceof WeasyPrintServiceConnector) {
-                ModuleDescriptor.Version weasyPrintServiceVersion = ((WeasyPrintServiceConnector) weasyPrintConverter).getWeasyPrintServiceVersion();
+            if (weasyPrintConverter instanceof WeasyPrintServiceConnector weasyPrintServiceConnector) {
+                ModuleDescriptor.Version weasyPrintServiceVersion = weasyPrintServiceConnector.getWeasyPrintServiceVersion();
                 return new ConfigurationStatus(Status.OK, "Version: %s".formatted(weasyPrintServiceVersion.toString()));
             } else {
                 return new ConfigurationStatus(Status.WARNING, "WeasyPrint Service not configured");

diff --git a/...ch/sbb/polarion/extension/pdf/exporter/weasyprint/service/WeasyPrintServiceConnector.java b/...ch/sbb/polarion/extension/pdf/exporter/weasyprint/service/WeasyPrintServiceConnector.java
@@ -67,7 +67,7 @@ public ModuleDescriptor.Version getWeasyPrintVersion() {
     }
 
     public ModuleDescriptor.Version getWeasyPrintServiceVersion() {
-        return ModuleDescriptor.Version.parse(getWeasyPrintInfo().getWeasyprintServiceVersion());
+        return ModuleDescriptor.Version.parse(getWeasyPrintInfo().getWeasyprintService());
     }
 
     private WeasyPrintServiceInfo getWeasyPrintInfo() {

diff --git a/...h/sbb/polarion/extension/pdf/exporter/weasyprint/service/model/WeasyPrintServiceInfo.java b/...h/sbb/polarion/extension/pdf/exporter/weasyprint/service/model/WeasyPrintServiceInfo.java
@@ -6,5 +6,5 @@
 public class WeasyPrintServiceInfo {
     private String python;
     private String weasyprint;
-    private String weasyprintServiceVersion;
+    private String weasyprintService;
 }