Merge pull request #1114 from amvanbaren/java-useless-curly-braces

Remove useless curly braces around statement
eclipse · Feb 14, 2025 · 839e34a · 839e34a
2 parents 74a19a3 + 490671f
commit 839e34a
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 67 deletions.
diff --git a/server/src/main/java/org/eclipse/openvsx/adapter/UpstreamVSCodeService.java b/server/src/main/java/org/eclipse/openvsx/adapter/UpstreamVSCodeService.java
@@ -122,9 +122,7 @@ public ResponseEntity<StreamingResponseBody> extractData(ClientHttpResponse resp
                         var json = proxy.rewriteUrls(mapper.readTree(response.getBody()));
                         return ResponseEntity.status(statusCode)
                                 .headers(headers)
-                                .body(outputStream -> {
-                                    mapper.writeValue(outputStream, json);
-                                });
+                                .body(outputStream -> mapper.writeValue(outputStream, json));
                     } else {
                         var tempFile = new TempFile("browse", null);
                         try {

diff --git a/server/src/main/java/org/eclipse/openvsx/repositories/ExtensionJooqRepository.java b/server/src/main/java/org/eclipse/openvsx/repositories/ExtensionJooqRepository.java
@@ -213,13 +213,11 @@ public List<SitemapRow> fetchSitemapRows() {
                 .join(EXTENSION).on(EXTENSION.NAMESPACE_ID.eq(NAMESPACE.ID))
                 .where(EXTENSION.ACTIVE.eq(true))
                 .fetch()
-                .map(row -> {
-                    return new SitemapRow(
-                            row.get(NAMESPACE.NAME),
-                            row.get(EXTENSION.NAME),
-                            row.get(LAST_UPDATED)
-                    );
-                });
+                .map(row -> new SitemapRow(
+                        row.get(NAMESPACE.NAME),
+                        row.get(EXTENSION.NAME),
+                        row.get(LAST_UPDATED)
+                ));
     }
 
     public List<String> findActiveExtensionNames(Namespace namespace) {

diff --git a/server/src/main/java/org/eclipse/openvsx/security/SecurityConfig.java b/server/src/main/java/org/eclipse/openvsx/security/SecurityConfig.java
@@ -57,9 +57,7 @@ public SecurityFilterChain filterChain(HttpSecurity http, OAuth2UserServices use
                             .authenticated()
                 )
                 .cors(configurer -> configurer.configure(http))
-                .csrf(configurer -> {
-                    configurer.ignoringRequestMatchers(antMatchers("/api/-/publish", "/api/-/namespace/create", "/api/-/query", "/vscode/**"));
-                })
+                .csrf(configurer -> configurer.ignoringRequestMatchers(antMatchers("/api/-/publish", "/api/-/namespace/create", "/api/-/query", "/vscode/**")))
                 .exceptionHandling(configurer -> configurer.authenticationEntryPoint(new Http403ForbiddenEntryPoint()));
 
         if(userServices.canLogin()) {

diff --git a/server/src/main/java/org/eclipse/openvsx/storage/AzureBlobStorageService.java b/server/src/main/java/org/eclipse/openvsx/storage/AzureBlobStorageService.java
@@ -244,9 +244,7 @@ public Path getCachedFile(FileResource resource) {
         }
 
         var path = filesCacheKeyGenerator.generateCachedExtensionPath(resource);
-        FileUtil.writeSync(path, p -> {
-            getContainerClient().getBlobClient(blobName).downloadToFile(p.toAbsolutePath().toString());
-        });
+        FileUtil.writeSync(path, p -> getContainerClient().getBlobClient(blobName).downloadToFile(p.toAbsolutePath().toString()));
         return path;
     }
 }
diff --git a/server/src/main/java/org/eclipse/openvsx/storage/AzureDownloadCountProcessor.java b/server/src/main/java/org/eclipse/openvsx/storage/AzureDownloadCountProcessor.java
@@ -69,14 +69,12 @@ public void persistProcessedItem(String name, LocalDateTime processedOn, int exe
     }
 
     public Map<Long, Integer> processDownloadCounts(Map<String, Integer> files) {
-        return Observation.createNotStarted("AzureDownloadCountProcessor#processDownloadCounts", observations).observe(() -> {
-            return repositories.findDownloadsByStorageTypeAndName(STORAGE_AZURE, files.keySet()).stream()
-                    .map(fileResource -> Map.entry(fileResource, files.get(fileResource.getName().toUpperCase())))
-                    .collect(Collectors.groupingBy(
-                            e -> e.getKey().getExtension().getExtension().getId(),
-                            Collectors.summingInt(Map.Entry::getValue)
-                    ));
-        });
+        return Observation.createNotStarted("AzureDownloadCountProcessor#processDownloadCounts", observations).observe(() -> repositories.findDownloadsByStorageTypeAndName(STORAGE_AZURE, files.keySet()).stream()
+                .map(fileResource -> Map.entry(fileResource, files.get(fileResource.getName().toUpperCase())))
+                .collect(Collectors.groupingBy(
+                        e -> e.getKey().getExtension().getExtension().getId(),
+                        Collectors.summingInt(Map.Entry::getValue)
+                )));
     }
 
     @Transactional
@@ -94,13 +92,11 @@ public List<Extension> increaseDownloadCounts(Map<Long, Integer> extensionDownlo
 
     @Transactional //needs transaction for lazy-loading versions
     public void evictCaches(List<Extension> extensions) {
-        Observation.createNotStarted("AzureDownloadCountProcessor#evictCaches", observations).observe(() -> {
-            extensions.forEach(extension -> {
-                extension = entityManager.merge(extension);
-                cache.evictExtensionJsons(extension);
-                cache.evictLatestExtensionVersion(extension);
-            });
-        });
+        Observation.createNotStarted("AzureDownloadCountProcessor#evictCaches", observations).observe(() -> extensions.forEach(extension -> {
+            extension = entityManager.merge(extension);
+            cache.evictExtensionJsons(extension);
+            cache.evictLatestExtensionVersion(extension);
+        }));
     }
 
     public void updateSearchEntries(List<Extension> extensions) {
@@ -120,8 +116,6 @@ public void updateSearchEntries(List<Extension> extensions) {
     }
 
     public List<String> processedItems(List<String> blobNames) {
-        return Observation.createNotStarted("AzureDownloadCountProcessor#processedItems", observations).observe(() -> {
-            return repositories.findAllSucceededAzureDownloadCountProcessedItemsByNameIn(blobNames);
-        });
+        return Observation.createNotStarted("AzureDownloadCountProcessor#processedItems", observations).observe(() -> repositories.findAllSucceededAzureDownloadCountProcessedItemsByNameIn(blobNames));
     }
 }
diff --git a/server/src/main/java/org/eclipse/openvsx/storage/AzureDownloadCountService.java b/server/src/main/java/org/eclipse/openvsx/storage/AzureDownloadCountService.java
@@ -191,12 +191,11 @@ private Map<String, Integer> processBlobItem(String blobName) {
                             throw new RuntimeException(e);
                         }
                     })
-                    .filter(node -> {
-                        return isGetBlobOperation(node)
-                                && isStatusOk(node)
-                                && isExtensionPackageUri(node)
-                                && isNotOpenVSXUserAgent(node);
-                    }).map(node -> {
+                    .filter(node -> isGetBlobOperation(node)
+                            && isStatusOk(node)
+                            && isExtensionPackageUri(node)
+                            && isNotOpenVSXUserAgent(node))
+                    .map(node -> {
                         var uri = node.get("uri").asText();
                         var pathParams = uri.substring(storageServiceEndpoint.length()).split("/");
                         return Map.entry(pathParams, node.get("time").asText());

diff --git a/server/src/main/java/org/eclipse/openvsx/storage/GoogleCloudStorageService.java b/server/src/main/java/org/eclipse/openvsx/storage/GoogleCloudStorageService.java
@@ -219,10 +219,7 @@ public Path getCachedFile(FileResource resource) {
 
         var objectId = getObjectId(resource);
         var path = filesCacheKeyGenerator.generateCachedExtensionPath(resource);
-        FileUtil.writeSync(path, p -> {
-            getStorage().downloadTo(BlobId.of(bucketId, objectId), p);
-        });
-
+        FileUtil.writeSync(path, p -> getStorage().downloadTo(BlobId.of(bucketId, objectId), p));
         return path;
     }
 }
diff --git a/server/src/main/java/org/eclipse/openvsx/web/DocumentationConfig.java b/server/src/main/java/org/eclipse/openvsx/web/DocumentationConfig.java
@@ -79,30 +79,18 @@ public OpenApiCustomizer addRateLimitResponse() {
                         "X-Rate-Limit-Remaining", limitRemainingHeader
                 ));
 
-        return openApi -> {
-            openApi.getPaths().forEach((path, item) -> {
-                Stream.of(
-                    item.getGet(),
-                    item.getHead(),
-                    item.getPost(),
-                    item.getPut(),
-                    item.getDelete(),
-                    item.getOptions(),
-                    item.getTrace(),
-                    item.getPatch()
-                )
-                .filter(Objects::nonNull)
-                .forEach(operation -> {
-                    var responses = operation.getResponses();
-                    if(responses == null) {
-                        responses = new ApiResponses();
-                    }
+        return openApi -> openApi.getPaths()
+                .forEach((path, item) -> item.readOperations()
+                        .forEach(operation -> {
+                            var responses = operation.getResponses();
+                            if(responses == null) {
+                                responses = new ApiResponses();
+                            }
 
-                    responses.addApiResponse("429", response);
-                    operation.setResponses(responses);
-                });
-            });
-        };
+                            responses.addApiResponse("429", response);
+                            operation.setResponses(responses);
+                        })
+                );
     }
 
     @Bean