Skip to content

Commit 908666a

Browse files
committed
refactor to SettingsService in package settings
1 parent cab03ea commit 908666a

10 files changed

Lines changed: 20 additions & 23 deletions

File tree

server/src/main/java/org/eclipse/openvsx/RegistryAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import jakarta.servlet.http.HttpServletRequest;
2121
import org.apache.commons.lang3.StringUtils;
2222
import org.eclipse.openvsx.entities.SemanticVersion;
23-
import org.eclipse.openvsx.featureflag.MutatingOperation;
23+
import org.eclipse.openvsx.settings.MutatingOperation;
2424
import org.eclipse.openvsx.json.*;
2525
import org.eclipse.openvsx.search.ISearchService;
2626
import org.eclipse.openvsx.search.SortBy;

server/src/main/java/org/eclipse/openvsx/UserAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.eclipse.openvsx.accesstoken.AccessTokenService;
1414
import org.eclipse.openvsx.eclipse.EclipseService;
1515
import org.eclipse.openvsx.entities.*;
16-
import org.eclipse.openvsx.featureflag.MutatingOperation;
16+
import org.eclipse.openvsx.settings.MutatingOperation;
1717
import org.eclipse.openvsx.json.*;
1818
import org.eclipse.openvsx.repositories.ExtensionScanRepository;
1919
import org.eclipse.openvsx.repositories.RepositoryService;

server/src/main/java/org/eclipse/openvsx/adapter/VSCodeAPI.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@
3535
import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
3636

3737
import java.util.List;
38-
import java.util.Optional;
3938
import java.util.concurrent.TimeUnit;
4039

41-
import static org.eclipse.openvsx.adapter.ExtensionQueryParam.*;
4240
import static org.eclipse.openvsx.adapter.ExtensionQueryResult.ExtensionFile.*;
4341
import static org.eclipse.openvsx.util.TargetPlatform.*;
4442

server/src/main/java/org/eclipse/openvsx/admin/AdminAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.eclipse.openvsx.entities.AdminStatistics;
2222
import org.eclipse.openvsx.entities.NamespaceMembership;
2323
import org.eclipse.openvsx.entities.PersistedLog;
24-
import org.eclipse.openvsx.featureflag.MutatingOperation;
24+
import org.eclipse.openvsx.settings.MutatingOperation;
2525
import org.eclipse.openvsx.json.AdminStatisticsJson;
2626
import org.eclipse.openvsx.json.ChangeNamespaceJson;
2727
import org.eclipse.openvsx.json.ExtensionJson;

server/src/main/java/org/eclipse/openvsx/admin/FileDecisionAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import io.swagger.v3.oas.annotations.media.Schema;
1919
import io.swagger.v3.oas.annotations.responses.ApiResponse;
2020
import org.eclipse.openvsx.entities.FileDecision;
21-
import org.eclipse.openvsx.featureflag.MutatingOperation;
21+
import org.eclipse.openvsx.settings.MutatingOperation;
2222
import org.eclipse.openvsx.json.*;
2323
import org.eclipse.openvsx.repositories.RepositoryService;
2424
import org.eclipse.openvsx.util.ErrorResultException;

server/src/main/java/org/eclipse/openvsx/admin/RateLimitAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
package org.eclipse.openvsx.admin;
1414

1515
import org.eclipse.openvsx.entities.*;
16-
import org.eclipse.openvsx.featureflag.MutatingOperation;
16+
import org.eclipse.openvsx.settings.MutatingOperation;
1717
import org.eclipse.openvsx.json.*;
1818
import org.eclipse.openvsx.ratelimit.CustomerService;
1919
import org.eclipse.openvsx.ratelimit.cache.RateLimitCacheService;

server/src/main/java/org/eclipse/openvsx/admin/ScanAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import jakarta.annotation.Nonnull;
2424
import jakarta.annotation.Nullable;
2525
import org.eclipse.openvsx.entities.*;
26-
import org.eclipse.openvsx.featureflag.MutatingOperation;
26+
import org.eclipse.openvsx.settings.MutatingOperation;
2727
import org.eclipse.openvsx.json.*;
2828
import org.eclipse.openvsx.repositories.RepositoryService;
2929
import org.eclipse.openvsx.storage.StorageUtilService;

server/src/main/java/org/eclipse/openvsx/featureflag/MutatingOperation.java renamed to server/src/main/java/org/eclipse/openvsx/settings/MutatingOperation.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
*
1111
* SPDX-License-Identifier: EPL-2.0
1212
*****************************************************************************/
13-
package org.eclipse.openvsx.featureflag;
13+
package org.eclipse.openvsx.settings;
1414

1515
import java.lang.annotation.*;
1616

17+
/**
18+
* A marker annotation to indicate an operation that mutates the DB.
19+
*/
1720
@Target(ElementType.METHOD)
1821
@Retention(RetentionPolicy.RUNTIME)
1922
@Documented

server/src/main/java/org/eclipse/openvsx/featureflag/ReadOnlyEndpointAspect.java renamed to server/src/main/java/org/eclipse/openvsx/settings/ReadOnlyEndpointAspect.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* SPDX-License-Identifier: EPL-2.0
1212
*****************************************************************************/
13-
package org.eclipse.openvsx.featureflag;
13+
package org.eclipse.openvsx.settings;
1414

1515
import org.aspectj.lang.ProceedingJoinPoint;
1616
import org.aspectj.lang.annotation.Around;
@@ -23,21 +23,17 @@
2323
@Component
2424
public class ReadOnlyEndpointAspect {
2525

26-
private final FeatureFlagService featureFlagService;
26+
private final SettingsService settingsService;
2727

28-
public ReadOnlyEndpointAspect(FeatureFlagService featureFlagService) {
29-
this.featureFlagService = featureFlagService;
28+
public ReadOnlyEndpointAspect(SettingsService settingsService) {
29+
this.settingsService = settingsService;
3030
}
3131

3232
@Around("(execution(org.springframework.http.ResponseEntity org.eclipse.openvsx.RegistryAPI.*(..)) ||" +
33-
" execution(org.springframework.http.ResponseEntity org.eclipse.openvsx.admin.AdminAPI.*(..)) ||" +
34-
" execution(org.springframework.http.ResponseEntity org.eclipse.openvsx.admin.FileDecisionAPI.*(..)) ||" +
35-
" execution(org.springframework.http.ResponseEntity org.eclipse.openvsx.admin.RateLimitAPI.*(..)) ||" +
36-
" execution(org.springframework.http.ResponseEntity org.eclipse.openvsx.admin.ScanAPI.*(..)) ||" +
37-
" execution(org.springframework.http.ResponseEntity org.eclipse.openvsx.UserAPI.*(..))) &&" +
38-
"@annotation(MutatingOperation)")
33+
" execution(org.springframework.http.ResponseEntity org.eclipse.openvsx.UserAPI.*(..)) ||" +
34+
" execution(org.springframework.http.ResponseEntity org.eclipse.openvsx.admin.*API.*(..))) && @annotation(MutatingOperation)")
3935
public Object handleMutatingEndpoint(ProceedingJoinPoint joinPoint) throws Throwable {
40-
if (featureFlagService.isRegistryReadOnly()) {
36+
if (settingsService.isRegistryReadOnly()) {
4137
return ResponseEntity.status(409).body(ResultJson.error("Registry is in read-only mode."));
4238
} else {
4339
return joinPoint.proceed();

server/src/main/java/org/eclipse/openvsx/featureflag/FeatureFlagService.java renamed to server/src/main/java/org/eclipse/openvsx/settings/SettingsService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
*
1111
* SPDX-License-Identifier: EPL-2.0
1212
*****************************************************************************/
13-
package org.eclipse.openvsx.featureflag;
13+
package org.eclipse.openvsx.settings;
1414

1515
import org.springframework.stereotype.Service;
1616

1717
@Service
18-
public class FeatureFlagService {
18+
public class SettingsService {
1919

20-
public FeatureFlagService() {}
20+
public SettingsService() {}
2121

2222
public boolean isRegistryReadOnly() {
2323
// TODO: implement this

0 commit comments

Comments
 (0)