Skip to content

Commit 41296d3

Browse files
author
amvanbaren
committed
Create new StreamingResponseBody
Create new StreamingResponseBody for each response.
1 parent 45a1471 commit 41296d3

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

server/src/main/java/org/eclipse/openvsx/adapter/LocalVSCodeService.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@ public class LocalVSCodeService implements IVSCodeService {
5656
private final WebResourceService webResources;
5757
private final CacheService cache;
5858

59-
private final StreamingResponseBody builtinExtensionResponse = outputStream -> {
60-
var message = "Built-in extension namespace '" + BuiltInExtensionUtil.getBuiltInNamespace() + "' not allowed";
61-
outputStream.write(message.getBytes(StandardCharsets.UTF_8));
62-
};
63-
6459
@Value("${ovsx.webui.url:}")
6560
String webuiUrl;
6661

@@ -284,7 +279,7 @@ public ResponseEntity<StreamingResponseBody> getAsset(
284279
String restOfTheUrl
285280
) {
286281
if(BuiltInExtensionUtil.isBuiltIn(namespace)) {
287-
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(builtinExtensionResponse);
282+
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(builtinExtensionResponse());
288283
}
289284

290285
var asset = (restOfTheUrl != null && !restOfTheUrl.isEmpty()) ? (assetType + "/" + restOfTheUrl) : assetType;
@@ -352,6 +347,10 @@ private String builtinExtensionMessage() {
352347
return "Built-in extension namespace '" + BuiltInExtensionUtil.getBuiltInNamespace() + "' not allowed";
353348
}
354349

350+
private StreamingResponseBody builtinExtensionResponse() {
351+
return (out) -> out.write(builtinExtensionMessage().getBytes(StandardCharsets.UTF_8));
352+
}
353+
355354
@Override
356355
public String getItemUrl(String namespaceName, String extensionName) {
357356
if(BuiltInExtensionUtil.isBuiltIn(namespaceName)) {
@@ -396,7 +395,7 @@ public String download(String namespaceName, String extensionName, String versio
396395
@Override
397396
public ResponseEntity<StreamingResponseBody> browse(String namespaceName, String extensionName, String version, String path) {
398397
if(BuiltInExtensionUtil.isBuiltIn(namespaceName)) {
399-
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(builtinExtensionResponse);
398+
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(builtinExtensionResponse());
400399
}
401400

402401
var file = getWebResource(namespaceName, extensionName, null, version, path, true);

0 commit comments

Comments
 (0)