chore: pass real export params

Refs: #91
SchweizerischeBundesbahnen · Aug 8, 2024 · d588880 · d588880
1 parent 3f89835
commit d588880
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/docs/openapi.json b/docs/openapi.json
@@ -1299,10 +1299,10 @@
                   "type" : "string"
                 }
               },
-              "wildcardType" : {
+              "wildcardSubtype" : {
                 "type" : "boolean"
               },
-              "wildcardSubtype" : {
+              "wildcardType" : {
                 "type" : "boolean"
               }
             }
@@ -1393,10 +1393,10 @@
                   "type" : "string"
                 }
               },
-              "wildcardType" : {
+              "wildcardSubtype" : {
                 "type" : "boolean"
               },
-              "wildcardSubtype" : {
+              "wildcardType" : {
                 "type" : "boolean"
               }
             }
@@ -1505,10 +1505,10 @@
                   "type" : "string"
                 }
               },
-              "wildcardType" : {
+              "wildcardSubtype" : {
                 "type" : "boolean"
               },
-              "wildcardSubtype" : {
+              "wildcardType" : {
                 "type" : "boolean"
               }
             }

diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/PdfConverter.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/PdfConverter.java
@@ -153,20 +153,20 @@ public byte[] convertToPdf(@NotNull ExportParams exportParams, @Nullable ExportM
         WebhooksModel hooksModel = new WebhooksSettings().load(exportParams.getProjectId(), SettingId.fromName(exportParams.getWebhooks()));
         String result = htmlContent;
         for (String hook : hooksModel.getWebhooks()) {
-            result = applyHook(hook, result);
+            result = applyHook(hook, exportParams, result);
         }
         return result;
     }
 
-    private @NotNull String applyHook(@NotNull String hook, @NotNull String htmlContent) {
+    private @NotNull String applyHook(@NotNull String hook, @NotNull ExportParams exportParams, @NotNull String htmlContent) {
         Client client = null;
         try {
             client = ClientBuilder.newClient();
             WebTarget webTarget = client.target(hook).register(MultiPartFeature.class);
 
             FormDataMultiPart multipart = new FormDataMultiPart();
+            multipart.bodyPart(new FormDataBodyPart("exportParams", new ObjectMapper().writeValueAsString(exportParams), MediaType.APPLICATION_JSON_TYPE));
             multipart.bodyPart(new FormDataBodyPart("html", htmlContent.getBytes(StandardCharsets.UTF_8), MediaType.APPLICATION_OCTET_STREAM_TYPE));
-            multipart.bodyPart(new FormDataBodyPart("exportParams", new ObjectMapper().writeValueAsString(new ExportParams()), MediaType.APPLICATION_JSON_TYPE));
 
             try (Response response = webTarget.request(MediaType.TEXT_PLAIN).post(Entity.entity(multipart, multipart.getMediaType()))) {
                 if (response.getStatus() == Response.Status.OK.getStatusCode()) {