Merge pull request #1101 from amvanbaren/bugfix/streaming-response-body

Create new StreamingResponseBody
eclipse · Feb 4, 2025 · 90cbad1 · 90cbad1
2 parents 45a1471 + 41296d3
commit 90cbad1
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/server/src/main/java/org/eclipse/openvsx/adapter/LocalVSCodeService.java b/server/src/main/java/org/eclipse/openvsx/adapter/LocalVSCodeService.java
@@ -56,11 +56,6 @@ public class LocalVSCodeService implements IVSCodeService {
     private final WebResourceService webResources;
     private final CacheService cache;
 
-    private final StreamingResponseBody builtinExtensionResponse = outputStream -> {
-        var message = "Built-in extension namespace '" + BuiltInExtensionUtil.getBuiltInNamespace() + "' not allowed";
-        outputStream.write(message.getBytes(StandardCharsets.UTF_8));
-    };
-
     @Value("${ovsx.webui.url:}")
     String webuiUrl;
 
@@ -284,7 +279,7 @@ public ResponseEntity<StreamingResponseBody> getAsset(
             String restOfTheUrl
     ) {
         if(BuiltInExtensionUtil.isBuiltIn(namespace)) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(builtinExtensionResponse);
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(builtinExtensionResponse());
         }
 
         var asset = (restOfTheUrl != null && !restOfTheUrl.isEmpty()) ? (assetType + "/" + restOfTheUrl) : assetType;
@@ -352,6 +347,10 @@ private String builtinExtensionMessage() {
         return "Built-in extension namespace '" + BuiltInExtensionUtil.getBuiltInNamespace() + "' not allowed";
     }
 
+    private StreamingResponseBody builtinExtensionResponse() {
+        return (out) -> out.write(builtinExtensionMessage().getBytes(StandardCharsets.UTF_8));
+    }
+
     @Override
     public String getItemUrl(String namespaceName, String extensionName) {
         if(BuiltInExtensionUtil.isBuiltIn(namespaceName)) {
@@ -396,7 +395,7 @@ public String download(String namespaceName, String extensionName, String versio
     @Override
     public ResponseEntity<StreamingResponseBody> browse(String namespaceName, String extensionName, String version, String path) {
         if(BuiltInExtensionUtil.isBuiltIn(namespaceName)) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(builtinExtensionResponse);
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(builtinExtensionResponse());
         }
 
         var file = getWebResource(namespaceName, extensionName, null, version, path, true);