Merge pull request #1181 from amvanbaren/bugfix/storage-local-usage

Always enqueue RemoveFileJobRequest

Author: amvanbaren

server/src/main/java/org/eclipse/openvsx/migration/GenerateKeyPairJobRequestHandler.java

@@ -20,7 +20,6 @@
 import org.springframework.stereotype.Component;
 
 import static org.eclipse.openvsx.entities.FileResource.DOWNLOAD_SIG;
-import static org.eclipse.openvsx.entities.FileResource.STORAGE_LOCAL;
 import static org.eclipse.openvsx.entities.SignatureKeyPair.*;
 
 @Component
@@ -85,8 +84,6 @@ private void enqueueCreateSignatureJob(ExtensionVersion extVersion) {
     }
 
     private void enqueueDeleteSignatureJob(FileResource resource) {
-        if(!resource.getStorageType().equals(STORAGE_LOCAL)) {
-            scheduler.enqueue(new RemoveFileJobRequest(resource));
-        }
+        scheduler.enqueue(new RemoveFileJobRequest(resource));
     }
 }

server/src/main/java/org/eclipse/openvsx/repositories/FileResourceRepository.java

@@ -29,11 +29,9 @@ public interface FileResourceRepository extends Repository<FileResource, Long> {
 
     Streamable<FileResource> findByTypeAndStorageTypeAndNameIgnoreCaseIn(String type, String storageType, Collection<String> names);
 
-    void deleteByExtensionAndType(ExtensionVersion extVersion, String type);
-
     void deleteByType(String type);
 
     Streamable<FileResource> findByType(String type);
 
-    Streamable<FileResource> findByExtensionAndStorageTypeNot(ExtensionVersion extVersion, String storageType);
+    Streamable<FileResource> findByExtension(ExtensionVersion extVersion);
 }

server/src/main/java/org/eclipse/openvsx/repositories/RepositoryService.java

@@ -227,7 +227,7 @@ public LocalDateTime getOldestExtensionTimestamp() {
     }
 
     public Streamable<FileResource> findFiles(ExtensionVersion extVersion) {
-        return fileResourceRepo.findByExtensionAndStorageTypeNot(extVersion, STORAGE_LOCAL);
+        return fileResourceRepo.findByExtension(extVersion);
     }
 
     public void deleteFiles(ExtensionVersion extVersion) {