opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-19 10:36:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

dbeaver/pro#9222 Annotations and permissions

Browse Source
This commit is contained in:
Serge Rider
2026-07-01 09:48:04 +02:00
parent 475c8129fc
commit b5858637d6
6 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/service/DBWServiceBindingServlet.java
+2 -2
View File
@@ -1,6 +1,6 @@
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2025 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.
@@ -30,7 +30,7 @@ public interface DBWServiceBindingServlet<APPLICATION extends ServletApplication
return true;
}
void addServlets(APPLICATION application, DBWServletContext servletContext) throws DBException;
void addServlets(@NotNull APPLICATION application, @NotNull DBWServletContext servletContext) throws DBException;
@NotNull
default List<String> getExcludedServletPaths(@NotNull APPLICATION application) {
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java
+1 -1
View File
@@ -350,7 +350,7 @@ public class WebServiceBindingSQL extends WebServiceBindingBase<DBWServiceSQL>
}
@Override
public void addServlets(ServletApplication application, DBWServletContext servletContext) throws DBException {
public void addServlets(@NotNull ServletApplication application, @NotNull DBWServletContext servletContext) throws DBException {
servletContext.addServlet(
"sqlResultValueViewer",
new WebSQLResultServlet(application, getServiceImpl()),
server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/WebServiceBindingAdmin.java
+3 -2
View File
@@ -1,6 +1,6 @@
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2025 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.
@@ -25,6 +25,7 @@ import io.cloudbeaver.service.DBWServletContext;
import io.cloudbeaver.service.WebServiceBindingBase;
import io.cloudbeaver.service.admin.impl.WebAdminLogsServlet;
import io.cloudbeaver.service.admin.impl.WebServiceAdmin;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.DBException;
import org.jkiss.utils.CommonUtils;
@@ -205,7 +206,7 @@ public class WebServiceBindingAdmin extends WebServiceBindingBase<DBWServiceAdmi
}
@Override
public void addServlets(CBApplication application, DBWServletContext servletContext) throws DBException {
public void addServlets(@NotNull CBApplication application, @NotNull DBWServletContext servletContext) throws DBException {
if(!application.isMultiuser()) {
return;
}
server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/DBWServiceDataTransfer.java
+2 -2
View File
@@ -59,7 +59,7 @@ public interface DBWServiceDataTransfer extends DBWService {
) throws DBWebException;
@NotNull
@WebAction
@WebAction(requireGlobalPermissions = RMConstants.PERMISSION_DATA_EDITOR_IMPORT)
WebAsyncTaskInfo asyncImportDataContainer(
@NotNull String processorId,
@NotNull Path path,
@@ -79,7 +79,7 @@ public interface DBWServiceDataTransfer extends DBWService {
* after data transfer.
*/
@NotNull
@WebAction
@WebAction(requireGlobalPermissions = RMConstants.PERMISSION_DATA_EDITOR_IMPORT)
@Deprecated
Boolean dataTransferRemoveDataFile(@NotNull WebSession session, @NotNull String dataFileId) throws DBWebException;
server/bundles/io.cloudbeaver.service.data.transfer/src/io/cloudbeaver/service/data/transfer/WebServiceBindingDataTransfer.java
+7 -6
View File
@@ -1,6 +1,6 @@
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2025 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.
@@ -26,12 +26,13 @@ import io.cloudbeaver.service.data.transfer.impl.WebDataTransferParameters;
import io.cloudbeaver.service.data.transfer.impl.WebDataTransferServlet;
import io.cloudbeaver.service.data.transfer.impl.WebServiceDataTransfer;
import io.cloudbeaver.service.sql.WebServiceBindingSQL;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.DBException;
/**
* Web service implementation
*/
public class WebServiceBindingDataTransfer extends WebServiceBindingBase<DBWServiceDataTransfer> implements DBWServiceBindingServlet<CBApplication> {
public class WebServiceBindingDataTransfer extends WebServiceBindingBase<DBWServiceDataTransfer> implements DBWServiceBindingServlet<CBApplication<?>> {
public WebServiceBindingDataTransfer() {
super(DBWServiceDataTransfer.class, new WebServiceDataTransfer(), "schema/service.data.transfer.graphqls");
@@ -47,17 +48,17 @@ public class WebServiceBindingDataTransfer extends WebServiceBindingBase<DBWServ
env -> getService(env).getAvailableImportStreamProcessors(getWebSession(env)))
.dataFetcher("dataTransferExportDataFromContainer", env -> getService(env).dataTransferExportDataFromContainer(
WebServiceBindingSQL.getSQLProcessor(env),
getArgument(env, "containerNodePath"),
getArgumentVal(env, "containerNodePath"),
new WebDataTransferParameters(getArgument(env, "parameters"))
))
.dataFetcher("dataTransferExportDataFromResults", env -> getService(env).dataTransferExportDataFromResults(
WebServiceBindingSQL.getSQLContext(env),
getArgument(env, "resultsId"),
getArgumentVal(env, "resultsId"),
new WebDataTransferParameters(getArgument(env, "parameters"))
))
.dataFetcher("dataTransferRemoveDataFile", env -> getService(env).dataTransferRemoveDataFile(
getWebSession(env),
getArgument(env, "dataFileId")
getArgumentVal(env, "dataFileId")
))
.dataFetcher("dataTransferDefaultExportSettings", env -> getService(env).defaultExportSettings())
;
@@ -65,7 +66,7 @@ public class WebServiceBindingDataTransfer extends WebServiceBindingBase<DBWServ
}
@Override
public void addServlets(CBApplication application, DBWServletContext servletContext) throws DBException {
public void addServlets(@NotNull CBApplication<?> application, @NotNull DBWServletContext servletContext) throws DBException {
if (!application.isMultiuser()) {
return;
}
server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/WebServiceBindingFS.java
+3 -2
View File
@@ -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.
@@ -24,6 +24,7 @@ import io.cloudbeaver.service.DBWServletContext;
import io.cloudbeaver.service.WebServiceBindingBase;
import io.cloudbeaver.service.fs.impl.WebServiceFS;
import io.cloudbeaver.service.fs.model.WebFSServlet;
import org.jkiss.code.NotNull;
import org.jkiss.dbeaver.DBException;
import org.jkiss.utils.CommonUtils;
@@ -117,7 +118,7 @@ public class WebServiceBindingFS extends WebServiceBindingBase<DBWServiceFS> imp
}
@Override
public void addServlets(CBApplication<?> application, DBWServletContext servletContext) throws DBException {
public void addServlets(@NotNull CBApplication<?> application, @NotNull DBWServletContext servletContext) throws DBException {
if (!application.isMultiuser()) {
return;
}