Skip to content

Commit 3bbb6a8

Browse files
amvanbarenamvanbaren
authored
Merge pull request #1102 from amvanbaren/remove-unused-queries
Remove unused queries
2 parents 0d15d97 + 59e5ca4 commit 3bbb6a8

File tree

8 files changed

+0
-70
lines changed

8 files changed

+0
-70
lines changed

‎server/src/main/java/org/eclipse/openvsx/repositories/ExtensionRepository.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121

2222
public interface ExtensionRepository extends Repository<Extension, Long> {
2323

24-
Streamable<Extension> findByNameIgnoreCase(String name);
25-
2624
Streamable<Extension> findByNamespace(Namespace namespace);
2725

2826
Streamable<Extension> findByNamespaceAndActiveTrueOrderByNameAsc(Namespace namespace);
@@ -31,8 +29,6 @@ public interface ExtensionRepository extends Repository<Extension, Long> {
3129

3230
Extension findByNameIgnoreCaseAndNamespaceNameIgnoreCase(String name, String namespace);
3331

34-
Extension findByPublicId(String publicId);
35-
3632
Streamable<Extension> findByActiveTrue();
3733

3834
Streamable<Extension> findByIdIn(Collection<Long> extensionIds);

‎server/src/main/java/org/eclipse/openvsx/repositories/ExtensionVersionJooqRepository.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -358,22 +358,6 @@ public Page<ExtensionVersion> findActiveVersions(QueryRequest request) {
358358
return new PageImpl<>(content, PageRequest.of(request.offset() / request.size(), request.size()), total);
359359
}
360360

361-
public ExtensionVersion findActiveByVersionAndExtensionNameAndNamespaceName(String version, String extensionName, String namespaceName) {
362-
var query = findAllActive();
363-
query.addConditions(
364-
EXTENSION_VERSION.VERSION.eq(version),
365-
EXTENSION.NAME.equalIgnoreCase(extensionName),
366-
NAMESPACE.NAME.equalIgnoreCase(namespaceName)
367-
);
368-
query.addOrderBy(
369-
EXTENSION_VERSION.UNIVERSAL_TARGET_PLATFORM.desc(),
370-
EXTENSION_VERSION.TARGET_PLATFORM.asc()
371-
);
372-
query.addLimit(1);
373-
var results = fetch(query);
374-
return !results.isEmpty() ? results.get(0) : null;
375-
}
376-
377361
public List<ExtensionVersion> findAllActiveByExtensionName(String targetPlatform, String extensionName) {
378362
var query = findAllActive();
379363
query.addConditions(EXTENSION.NAME.equalIgnoreCase(extensionName));

‎server/src/main/java/org/eclipse/openvsx/repositories/ExtensionVersionRepository.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ public interface ExtensionVersionRepository extends Repository<ExtensionVersion,
2525

2626
Streamable<ExtensionVersion> findByExtensionAndActiveTrue(Extension extension);
2727

28-
Streamable<ExtensionVersion> findByVersionAndExtension(String version, Extension extension);
29-
3028
ExtensionVersion findByVersionAndTargetPlatformAndExtension(String version, String targetPlatform, Extension extension);
3129

3230
ExtensionVersion findByVersionAndTargetPlatformAndExtensionNameIgnoreCaseAndExtensionNamespaceNameIgnoreCase(String version, String targetPlatform, String extensionName, String namespace);

‎server/src/main/java/org/eclipse/openvsx/repositories/FileResourceJooqRepository.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,6 @@ public FileResource findByType(String namespace, String extension, String target
9696
return query.fetchOne(this::mapFindByQueryResult);
9797
}
9898

99-
public FileResource findByTypeAndName(String namespace, String extension, String targetPlatform, String version, String type, String name) {
100-
var onlyPreRelease = VersionAlias.PRE_RELEASE.equals(version);
101-
var query = findByQuery(namespace, extension, version, targetPlatform, onlyPreRelease);
102-
query.addConditions(
103-
FILE_RESOURCE.TYPE.eq(type),
104-
FILE_RESOURCE.NAME.equalIgnoreCase(name)
105-
);
106-
return query.fetchOne(this::mapFindByQueryResult);
107-
}
108-
10999
private SelectQuery<Record> findByQuery(
110100
String namespace,
111101
String extension,

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,6 @@ public Extension findExtension(String name, String namespace) {
134134
return extensionRepo.findByNameIgnoreCaseAndNamespaceNameIgnoreCase(name, namespace);
135135
}
136136

137-
public Extension findExtensionByPublicId(String publicId) {
138-
return extensionRepo.findByPublicId(publicId);
139-
}
140-
141137
public Streamable<Extension> findActiveExtensions(Namespace namespace) {
142138
return extensionRepo.findByNamespaceAndActiveTrueOrderByNameAsc(namespace);
143139
}
@@ -150,10 +146,6 @@ public Streamable<Extension> findExtensions(Namespace namespace) {
150146
return extensionRepo.findByNamespace(namespace);
151147
}
152148

153-
public Streamable<Extension> findExtensions(String name) {
154-
return extensionRepo.findByNameIgnoreCase(name);
155-
}
156-
157149
public Streamable<Extension> findAllActiveExtensions() {
158150
return extensionRepo.findByActiveTrue();
159151
}
@@ -182,10 +174,6 @@ public Streamable<ExtensionVersion> findVersions(Extension extension) {
182174
return extensionVersionRepo.findByExtension(extension);
183175
}
184176

185-
public Streamable<ExtensionVersion> findVersions(String version, Extension extension) {
186-
return extensionVersionRepo.findByVersionAndExtension(version, extension);
187-
}
188-
189177
public Streamable<ExtensionVersion> findActiveVersions(Extension extension) {
190178
return extensionVersionRepo.findByExtensionAndActiveTrue(extension);
191179
}
@@ -254,10 +242,6 @@ public FileResource findFileByName(String namespace, String extension, String ta
254242
return fileResourceJooqRepo.findByName(namespace, extension, targetPlatform, version, name);
255243
}
256244

257-
public FileResource findFileByTypeAndName(String namespace, String extension, String targetPlatform, String version, String type, String name) {
258-
return fileResourceJooqRepo.findByTypeAndName(namespace, extension, targetPlatform, version, type, name);
259-
}
260-
261245
public Streamable<FileResource> findDownloadsByStorageTypeAndName(String storageType, Collection<String> names) {
262246
return fileResourceRepo.findByTypeAndStorageTypeAndNameIgnoreCaseIn(DOWNLOAD, storageType, names);
263247
}
@@ -398,10 +382,6 @@ public List<ExtensionVersion> findActiveExtensionVersions(Collection<Long> exten
398382
return extensionVersionJooqRepo.findAllActiveByExtensionIdAndTargetPlatform(extensionIds, targetPlatform);
399383
}
400384

401-
public ExtensionVersion findActiveExtensionVersion(String version, String extensionName, String namespaceName) {
402-
return extensionVersionJooqRepo.findActiveByVersionAndExtensionNameAndNamespaceName(version, extensionName, namespaceName);
403-
}
404-
405385
public List<FileResource> findFileResourcesByExtensionVersionIdAndType(Collection<Long> extensionVersionIds, Collection<String> types) {
406386
return fileResourceJooqRepo.findAll(extensionVersionIds, types);
407387
}
@@ -462,10 +442,6 @@ public Streamable<ExtensionVersion> findTargetPlatformVersions(String version, S
462442
return extensionVersionRepo.findByVersionAndExtensionNameIgnoreCaseAndExtensionNamespaceNameIgnoreCase(version, extensionName, namespaceName);
463443
}
464444

465-
public void deleteFileResources(ExtensionVersion extVersion, String type) {
466-
fileResourceRepo.deleteByExtensionAndType(extVersion, type);
467-
}
468-
469445
public int countVersions(Extension extension) {
470446
return extensionVersionRepo.countByExtension(extension);
471447
}

‎server/src/test/java/org/eclipse/openvsx/RegistryAPITest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2017,10 +2017,6 @@ private ExtensionVersion mockExtension(String targetPlatform, boolean withSignat
20172017
.thenReturn(0L);
20182018
Mockito.when(repositories.findNamespace("foo"))
20192019
.thenReturn(namespace);
2020-
Mockito.when(repositories.findExtensions("bar"))
2021-
.thenReturn(Streamable.of(extension));
2022-
Mockito.when(repositories.findExtensionByPublicId("5678"))
2023-
.thenReturn(extension);
20242020

20252021
var download = new FileResource();
20262022
download.setExtension(extVersion);
@@ -2242,8 +2238,6 @@ private void mockForPublish(String mode) {
22422238
.thenReturn(Streamable.empty());
22432239
Mockito.when(repositories.findFilesByType(anyCollection(), anyCollection()))
22442240
.thenReturn(Collections.emptyList());
2245-
Mockito.when(repositories.findVersions(eq("1.0.0"), any(Extension.class)))
2246-
.thenReturn(Streamable.empty());
22472241
if (mode.equals("owner")) {
22482242
var ownerMem = new NamespaceMembership();
22492243
ownerMem.setUser(token.getUser());

‎server/src/test/java/org/eclipse/openvsx/adapter/VSCodeAPITest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -717,8 +717,6 @@ private ExtensionVersion mockExtensionVersion(String targetPlatform) throws Json
717717
extVersion.setEngines(Lists.newArrayList("vscode@^1.31.0"));
718718
extVersion.setDependencies(Lists.newArrayList());
719719
extVersion.setBundledExtensions(Lists.newArrayList());
720-
Mockito.when(repositories.findExtensionByPublicId("test-1"))
721-
.thenReturn(extension);
722720
Mockito.when(repositories.findExtension("vscode-yaml", "redhat"))
723721
.thenReturn(extension);
724722
Mockito.when(repositories.findVersion("0.5.2", targetPlatform, "vscode-yaml", "redhat"))

‎server/src/test/java/org/eclipse/openvsx/repositories/RepositoryServiceSmokeTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,7 @@ void testExecuteQueries() {
110110
() -> repositories.findDownloadsByStorageTypeAndName("storageType", STRING_LIST),
111111
() -> repositories.findExtension("name", namespace),
112112
() -> repositories.findExtension("name", "namespace"),
113-
() -> repositories.findExtensionByPublicId("publicId"),
114113
() -> repositories.findExtensions(namespace),
115-
() -> repositories.findExtensions("name"),
116114
() -> repositories.findFileByType(extVersion, "type"),
117115
() -> repositories.findFiles(extVersion),
118116
() -> repositories.findFilesByStorageType("storageType"),
@@ -128,7 +126,6 @@ void testExecuteQueries() {
128126
() -> repositories.findVersion("version", "targetPlatform", extension),
129127
() -> repositories.findVersion("version", "targetPlatform", "extensionName", "namespace"),
130128
() -> repositories.findVersions(extension),
131-
() -> repositories.findVersions("version", extension),
132129
() -> repositories.findVersionsByAccessToken(personalAccessToken, true),
133130
() -> repositories.getMaxExtensionDownloadCount(),
134131
() -> repositories.getOldestExtensionTimestamp(),
@@ -137,7 +134,6 @@ void testExecuteQueries() {
137134
() -> repositories.findFilesByType(List.of(extVersion), STRING_LIST),
138135
() -> repositories.countVersions(extension),
139136
() -> repositories.topMostDownloadedExtensions(1),
140-
() -> repositories.deleteFileResources(extVersion, "download"),
141137
() -> repositories.countActiveAccessTokens(userData),
142138
() -> repositories.findNotMigratedPreReleases(),
143139
() -> repositories.findNotMigratedRenamedDownloads(),
@@ -202,10 +198,8 @@ void testExecuteQueries() {
202198
() -> repositories.deleteFiles(extVersion),
203199
() -> repositories.findExtensionTargetPlatforms(extension),
204200
() -> repositories.deactivateKeyPairs(),
205-
() -> repositories.findActiveExtensionVersion("version", "extensionName", "namespaceName"),
206201
() -> repositories.findActiveAccessTokens(userData),
207202
() -> repositories.isAdminToken("tokenValue"),
208-
() -> repositories.findFileByTypeAndName("namespaceName", "extensionName", "targetPlatform", "version", "type", "name"),
209203
() -> repositories.findLatestVersions(List.of(1L)),
210204
() -> repositories.hasSameVersion(extVersion),
211205
() -> repositories.hasActiveReview(extension, userData),

0 commit comments

Comments
 (0)