Refactor FileStreamingUtil

hawkbit-ddi/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java

@@ -182,12 +182,11 @@ public ResponseEntity<InputStream> downloadArtifact(
                         ? logDownload(RequestResponseContextHolder.getHttpServletRequest(), target, module.getId())
                         : null; // range request - could have too many - so doesn't check action, don't log action status, and don't publish events
                 result = FileStreamingUtil.writeFileResponse(file, artifact.getFilename(), artifact.getCreatedAt(),
-                        RequestResponseContextHolder.getHttpServletResponse(),
-                        RequestResponseContextHolder.getHttpServletRequest(),
+                        RequestResponseContextHolder.getHttpServletRequest(), RequestResponseContextHolder.getHttpServletResponse(),
                         (length, shippedSinceLastEvent, total) -> {
                             if (actionStatus != null) {
-                                eventPublisher.publishEvent(new DownloadProgressEvent(
-                                        AccessContext.tenant(), actionStatus.getId(), shippedSinceLastEvent));
+                                eventPublisher.publishEvent(
+                                        new DownloadProgressEvent(AccessContext.tenant(), actionStatus.getId(), shippedSinceLastEvent));
                             }
                         });
             }

hawkbit-mgmt/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadArtifactResource.java

@@ -69,6 +69,6 @@ public ResponseEntity<InputStream> downloadArtifact(final Long softwareModuleId,
         }
 
         return FileStreamingUtil.writeFileResponse(file, artifact.getFilename(), artifact.getCreatedAt(),
-                RequestResponseContextHolder.getHttpServletResponse(), request, null);
+                request, RequestResponseContextHolder.getHttpServletResponse(), null);
     }
 }

hawkbit-mgmt/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResourceTest.java

@@ -1537,16 +1537,13 @@ private void assertArtifact(final SoftwareModule sm, final byte[] random) throws
                 .as("wrong metadata of the filename").isEqualTo("origFilename");
     }
 
-    private void downloadAndVerify(final SoftwareModule sm, final byte[] random, final Artifact artifact)
-            throws Exception {
+    private void downloadAndVerify(final SoftwareModule sm, final byte[] random, final Artifact artifact) throws Exception {
         final MvcResult result = mvc
-                .perform(
-                        get("/rest/v1/softwaremodules/{smId}/artifacts/{artId}/download", sm.getId(), artifact.getId()))
+                .perform(get("/rest/v1/softwaremodules/{smId}/artifacts/{artId}/download", sm.getId(), artifact.getId()))
                 .andExpect(status().isOk())
                 .andExpect(content().contentType(MediaType.APPLICATION_OCTET_STREAM))
                 .andExpect(header().string("ETag", artifact.getSha1Hash()))
                 .andReturn();
-
         assertArrayEquals(result.getResponse().getContentAsByteArray(), random, "Wrong response content");
     }