Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ private String getSortOrder(int sortOrder) {
@Cacheable(value = CacheService.CACHE_LATEST_EXTENSION_VERSION_VSCODE)
public ExtensionQueryResult.Extension latest(String namespaceName, String extensionName) {
if (BuiltInExtensionUtil.isBuiltIn(namespaceName)) {
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, builtinExtensionMessage());
throw new NotFoundException();
}

var extension = repositories.findActiveExtension(extensionName, namespaceName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,13 @@ public CacheManager redisCacheManager(
)
.withCacheConfiguration(
CACHE_LATEST_EXTENSION_VERSIONS_BY_PLATFORM,
redisCacheConfig(new Jackson2JsonRedisSerializer<>(extensionVersionMapper, List.class), latestExtensionVersionsByPlatformTtl)
redisCacheConfig(
new Jackson2JsonRedisSerializer<>(
extensionVersionMapper,
extensionVersionMapper.getTypeFactory().constructParametricType(List.class, ExtensionVersion.class)
),
latestExtensionVersionsByPlatformTtl
)
)
.withCacheConfiguration(
CACHE_SITEMAP,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ public Object generate(Object target, Method method, Object... params) {
public String generate(Extension extension, boolean preReleases) {
var extensionName = extension.getName();
var namespaceName = extension.getNamespace().getName();
return NamingUtil.toFileFormat(namespaceName, extensionName, null, VersionAlias.LATEST) + ",pre-releases=" + preReleases;
return NamingUtil.toFileFormat(namespaceName, extensionName, VersionAlias.LATEST) + ",pre-releases=" + preReleases;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,17 @@ public static String toFileFormat(ExtensionVersion extVersion) {
return toFileFormat(namespace.getName(), extension.getName(), extVersion.getTargetPlatform(), extVersion.getVersion());
}

public static String toFileFormat(String namespace, String extension, String version) {
return toExtensionId(namespace, extension) + "-" + version;
}

public static String toFileFormat(String namespace, String extension, String targetPlatform, String version, String suffix) {
return toFileFormat(namespace, extension, targetPlatform, version) + suffix;
}

public static String toFileFormat(String namespace, String extension, String targetPlatform, String version) {
var name = toExtensionId(namespace, extension) + "-" + version;
if (targetPlatform != null && !TargetPlatform.isUniversal(targetPlatform)) {
if (!TargetPlatform.isUniversal(targetPlatform)) {
name += "@" + targetPlatform;
}

Expand Down
Loading