Merge pull request #590 from amvanbaren/fix=getfile-multiple-results

Fix getFile duplicates
eclipse · Nov 10, 2022 · 95d53c3 · 95d53c3
2 parents 464d6a4 + 89a4c63
commit 95d53c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/server/src/main/java/org/eclipse/openvsx/repositories/FileResourceRepository.java b/server/src/main/java/org/eclipse/openvsx/repositories/FileResourceRepository.java
@@ -23,7 +23,7 @@ public interface FileResourceRepository extends Repository<FileResource, Long> {
 
     Streamable<FileResource> findByStorageType(String storageType);
 
-    FileResource findByExtensionAndNameIgnoreCase(ExtensionVersion extVersion, String name);
+    FileResource findFirstByExtensionAndNameIgnoreCaseOrderByType(ExtensionVersion extVersion, String name);
 
     FileResource findByExtensionAndType(ExtensionVersion extVersion, String type);
 

diff --git a/server/src/main/java/org/eclipse/openvsx/repositories/RepositoryService.java b/server/src/main/java/org/eclipse/openvsx/repositories/RepositoryService.java
@@ -165,7 +165,7 @@ public Streamable<FileResource> findFilesByStorageType(String storageType) {
     }
 
     public FileResource findFileByName(ExtensionVersion extVersion, String name) {
-        return fileResourceRepo.findByExtensionAndNameIgnoreCase(extVersion, name);
+        return fileResourceRepo.findFirstByExtensionAndNameIgnoreCaseOrderByType(extVersion, name);
     }
 
     public FileResource findFileByTypeAndName(ExtensionVersion extVersion, String type, String name) {