Skip to content
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

Jump to bottom

dbeaver/dbeaver-vscode#19 map custom folder as project in vc code pro… #2963

Open
wants to merge 2 commits into
base: devel
Choose a base branch
from
Open

dbeaver/dbeaver-vscode#19 map custom folder as project in vc code pro… #2963

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
14ce2fc
dbeaver/dbeaver-vscode#19 map custom folder as project in vc code pro…
alexander-skoblikov Oct 3, 2024
196627e
Merge branch 'devel' into dbeaver/dbeaver-vscode#19-vscode-rm
alexander-skoblikov Oct 3, 2024
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 server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/BaseWebProjectImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.jkiss.dbeaver.model.rm.RMController;
import org.jkiss.dbeaver.model.rm.RMControllerProvider;
import org.jkiss.dbeaver.model.rm.RMProject;
import org.jkiss.dbeaver.model.rm.RMUtils;
import org.jkiss.utils.CommonUtils;
import org.jkiss.utils.Pair;

Expand All @@ -44,11 +43,12 @@ public BaseWebProjectImpl(
@NotNull DBPWorkspace workspace,
@NotNull RMController resourceController,
@NotNull SMSessionContext sessionContext,
@NotNull RMProject project
@NotNull RMProject project,
@NotNull Path path
) {
super(workspace, sessionContext);
this.resourceController = resourceController;
this.path = RMUtils.getProjectPath(project);
this.path = path;
this.project = project;
}

Expand Down
4 changes: 3 additions & 1 deletion server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebHeadlessSessionProjectImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import io.cloudbeaver.model.session.WebHeadlessSession;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.model.rm.RMProject;
import org.jkiss.dbeaver.model.rm.RMUtils;

public class WebHeadlessSessionProjectImpl extends WebProjectImpl {
public WebHeadlessSessionProjectImpl(
Expand All @@ -30,7 +31,8 @@ public WebHeadlessSessionProjectImpl(
session.getUserContext().getRmController(),
session.getSessionContext(),
project,
session.getUserContext().getPreferenceStore()
session.getUserContext().getPreferenceStore(),
RMUtils.getProjectPath(project)
);
}
}
8 changes: 6 additions & 2 deletions server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebProjectImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,22 @@
import org.jkiss.dbeaver.registry.rm.DataSourceRegistryRM;
import org.jkiss.dbeaver.runtime.DBWorkbench;

import java.nio.file.Path;

public abstract class WebProjectImpl extends BaseWebProjectImpl {
private static final Log log = Log.getLog(WebProjectImpl.class);
@NotNull
protected final DBPPreferenceStore preferenceStore;

public WebProjectImpl(
@NotNull DBPWorkspace workspace,
@NotNull RMController resourceController,
@NotNull SMSessionContext sessionContext,
@NotNull RMProject project,
@NotNull DBPPreferenceStore preferenceStore
@NotNull DBPPreferenceStore preferenceStore,
@NotNull Path path
) {
super(workspace, resourceController, sessionContext, project);
super(workspace, resourceController, sessionContext, project, path);
this.preferenceStore = preferenceStore;
}

Expand Down
21 changes: 20 additions & 1 deletion server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebSessionProjectImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@
import org.jkiss.dbeaver.model.app.DBPDataSourceRegistryCache;
import org.jkiss.dbeaver.model.navigator.DBNModel;
import org.jkiss.dbeaver.model.rm.RMProject;
import org.jkiss.dbeaver.model.rm.RMUtils;
import org.jkiss.dbeaver.model.websocket.event.WSEventType;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.runtime.jobs.DisconnectJob;

import java.nio.file.Path;
import java.util.*;
import java.util.stream.Collectors;

Expand All @@ -49,7 +51,24 @@ public WebSessionProjectImpl(
webSession.getRmController(),
webSession.getSessionContext(),
project,
webSession.getUserPreferenceStore()
webSession.getUserPreferenceStore(),
RMUtils.getProjectPath(project)
);
this.webSession = webSession;
}

public WebSessionProjectImpl(
@NotNull WebSession webSession,
@NotNull RMProject project,
@NotNull Path path
) {
super(
webSession.getWorkspace(),
webSession.getRmController(),
webSession.getSessionContext(),
project,
webSession.getUserPreferenceStore(),
path
);
this.webSession = webSession;
}
Expand Down
2 changes: 2 additions & 0 deletions server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebAppConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package io.cloudbeaver.model.app;

import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;

import java.util.Map;

Expand All @@ -28,6 +29,7 @@

boolean isAnonymousAccessEnabled();

@Nullable

Check warning on line 32 in server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebAppConfiguration.java

View check run for this annotation

Jenkins-CI-integration / CheckStyle Java Report

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebAppConfiguration.java#L32 

Missing a Javadoc comment.
<T> T getResourceQuota(String quotaId);

String getDefaultUserTeam();
Expand Down
Loading