Skip to content

dbeaver/pro#10195 Refactor editor properties to always be strings #4595

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

Open
ShadelessFox wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

dbeaver/pro#10195 Refactor editor properties to always be strings #4595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...ndles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@ public String setResourceProperty(
@NotNull String projectId,
@NotNull String resourcePath,
@NotNull String propertyName,
@Nullable Object propertyValue
@Nullable String propertyValue
) throws DBException {
try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("resourcePropertyUpdate"))) {
validateResourcePath(resourcePath);
Expand All @@ -999,7 +999,7 @@ public String setResourceProperty(
public String setResourceProperties(
@NotNull String projectId,
@NotNull String resourcePath,
@NotNull Map<String, Object> properties
@NotNull Map<String, String> properties
) throws DBException {
try (var ignoredLock = lockController.lock(LockTarget.of(projectId), LockOptions.of("resourcePropertyUpdate"))) {
validateResourcePath(resourcePath);
Expand Down Expand Up @@ -1239,7 +1239,7 @@ private RMResource makeResourceFromPath(
if (readProperties) {
final BaseProjectImpl project = getWebProject(projectId, true);
final String resourcePath = getProjectRelativePath(projectId, path);
final Map<String, Object> properties = project.getResourceProperties(resourcePath);
final Map<String, String> properties = project.getResourceProperties(resourcePath);

if (properties != null && !properties.isEmpty()) {
resource.setProperties(new LinkedHashMap<>(properties));
Expand Down
4 changes: 2 additions & 2 deletions server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/DBWServiceRM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2024 DBeaver Corp and others
* Copyright (C) 2010-2026 DBeaver Corp and others
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -75,7 +75,7 @@ String setResourceProperty(
@NotNull @WebObjectId String projectId,
@NotNull String resourcePath,
@NotNull String propertyName,
@Nullable Object propertyValue) throws DBException;
@Nullable String propertyValue) throws DBException;

@WebProjectAction(
requireProjectPermissions = RMConstants.PERMISSION_PROJECT_RESOURCE_VIEW
Expand Down
2 changes: 1 addition & 1 deletion ...er/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/impl/WebServiceRM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public String setResourceProperty(@NotNull WebSession webSession,
@NotNull String projectId,
@NotNull String resourcePath,
@NotNull String propertyName,
@Nullable Object propertyValue
@Nullable String propertyValue
) throws DBException {
checkIsRmEnabled(webSession);
try {
Expand Down
Loading