Skip to content

Do not use properties duplicated across #2004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
netomi merged 2 commits into from
Jul 28, 2026
Merged

Do not use properties duplicated across #2004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4116d64
Do not use properties duplicated across
cstamas Jul 28, 2026
278289a
reformat
cstamas Jul 28, 2026
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
11 changes: 6 additions & 5 deletions server/src/main/java/org/eclipse/openvsx/LocalRegistryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.eclipse.openvsx.search.SearchUtilService;
import org.eclipse.openvsx.search.SimilarityCheckService;
import org.eclipse.openvsx.storage.StorageUtilService;
import org.eclipse.openvsx.trustedpublishing.TrustedPublishingConfig;
import org.eclipse.openvsx.util.ErrorResultException;
import org.eclipse.openvsx.util.ExtensionId;
import org.eclipse.openvsx.util.NamingUtil;
Expand Down Expand Up @@ -78,6 +79,7 @@ public class LocalRegistryService implements IExtensionRegistry {
private final ExtensionVersionIntegrityService integrityService;
private final SimilarityCheckService similarityCheckService;
private final PublishingConfig publishingConfig;
private final TrustedPublishingConfig trustedPublishingConfig;

public LocalRegistryService(
EntityManager entityManager,
Expand All @@ -93,7 +95,8 @@ public LocalRegistryService(
CacheService cache,
ExtensionVersionIntegrityService integrityService,
@Nullable SimilarityCheckService similarityCheckService,
PublishingConfig publishingConfig
PublishingConfig publishingConfig,
TrustedPublishingConfig trustedPublishingConfig
) {
this.entityManager = entityManager;
this.repositories = repositories;
Expand All @@ -109,6 +112,7 @@ public LocalRegistryService(
this.integrityService = integrityService;
this.similarityCheckService = similarityCheckService;
this.publishingConfig = publishingConfig;
this.trustedPublishingConfig = trustedPublishingConfig;
}

@Value("${ovsx.webui.url:}")
Expand All @@ -117,9 +121,6 @@ public LocalRegistryService(
@Value("${ovsx.registry.version:}")
String registryVersion;

@Value("${ovsx.trusted-publishing.enabled:false}")
boolean trustedPublishingEnabled;

@Override
public NamespaceJson getNamespace(String namespaceName) {
return getNamespace(namespaceName, false);
Expand Down Expand Up @@ -1326,7 +1327,7 @@ public RegistryVersionJson getRegistryVersion() {
var json = new RegistryVersionJson();
json.setVersion(registryVersion);
json.setMaxExtensionSize(publishingConfig.getMaxContentSize());
json.setTrustedPublishingEnabled(trustedPublishingEnabled);
json.setTrustedPublishingEnabled(trustedPublishingConfig.isEnabled());
return json;
}
}
4 changes: 3 additions & 1 deletion server/src/test/java/org/eclipse/openvsx/LocalRegistryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.eclipse.openvsx.search.SearchUtilService;
import org.eclipse.openvsx.search.SimilarityCheckService;
import org.eclipse.openvsx.storage.StorageUtilService;
import org.eclipse.openvsx.trustedpublishing.TrustedPublishingConfig;
import org.eclipse.openvsx.util.ErrorResultException;
import org.eclipse.openvsx.util.VersionService;

Expand Down Expand Up @@ -107,7 +108,8 @@ void setUp() {
cacheService,
integrityService,
similarityCheckService,
new PublishingConfig());
new PublishingConfig(),
new TrustedPublishingConfig());

doNothing().when(eclipse).checkPublisherAgreement(any());
}
Expand Down
12 changes: 10 additions & 2 deletions server/src/test/java/org/eclipse/openvsx/RegistryAPITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
import org.eclipse.openvsx.security.SecurityConfig;
import org.eclipse.openvsx.storage.*;
import org.eclipse.openvsx.storage.log.DownloadCountService;
import org.eclipse.openvsx.trustedpublishing.TrustedPublishingConfig;
import org.eclipse.openvsx.util.LogService;
import org.eclipse.openvsx.util.TargetPlatform;
import org.eclipse.openvsx.util.VersionAlias;
Expand Down Expand Up @@ -2976,7 +2977,8 @@ LocalRegistryService localRegistryService(
CacheService cache,
ExtensionVersionIntegrityService integrityService,
SimilarityCheckService similarityCheckService,
PublishingConfig publishingConfig
PublishingConfig publishingConfig,
TrustedPublishingConfig trustedPublishingConfig
) {
return new LocalRegistryService(
entityManager,
Expand All @@ -2992,14 +2994,20 @@ LocalRegistryService localRegistryService(
cache,
integrityService,
similarityCheckService,
publishingConfig);
publishingConfig,
trustedPublishingConfig);
}

@Bean
PublishingConfig publishingConfig() {
return new PublishingConfig();
}

@Bean
TrustedPublishingConfig trustedPublishingConfig() {
return new TrustedPublishingConfig();
}

@Bean
PublishExtensionVersionHandler publishExtensionVersionHandler(
PublishingConfig publishingConfig,
Expand Down
4 changes: 3 additions & 1 deletion server/src/test/java/org/eclipse/openvsx/UserAPITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import org.eclipse.openvsx.security.OAuth2UserServices;
import org.eclipse.openvsx.security.SecurityConfig;
import org.eclipse.openvsx.storage.StorageUtilService;
import org.eclipse.openvsx.trustedpublishing.TrustedPublishingConfig;
import org.eclipse.openvsx.util.LogService;
import org.eclipse.openvsx.util.TargetPlatform;
import org.eclipse.openvsx.util.TargetPlatformVersion;
Expand Down Expand Up @@ -1133,7 +1134,8 @@ LocalRegistryService localRegistryService(
cache,
integrityService,
similarityCheckService,
new PublishingConfig());
new PublishingConfig(),
new TrustedPublishingConfig());
}

@Bean
Expand Down
4 changes: 3 additions & 1 deletion server/src/test/java/org/eclipse/openvsx/admin/AdminAPITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
import org.eclipse.openvsx.storage.LocalStorageService;
import org.eclipse.openvsx.storage.StorageUtilService;
import org.eclipse.openvsx.storage.log.DownloadCountService;
import org.eclipse.openvsx.trustedpublishing.TrustedPublishingConfig;
import org.eclipse.openvsx.util.LogService;
import org.eclipse.openvsx.util.TargetPlatform;
import org.eclipse.openvsx.util.TargetPlatformVersion;
Expand Down Expand Up @@ -2295,7 +2296,8 @@ LocalRegistryService localRegistryService(
cache,
integrityService,
similarityCheckService,
new PublishingConfig());
new PublishingConfig(),
new TrustedPublishingConfig());
}

@Bean
Expand Down