Skip to content

Commit

Permalink
Merge pull request #1115 from amvanbaren/java-shadowing-vars
Browse files Browse the repository at this point in the history 
Local variables should not shadow class fields
  • Loading branch information
@amvanbaren
amvanbaren authored Feb 14, 2025
2 parents 839e34a + b2f19c1 commit 53ad2d7
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 59 deletions.
50 changes: 25 additions & 25 deletions server/src/main/java/org/eclipse/openvsx/ExtensionProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,11 +335,11 @@ public TempFile generateSha256Checksum(ExtensionVersion extVersion) throws IOExc
var sha256File = new TempFile("extension_", ".sha256");
Files.writeString(sha256File.getPath(), hash);

var sha256 = new FileResource();
sha256.setExtension(extVersion);
sha256.setName(NamingUtil.toFileFormat(extVersion, ".sha256"));
sha256.setType(FileResource.DOWNLOAD_SHA256);
sha256File.setResource(sha256);
var sha256Resource = new FileResource();
sha256Resource.setExtension(extVersion);
sha256Resource.setName(NamingUtil.toFileFormat(extVersion, ".sha256"));
sha256Resource.setType(FileResource.DOWNLOAD_SHA256);
sha256File.setResource(sha256Resource);
return sha256File;
}

Expand All @@ -349,11 +349,11 @@ protected TempFile getManifest(ExtensionVersion extVersion) throws IOException {
if (entryFile == null) {
throw new ErrorResultException(entryNotFoundMessage(PACKAGE_JSON));
}
var manifest = new FileResource();
manifest.setExtension(extVersion);
manifest.setName("package.json");
manifest.setType(FileResource.MANIFEST);
entryFile.setResource(manifest);
var manifestResource = new FileResource();
manifestResource.setExtension(extVersion);
manifestResource.setName("package.json");
manifestResource.setType(FileResource.MANIFEST);
entryFile.setResource(manifestResource);
return entryFile;
}

Expand Down Expand Up @@ -383,9 +383,9 @@ public TempFile getChangelog(ExtensionVersion extVersion) throws IOException {

public TempFile getLicense(ExtensionVersion extVersion) throws IOException {
readInputStream();
var license = new FileResource();
license.setExtension(extVersion);
license.setType(FileResource.LICENSE);
var licenseResource = new FileResource();
licenseResource.setExtension(extVersion);
licenseResource.setType(FileResource.LICENSE);

var assetPath = tryGetLicensePath();
if(StringUtils.isEmpty(assetPath)) {
Expand All @@ -399,8 +399,8 @@ public TempFile getLicense(ExtensionVersion extVersion) throws IOException {

var lastSegmentIndex = assetPath.lastIndexOf('/');
var lastSegment = assetPath.substring(lastSegmentIndex + 1);
license.setName(lastSegment);
entryFile.setResource(license);
licenseResource.setName(lastSegment);
entryFile.setResource(licenseResource);
return entryFile;
}

Expand Down Expand Up @@ -480,32 +480,32 @@ protected TempFile getIcon(ExtensionVersion extVersion) throws IOException {
throw new ErrorResultException(entryNotFoundMessage(iconPath));
}

var icon = new FileResource();
icon.setExtension(extVersion);
var iconResource = new FileResource();
iconResource.setExtension(extVersion);
var fileNameIndex = iconPath.lastIndexOf('/');
var iconName = fileNameIndex >= 0
? iconPath.substring(fileNameIndex + 1)
: iconPath;

icon.setName(iconName);
icon.setType(FileResource.ICON);
entryFile.setResource(icon);
iconResource.setName(iconName);
iconResource.setType(FileResource.ICON);
entryFile.setResource(iconResource);
return entryFile;
}

public TempFile getVsixManifest(ExtensionVersion extVersion) throws IOException {
readInputStream();
var vsixManifest = new FileResource();
vsixManifest.setExtension(extVersion);
vsixManifest.setName(VSIX_MANIFEST);
vsixManifest.setType(FileResource.VSIXMANIFEST);
var vsixManifestResource = new FileResource();
vsixManifestResource.setExtension(extVersion);
vsixManifestResource.setName(VSIX_MANIFEST);
vsixManifestResource.setType(FileResource.VSIXMANIFEST);

var entryFile = ArchiveUtil.readEntry(zipFile, VSIX_MANIFEST);
if(entryFile == null) {
throw new ErrorResultException(entryNotFoundMessage(VSIX_MANIFEST));
}

entryFile.setResource(vsixManifest);
entryFile.setResource(vsixManifestResource);
return entryFile;
}

Expand Down
29 changes: 15 additions & 14 deletions server/src/main/java/org/eclipse/openvsx/LocalRegistryService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ public NamespaceJson getNamespace(String namespaceName) {
throw new NotFoundException();
var json = new NamespaceJson();
json.setName(namespace.getName());
var extensions = new LinkedHashMap<String, String>();
var extensionsMap = new LinkedHashMap<String, String>();
var serverUrl = UrlUtil.getBaseUrl();
for (var name : repositories.findActiveExtensionNames(namespace)) {
String url = createApiUrl(serverUrl, "api", namespace.getName(), name);
extensions.put(name, url);
extensionsMap.put(name, url);
}
json.setExtensions(extensions);
json.setExtensions(extensionsMap);
json.setVerified(repositories.hasMemberships(namespace, NamespaceMembership.ROLE_OWNER));
json.setAccess(RESTRICTED_ACCESS);
return json;
Expand Down Expand Up @@ -333,9 +333,9 @@ public QueryResultJson query(QueryRequest request) {
var latestPreRelease = latestPreReleases.get(getLatestVersionKey(ev));
var reviewCount = reviewCounts.getOrDefault(ev.getExtension().getId(), 0L);
var preview = previewsByExtensionId.get(ev.getExtension().getId());
var versions = versionStrings.get(ev.getExtension().getId());
var extensionVersionStrings = versionStrings.get(ev.getExtension().getId());
var fileResources = fileResourcesByExtensionVersionId.getOrDefault(ev.getId(), Collections.emptyList());
return toExtensionVersionJson(ev, latest, latestPreRelease, reviewCount, preview, versions, targetPlatform, fileResources, membershipsByNamespaceId);
return toExtensionVersionJson(ev, latest, latestPreRelease, reviewCount, preview, extensionVersionStrings, targetPlatform, fileResources, membershipsByNamespaceId);
})
.toList());

Expand Down Expand Up @@ -441,9 +441,9 @@ public QueryResultJson queryV2(QueryRequestV2 request) {
var fileResources = fileResourcesByExtensionVersionId.getOrDefault(ev.getId(), Collections.emptyList());
var globalLatest = addAllVersions ? latestGlobalVersions.get(ev.getExtension().getId()) : null;
var globalLatestPreRelease = addAllVersions ? latestGlobalPreReleases.get(ev.getExtension().getId()) : null;
var versions = addAllVersions ? versionStrings.get(ev.getExtension().getId()) : null;
var extensionVersionStrings = addAllVersions ? versionStrings.get(ev.getExtension().getId()) : null;

return toExtensionVersionJsonV2(ev, latest, latestPreRelease, globalLatest, globalLatestPreRelease, reviewCount, preview, versions, targetPlatform, fileResources, membershipsByNamespaceId);
return toExtensionVersionJsonV2(ev, latest, latestPreRelease, globalLatest, globalLatestPreRelease, reviewCount, preview, extensionVersionStrings, targetPlatform, fileResources, membershipsByNamespaceId);
})
.toList());

Expand Down Expand Up @@ -753,13 +753,13 @@ private LinkedHashMap<Long, ExtensionVersion> getLatestVersions(SearchHits<Exten
.distinct()
.collect(Collectors.toList());

var versions = findLatestVersions(ids);
ids.removeAll(versions.keySet());
var latestVersions = findLatestVersions(ids);
ids.removeAll(latestVersions.keySet());
if(!ids.isEmpty()) {
search.removeSearchEntries(ids);
}

return versions;
return latestVersions;
}

private LinkedHashMap<Long, ExtensionVersion> findLatestVersions(Collection<Long> ids) {
Expand Down Expand Up @@ -1135,11 +1135,12 @@ public String getPublicKey(String publicId) {

@Override
public RegistryVersionJson getRegistryVersion() {
if (this.registryVersion == null || this.registryVersion.isEmpty()) {
if(StringUtils.isEmpty(registryVersion)) {
throw new NotFoundException();
}
var registryVersion = new RegistryVersionJson();
registryVersion.setVersion(this.registryVersion);
return registryVersion;

var json = new RegistryVersionJson();
json.setVersion(registryVersion);
return json;
}
}
4 changes: 2 additions & 2 deletions server/src/main/java/org/eclipse/openvsx/adapter/LocalVSCodeService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,11 +218,11 @@ public ExtensionQueryResult extensionQuery(ExtensionQueryParam param, int defaul
var extensionQueryResults = new ArrayList<ExtensionQueryResult.Extension>();
for(var extension : extensionsList) {
var latest = latestVersions.get(extension.getId());
var versions = extensionVersionsMap.getOrDefault(extension.getId(), Collections.emptyList()).stream()
var queryVersions = extensionVersionsMap.getOrDefault(extension.getId(), Collections.emptyList()).stream()
.map(extVer -> toQueryVersion(extVer, fileResources, flags))
.collect(Collectors.toList());

var queryExt = toQueryExtension(extension, latest, versions, flags);
var queryExt = toQueryExtension(extension, latest, queryVersions, flags);
extensionQueryResults.add(queryExt);
}

Expand Down
31 changes: 13 additions & 18 deletions server/src/main/java/org/eclipse/openvsx/entities/ExtensionVersion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,32 +208,27 @@ private List<ExtensionReferenceJson> toExtensionReferenceJson(List<String> exten
*/
public SearchEntryJson toSearchEntryJson() {
var entry = new SearchEntryJson();
var extension = this.getExtension();
entry.setName(extension.getName());
entry.setNamespace(extension.getNamespace().getName());
entry.setAverageRating(extension.getAverageRating());
entry.setReviewCount(extension.getReviewCount());
entry.setDownloadCount(extension.getDownloadCount());
var ext = this.getExtension();
entry.setName(ext.getName());
entry.setNamespace(ext.getNamespace().getName());
entry.setAverageRating(ext.getAverageRating());
entry.setReviewCount(ext.getReviewCount());
entry.setDownloadCount(ext.getDownloadCount());
entry.setVersion(this.getVersion());
entry.setTimestamp(TimeUtil.toUTCString(this.getTimestamp()));
entry.setDisplayName(this.getDisplayName());
entry.setDescription(this.getDescription());
entry.setDeprecated(extension.isDeprecated());
entry.setDeprecated(ext.isDeprecated());
return entry;
}

public Map<String, String> getEnginesMap() {
var engines = this.getEngines();
if (engines == null)
return null;
var result = Maps.<String, String>newLinkedHashMapWithExpectedSize(engines.size());
for (var engine : engines) {
var split = engine.split("@");
if (split.length == 2) {
result.put(split[0], split[1]);
}
}
return result;
var map = Optional.ofNullable(this.getEngines()).orElse(Collections.emptyList()).stream()
.map(engine -> engine.split("@"))
.filter(split -> split.length == 2)
.collect(Collectors.toMap(split -> split[0], split -> split[1], (a, b) -> a, Maps::newLinkedHashMap));

return !map.isEmpty() ? map : null;
}

public long getId() {
Expand Down

0 comments on commit 53ad2d7

Please sign in to comment.